From e7631de6360aea3516a96a3275599ad6ecb61309 Mon Sep 17 00:00:00 2001 From: Paul Fenwick Date: Fri, 21 Feb 2020 23:44:55 +1100 Subject: [PATCH 01/56] =?UTF-8?q?=F0=9F=8D=85=20Add=20batch=20time=20to=20?= =?UTF-8?q?ketchup=20in=20recipe=5Ffood.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Went with 67% at 5 units, as one assumes some chopping is needed. --- data/json/recipes/recipe_food.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 24b1acc009804..31911a76b6e83 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -4624,6 +4624,7 @@ "time": "18 m", "charges": 2, "autolearn": true, + "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ From 218eecf7e9bd2c77b7f66aa1e1f538d1c430f363 Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Fri, 21 Feb 2020 18:43:24 +0300 Subject: [PATCH 02/56] Permit making candles from lard --- data/json/recipes/recipe_others.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index c13d8dcbcfde9..a5cfecde08b4c 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1345,7 +1345,7 @@ "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "lighter", 5 ], [ "ref_lighter", 5 ], [ "surface_heat", 2, "LIST" ] ] ], - "components": [ [ [ "wax", 1 ], [ "any_tallow", 4, "LIST" ] ], [ [ "cordage_short", 1, "LIST" ] ] ] + "components": [ [ [ "wax", 1 ], [ "any_tallow", 4, "LIST" ], [ "edible_lard", 1, "LIST" ] ], [ [ "cordage_short", 1, "LIST" ] ] ] }, { "type": "recipe", From c070b99f7f7d6108d0372e4d1ece019684652260 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Fri, 21 Feb 2020 23:52:03 +0100 Subject: [PATCH 03/56] Magazine name to object --- data/json/items/magazine/22.json | 2 +- data/json/items/magazine/223.json | 6 +++--- data/json/items/magazine/3006.json | 2 +- data/json/items/magazine/308.json | 12 ++++++------ data/json/items/magazine/32.json | 2 +- data/json/items/magazine/380.json | 2 +- data/json/items/magazine/38super.json | 2 +- data/json/items/magazine/40.json | 2 +- data/json/items/magazine/45.json | 4 ++-- data/json/items/magazine/460.json | 2 +- data/json/items/magazine/9mm.json | 10 +++++----- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index cad421ce47338..8ac5def0d61ad 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -158,7 +158,7 @@ "id": "j22mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Jennings J-22 magazine", + "name": { "str": "Jennings J-22 magazine" }, "description": "A cheap 6-round steel box magazine for the Jennings J-22.", "weight": "55 g", "volume": "27ml", diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json index f0004ddccc2fe..1efb5b5bf0e49 100644 --- a/data/json/items/magazine/223.json +++ b/data/json/items/magazine/223.json @@ -3,7 +3,7 @@ "id": "223_speedloader5", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "LW-5 speedloader", + "name": { "str": "LW-5 speedloader" }, "description": "This speedloader, made by Leadworks for use with L2037 Backup revolver, can hold 5 rounds of .223 and quickly reload a compatible revolver.", "weight": "116 g", "volume": "250 ml", @@ -31,7 +31,7 @@ "id": "lw223bigmag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "LW-56 magazine", + "name": { "str": "LW-56 magazine" }, "description": "A 56-round polymer magazine for Leadworks LLC 223 firearms. It's compact design makes it surprisingly easy to store. Lightweight and reliable but somewhat more difficult to reload.", "weight": "340 g", "volume": "750 ml", @@ -49,7 +49,7 @@ "id": "lw223mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "LW-32 magazine", + "name": { "str": "LW-32 magazine" }, "description": "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and reliable but somewhat more difficult to reload.", "weight": "190 g", "volume": "500 ml", diff --git a/data/json/items/magazine/3006.json b/data/json/items/magazine/3006.json index 9b1b27da5d02e..79b0926656b0e 100644 --- a/data/json/items/magazine/3006.json +++ b/data/json/items/magazine/3006.json @@ -37,7 +37,7 @@ "id": "garandclip", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "M1 Garand clip", + "name": { "str": "M1 Garand clip" }, "description": "A light-weight en-bloc clip for use with the M1 Garand that will be ejected after the last round is fired.", "weight": "30 g", "volume": "250 ml", diff --git a/data/json/items/magazine/308.json b/data/json/items/magazine/308.json index be6fdf7731bd5..43c9ba6a59ed0 100644 --- a/data/json/items/magazine/308.json +++ b/data/json/items/magazine/308.json @@ -108,7 +108,7 @@ "id": "m14mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "M14 magazine", + "name": { "str": "M14 magazine" }, "description": "A military issue 20-round steel box magazine compatible with M14 pattern rifles.", "weight": "280 g", "volume": "500 ml", @@ -125,7 +125,7 @@ "id": "m14smallmag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "M14 compact magazine", + "name": { "str": "M14 compact magazine" }, "description": "A compact aftermarket 5-round steel box magazine compatible with M14 pattern rifles. Although it has a low capacity it is easy to store and quick to reload.", "weight": "60 g", "volume": "250 ml", @@ -143,7 +143,7 @@ "id": "m14_makeshiftmag", "copy-from": "fal_makeshiftmag", "type": "MAGAZINE", - "name": "M14 makeshift magazine", + "name": { "str": "M14 makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with M14 rifle." }, { @@ -199,7 +199,7 @@ "id": "hk417mag_20rd", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "HK417 magazine", + "name": { "str": "HK417 magazine" }, "description": "A 20 round double stack box magazine for the HK417 rifle.", "weight": "160 g", "volume": "500 ml", @@ -216,7 +216,7 @@ "id": "hk417mag_10rd", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "HK417 compact magazine", + "name": { "str": "HK417 compact magazine" }, "description": "A 10 round double stack box magazine for the HK417 rifle.", "weight": "110 g", "volume": "250 ml", @@ -233,7 +233,7 @@ "id": "hk417_makeshiftmag", "copy-from": "fal_makeshiftmag", "type": "MAGAZINE", - "name": "HK417 makeshift magazine", + "name": { "str": "HK417 makeshift magazine" }, "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with HK417 rifle." }, { diff --git a/data/json/items/magazine/32.json b/data/json/items/magazine/32.json index 1c99777b850a4..2ce8a1bdee5f8 100644 --- a/data/json/items/magazine/32.json +++ b/data/json/items/magazine/32.json @@ -54,7 +54,7 @@ "id": "kp32mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Kel-Tec P32 magazine", + "name": { "str": "Kel-Tec P32 magazine" }, "description": "A standard 7-round steel box magazine for the Kel-Tec P32.", "weight": "65 g", "volume": "47ml", diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json index d9b7896aad6a8..6a27a23e7e58a 100644 --- a/data/json/items/magazine/380.json +++ b/data/json/items/magazine/380.json @@ -3,7 +3,7 @@ "id": "kp3atmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Kel-Tec P3AT magazine", + "name": { "str": "Kel-Tec P3AT magazine" }, "description": "A standard 6-round steel box magazine for the Kel-Tec P3AT.", "weight": "60 g", "volume": "50ml", diff --git a/data/json/items/magazine/38super.json b/data/json/items/magazine/38super.json index 0b82ddebea9fd..89a56c8b910a7 100644 --- a/data/json/items/magazine/38super.json +++ b/data/json/items/magazine/38super.json @@ -20,7 +20,7 @@ "id": "m1911mag_10rd_38super", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "M1911 .38 Super magazine", + "name": { "str": "M1911 .38 Super magazine" }, "description": "A compact single stack box magazine for the M1911.", "weight": "80 g", "volume": "250 ml", diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json index 2ccb03a6f8725..bb035e62dea4d 100644 --- a/data/json/items/magazine/40.json +++ b/data/json/items/magazine/40.json @@ -89,7 +89,7 @@ "id": "bhp40mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Hi-Power .40 S&W magazine", + "name": { "str": "Hi-Power .40 S&W magazine" }, "description": "A 10 round steel box magazine for the Browning Hi-Power .40 S&W.", "weight": "120 g", "volume": "185 ml", diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json index a86adef47277d..eb3a83a920210 100644 --- a/data/json/items/magazine/45.json +++ b/data/json/items/magazine/45.json @@ -3,7 +3,7 @@ "id": "m1911bigmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "M1911 extended magazine", + "name": { "str": "M1911 extended magazine" }, "description": "An extended 10-round magazine for use with the M1911 handgun.", "weight": "100 g", "volume": "500 ml", @@ -20,7 +20,7 @@ "id": "m1911mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "M1911 magazine", + "name": { "str": "M1911 magazine" }, "description": "A military issue 7-round magazine for use with the M1911 handgun.", "weight": "70 g", "volume": "250 ml", diff --git a/data/json/items/magazine/460.json b/data/json/items/magazine/460.json index 9b21994bc548a..5e4cfad8c5bf1 100644 --- a/data/json/items/magazine/460.json +++ b/data/json/items/magazine/460.json @@ -19,7 +19,7 @@ "id": "lw12mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "LW-12 magazine", + "name": { "str": "LW-12 magazine" }, "description": "A 12-round polymer magazine for use with the Leadworks LLC L39-460 and L39B-45 pistols.", "weight": "60 g", "volume": "250 ml", diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index f90acfdf66172..0608951368aec 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -3,7 +3,7 @@ "id": "9mm_speedloader7", "looks_like": "38_speedloader", "type": "MAGAZINE", - "name": "LW-7 speedloader", + "name": { "str": "LW-7 speedloader" }, "description": "This speedloader, made by Leadworks for use with L2032 Lookout revolver, can hold 7 rounds of 9x19mm and quickly reload a compatible revolver.", "weight": "72 g", "volume": "250 ml", @@ -141,7 +141,7 @@ "id": "lw21mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "LW-21 magazine", + "name": { "str": "LW-21 magazine" }, "description": "A 21-round polymer magazine for Leadworks LLC 9x19mm firearms. Lightweight and reliable but somewhat more difficult to reload.", "weight": "105 g", "volume": "500 ml", @@ -315,7 +315,7 @@ "id": "kpf9mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Kel-Tec PF-9 magazine", + "name": { "str": "Kel-Tec PF-9 magazine" }, "description": "A standard 7-round steel box magazine for the Kel-Tec PF-9.", "weight": "60 g", "volume": "60ml", @@ -350,7 +350,7 @@ "id": "bhp9mag_13rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Hi-Power 9x19mm 13-round magazine", + "name": { "str": "Hi-Power 9x19mm 13-round magazine" }, "description": "A 13 round steel box magazine for the Browning Hi-Power 9x19mm.", "weight": "100 g", "volume": "191 ml", @@ -367,7 +367,7 @@ "id": "bhp9mag_15rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Hi-Power 9x19mm 15-round magazine", + "name": { "str": "Hi-Power 9x19mm 15-round magazine" }, "description": "A 15 round steel box magazine for the Browning Hi-Power 9x19mm.", "weight": "100 g", "volume": "191 ml", From 897818db047f96f9679ff848a16d6a3511f50beb Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 22 Feb 2020 01:02:08 +0100 Subject: [PATCH 04/56] Ammo name to object --- data/json/items/ammo/22.json | 8 ++++---- data/json/items/ammo/270win.json | 4 ++-- data/json/items/ammo/300.json | 2 +- data/json/items/ammo/3006.json | 12 ++++++------ data/json/items/ammo/300blk.json | 8 ++++---- data/json/items/ammo/308.json | 2 +- data/json/items/ammo/32.json | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json index cb7288309746d..b4ea19548bcac 100644 --- a/data/json/items/ammo/22.json +++ b/data/json/items/ammo/22.json @@ -58,7 +58,7 @@ "id": "bp_22_fmj", "copy-from": "22_fmj", "type": "AMMO", - "name": ".22 LR FMJ, black powder", + "name": { "str": ".22 LR FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -67,7 +67,7 @@ "id": "bp_22_lr", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 LR, black powder", + "name": { "str": ".22 LR, black powder" }, "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -76,7 +76,7 @@ "id": "reloaded_22_lr", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 LR, reloaded", + "name": { "str": ".22 LR, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -85,7 +85,7 @@ "id": "reloaded_22_fmj", "copy-from": "22_fmj", "type": "AMMO", - "name": ".22 FMJ, reloaded", + "name": { "str": ".22 FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json index f2d4fe85bfbf8..adf05a69a8e04 100644 --- a/data/json/items/ammo/270win.json +++ b/data/json/items/ammo/270win.json @@ -26,7 +26,7 @@ "id": "bp_270win_jsp", "copy-from": "270win_jsp", "type": "AMMO", - "name": ".270 Winchester JSP, black powder", + "name": { "str": ".270 Winchester JSP, black powder" }, "proportional": { "price": 0.3, "damage": 0.7, "recoil": 0.7, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -35,7 +35,7 @@ "id": "reloaded_270win_jsp", "copy-from": "270win_jsp", "type": "AMMO", - "name": ".270 Winchester JSP, reloaded", + "name": { "str": ".270 Winchester JSP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json index 65e9fc2430a6a..995be96809eaa 100644 --- a/data/json/items/ammo/300.json +++ b/data/json/items/ammo/300.json @@ -26,7 +26,7 @@ "id": "bp_300_winmag", "copy-from": "300_winmag", "type": "AMMO", - "name": ".300 Winchester Magnum, black powder", + "name": { "str": ".300 Winchester Magnum, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json index cfbd5640fd075..2ee32b3ab2d2d 100644 --- a/data/json/items/ammo/3006.json +++ b/data/json/items/ammo/3006.json @@ -42,7 +42,7 @@ "id": "bp_3006", "copy-from": "3006", "type": "AMMO", - "name": ".30-06 Springfield, black powder", + "name": { "str": ".30-06 Springfield, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -51,7 +51,7 @@ "id": "bp_3006_incendiary", "copy-from": "3006_incendiary", "type": "AMMO", - "name": ".30-06 Springfield tracer, black powder", + "name": { "str": ".30-06 Springfield tracer, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -60,7 +60,7 @@ "id": "bp_3006fmj", "copy-from": "bp_3006", "type": "AMMO", - "name": ".30-06 Springfield M2 AP, black powder", + "name": { "str": ".30-06 Springfield M2 AP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -69,7 +69,7 @@ "id": "reloaded_3006", "copy-from": "3006", "type": "AMMO", - "name": ".30-06 Springfield, reloaded", + "name": { "str": ".30-06 Springfield, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -78,7 +78,7 @@ "id": "reloaded_3006_incendiary", "copy-from": "3006_incendiary", "type": "AMMO", - "name": ".30-06 incendiary, reloaded", + "name": { "str": ".30-06 incendiary, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -87,7 +87,7 @@ "id": "reloaded_3006fmj", "copy-from": "3006fmj", "type": "AMMO", - "name": ".30-06 M2 AP, reloaded", + "name": { "str": ".30-06 M2 AP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json index ed60cc19debd8..0815663199227 100644 --- a/data/json/items/ammo/300blk.json +++ b/data/json/items/ammo/300blk.json @@ -2,7 +2,7 @@ { "id": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout", + "name": { "str": ".300 AAC Blackout" }, "description": "A .300 AAC Blackout round with a 125gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.", "weight": "18 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "300blk_ss", "copy-from": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout", + "name": { "str": ".300 AAC Blackout" }, "description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.", "weight": "21 g", "range": 40, @@ -37,7 +37,7 @@ "id": "bp_300blk", "copy-from": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout, black powder", + "name": { "str": ".300 AAC Blackout, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -46,7 +46,7 @@ "id": "reloaded_300blk", "copy-from": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout, reloaded", + "name": { "str": ".300 AAC Blackout, reloaded" }, "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform. The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine. It requires a specific barrel, so will not work in a standard M4 or similar carbine. This one has been hand-reloaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json index ed0019ac1dc7c..9347edbefe3bb 100644 --- a/data/json/items/ammo/308.json +++ b/data/json/items/ammo/308.json @@ -2,7 +2,7 @@ { "id": "308", "type": "AMMO", - "name": ".308 Winchester", + "name": { "str": ".308 Winchester" }, "description": ".308 Winchester ammunition with 168gr hollow point bullets. The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.", "weight": "18 g", "volume": "250 ml", diff --git a/data/json/items/ammo/32.json b/data/json/items/ammo/32.json index e4c3de933d90c..97366be073062 100644 --- a/data/json/items/ammo/32.json +++ b/data/json/items/ammo/32.json @@ -2,7 +2,7 @@ { "id": "32_acp", "type": "AMMO", - "name": ".32 ACP", + "name": { "str": ".32 ACP" }, "description": "The .32 ACP was a popular handgun cartridge in the 20th century. Not so powerful as the .38 or the 9x19mm though.", "weight": "5 g", "volume": "250 ml", @@ -25,7 +25,7 @@ "id": "bp_32_acp", "copy-from": "32_acp", "type": "AMMO", - "name": ".32 ACP, black powder", + "name": { "str": ".32 ACP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -34,7 +34,7 @@ "id": "reloaded_32_acp", "copy-from": "32_acp", "type": "AMMO", - "name": ".32 ACP, reloaded", + "name": { "str": ".32 ACP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } From 9dc476d87aefc16fe82981b2d73c635318d41df3 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 22 Feb 2020 01:16:21 +0100 Subject: [PATCH 05/56] Bionic name to object --- data/json/bionics.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index a9e19561a55e7..b6762f961b267 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -132,7 +132,7 @@ { "id": "bio_blood_anal", "type": "bionic", - "name": "Blood Analysis", + "name": { "str": "Blood Analysis" }, "description": "Small sensors have been surgically implanted in your heart, allowing you to analyze your blood. This will detect many illnesses, drugs, and other conditions.", "occupied_bodyparts": [ [ "TORSO", 5 ] ], "act_cost": "100 J" @@ -140,7 +140,7 @@ { "id": "bio_blood_filter", "type": "bionic", - "name": "Blood Filter", + "name": { "str": "Blood Filter" }, "description": "A filtration system in your heart allows you to actively filter out chemical impurities, primarily drugs. It will have limited impact on viruses. Note that it is not a targeted filter; ALL drugs in your system will be affected.", "occupied_bodyparts": [ [ "TORSO", 10 ] ], "act_cost": "600 J" @@ -148,7 +148,7 @@ { "id": "bio_cable", "type": "bionic", - "name": "Cable Charger System", + "name": { "str": "Cable Charger System" }, "description": "You have a complex port surgically mounted above your hip. While active, it will recharge bionic power when connected to a power source via jumper cable.", "occupied_bodyparts": [ [ "TORSO", 10 ] ], "is_remote_fueled": true, @@ -202,7 +202,7 @@ { "id": "bio_chain_lightning", "type": "bionic", - "name": "Chain Lightning", + "name": { "str": "Chain Lightning" }, "description": "Your body is equipped with a chain lightning generator, allowing you to emit a blast of lightning at a target, leaving a trail of lightning in its wake, jumping to additional targets within 4 tiles of the previous target.", "occupied_bodyparts": [ [ "TORSO", 16 ], [ "ARM_L", 4 ], [ "ARM_R", 4 ] ], "act_cost": "100 kJ", @@ -244,7 +244,7 @@ { "id": "bio_cloak", "type": "bionic", - "name": "Cloaking System", + "name": { "str": "Cloaking System" }, "description": "This high-power system uses a set of cameras and LEDs to make you blend into your background, rendering you fully invisible to normal vision. However, you may be detected by infrared, sonar, etc.", "occupied_bodyparts": [ [ "TORSO", 15 ], @@ -266,7 +266,7 @@ { "id": "bio_cqb", "type": "bionic", - "name": "Close Quarters Battle", + "name": { "str": "Close Quarters Battle" }, "description": "Bionic processors and databanks, loaded with martial arts combat programs, are surgically integrated into your nervous system. Whilst active, the CQB module will improve your hand to hand combat skills, but prevents you from improving them through combat experience.", "occupied_bodyparts": [ [ "HEAD", 4 ] ], "act_cost": "20 J", @@ -294,7 +294,7 @@ { "id": "bio_digestion", "type": "bionic", - "name": "Expanded Digestive System", + "name": { "str": "Expanded Digestive System" }, "description": "You have been outfitted with three synthetic stomachs and industrial-grade intestines. Not only can you extract much more nutrition from food, but you are highly resistant to foodborne illness, and can sometimes eat rotten food.", "occupied_bodyparts": [ [ "TORSO", 20 ] ], "flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ] @@ -310,7 +310,7 @@ { "id": "bio_dis_shock", "type": "bionic", - "name": "Electrical Discharge", + "name": { "str": "Electrical Discharge" }, "description": "A malfunctioning bionic which occasionally discharges electricity through your body, causing pain and brief paralysis but no damage.", "occupied_bodyparts": [ [ "TORSO", 6 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -318,7 +318,7 @@ { "id": "bio_drain", "type": "bionic", - "name": "Electrical Drain", + "name": { "str": "Electrical Drain" }, "description": "A malfunctioning bionic. It doesn't perform any useful function, but will occasionally draw power from your batteries.", "occupied_bodyparts": [ [ "TORSO", 2 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -334,7 +334,7 @@ { "id": "bio_ears", "type": "bionic", - "name": "Enhanced Hearing", + "name": { "str": "Enhanced Hearing" }, "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person. Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.", "occupied_bodyparts": [ [ "HEAD", 3 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -343,7 +343,7 @@ { "id": "bio_emp", "type": "bionic", - "name": "Directional EMP", + "name": { "str": "Directional EMP" }, "description": "Surgically mounted in the palm of your hand are small parabolic EMP field generators. You may use power to fire a wide, but short-ranged blast which will disable electronics and robots.", "occupied_bodyparts": [ [ "ARM_R", 1 ], [ "HAND_R", 2 ] ], "act_cost": "50 kJ" @@ -351,7 +351,7 @@ { "type": "bionic", "id": "bio_emp_armgun", - "name": "EMP Projector", + "name": { "str": "EMP Projector" }, "description": "A ranged EMP generator system is implanted on the palm of your right hand and arm. The system fires precise, single-target pulses that require time to aim. Extremely effective against electronic targets but mostly useless otherwise.", "occupied_bodyparts": [ [ "ARM_R", 10 ], [ "HAND_R", 5 ] ], "act_cost": "50 kJ", @@ -361,7 +361,7 @@ { "id": "bio_ethanol", "type": "bionic", - "name": "Ethanol Burner", + "name": { "str": "Ethanol Burner" }, "description": "You burn alcohol as fuel in an extremely efficient reaction.", "occupied_bodyparts": [ [ "TORSO", 26 ] ], "fuel_options": [ "chem_ethanol", "chem_methanol", "denat_alcohol" ], @@ -384,7 +384,7 @@ { "id": "bio_eye_enhancer", "type": "bionic", - "name": "Diamond Cornea", + "name": { "str": "Diamond Cornea" }, "description": "Your vision is greatly enhanced, giving you a +2 bonus to perception.", "occupied_bodyparts": [ [ "EYES", 1 ] ], "stat_bonus": [ [ "PER", 2 ] ], @@ -430,7 +430,7 @@ { "id": "bio_faraday", "type": "bionic", - "name": "Dielectric Capacitance System", + "name": { "str": "Dielectric Capacitance System" }, "description": "Throughout your body lies a network of miniature piezoelectric capacitors which can be charged with bionic power to temporarily protect you from external electrical discharge.", "occupied_bodyparts": [ [ "TORSO", 8 ], @@ -467,7 +467,7 @@ { "id": "bio_flashlight", "type": "bionic", - "name": "Cranial Flashlight", + "name": { "str": "Cranial Flashlight" }, "description": "Surgically mounted between your eyes is a small but powerful LED flashlight.", "occupied_bodyparts": [ [ "EYES", 1 ] ], "act_cost": "3 J", @@ -585,7 +585,7 @@ { "id": "bio_int_enhancer", "type": "bionic", - "name": "Cerebral Booster", + "name": { "str": "Cerebral Booster" }, "description": "Your brain has been enhanced with bionic coprocessors, giving you a +2 bonus to intelligence.", "occupied_bodyparts": [ [ "HEAD", 7 ] ], "stat_bonus": [ [ "INT", 2 ] ], @@ -648,7 +648,7 @@ { "id": "bio_magnet", "type": "bionic", - "name": "Electromagnetic Unit", + "name": { "str": "Electromagnetic Unit" }, "description": "Surgically embedded in your right hand is a powerful electromagnet, allowing you to use your own strength to pull all nearby magnetic objects towards you. Unlucky bystanders might be injured or killed by flying objects.", "occupied_bodyparts": [ [ "HAND_R", 3 ] ], "act_cost": "10 kJ" @@ -664,7 +664,7 @@ { "id": "bio_memory", "type": "bionic", - "name": "Enhanced Memory Banks", + "name": { "str": "Enhanced Memory Banks" }, "description": "Your memory has been enhanced with small quantum storage drives. While active, you learn - both through reading and practice - more quickly. Additionally, you can't forget skills you've already learned, and the layout of terrain you've explored will remain in your memory for an incredibly long time.", "occupied_bodyparts": [ [ "HEAD", 3 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ], @@ -932,7 +932,7 @@ { "id": "bio_shock", "type": "bionic", - "name": "Electroshock Unit", + "name": { "str": "Electroshock Unit" }, "description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock your opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.", "occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "HAND_L", 1 ], [ "HAND_R", 1 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ] @@ -948,7 +948,7 @@ { "id": "bio_sleepy", "type": "bionic", - "name": "Endocrine Enervator", + "name": { "str": "Endocrine Enervator" }, "description": "Through a combination of psychochemical manipulation and old fashioned electrical nerve stimulation, this malfunctioning bionic alters your brain chemistry in such a way as to cause fatigue. You will find yourself tiring a bit faster than before.", "occupied_bodyparts": [ [ "HEAD", 2 ] ], "flags": [ "BIONIC_FAULTY" ] From 0479cf2e461326a68e8b6115de579398dd2aa355 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 22 Feb 2020 01:38:06 +0100 Subject: [PATCH 06/56] bionic_item name to object --- data/json/items/bionics.json | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index d912cf2d361d8..03e01626de36d 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -35,7 +35,7 @@ "id": "bio_adrenaline", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Adrenaline Pump CBM", + "name": { "str": "Adrenaline Pump CBM" }, "looks_like": "bio_int_enhancer", "description": "A stimulator system that is implanted alongside the adrenal glands, allowing the user to trigger their body's adrenaline response at the cost of some bionic power.", "price": 4000, @@ -46,7 +46,7 @@ "id": "bio_ads", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Active Defense System CBM", + "name": { "str": "Active Defense System CBM" }, "looks_like": "bio_int_enhancer", "description": "This bionic projects a thin forcefield around the user's body. Anything attempting to penetrate this field has a chance of being deflected at the cost of energy, reducing their ability to deal damage. Bullets will be deflected more than swords and those in turn more than massive objects.", "price": 950000, @@ -57,7 +57,7 @@ "id": "bio_alarm", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Alarm System CBM", + "name": { "str": "Alarm System CBM" }, "looks_like": "bio_int_enhancer", "description": "A motion-detecting alarm system will notice almost all movement within a fifteen-foot radius, and will silently alert the user. This is very useful during sleep, or if the user suspects a cloaked pursuer.", "price": 25000, @@ -68,7 +68,7 @@ "id": "bio_armor_arms", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Arms Alloy Plating CBM", + "name": { "str": "Arms Alloy Plating CBM" }, "description": "Alloy plating that replaces the flesh on the user's arms. Provides passive protection and can be used in conjunction with bionic martial arts.", "price": 350000, "difficulty": 3 @@ -120,7 +120,7 @@ "id": "bio_batteries", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Battery System CBM", + "name": { "str": "Battery System CBM" }, "looks_like": "bio_int_enhancer", "description": "A battery draining attachment to make use of the energy contained in normal, everyday batteries.", "price": 80000, @@ -152,7 +152,7 @@ "id": "bio_blood_anal", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Blood Analysis CBM", + "name": { "str": "Blood Analysis CBM" }, "looks_like": "bio_int_enhancer", "description": "Small sensors that are implanted in the user's heart, allowing them to analyze their blood. This will detect many illnesses, drugs, and other conditions.", "price": 320000, @@ -163,7 +163,7 @@ "id": "bio_blood_filter", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Blood Filter CBM", + "name": { "str": "Blood Filter CBM" }, "looks_like": "bio_int_enhancer", "description": "A filtration system that is installed in the heart and can actively filter out chemical impurities, primarily drugs, with limited impact on viruses. Note that it is not a targeted filter; ALL drugs in the system will be affected.", "price": 350000, @@ -174,7 +174,7 @@ "id": "bio_cable", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Cable Charger System CBM", + "name": { "str": "Cable Charger System CBM" }, "looks_like": "bio_int_enhancer", "description": "A complex port that is mounted above the hip. While active, it will recharge bionic power when connected to a battery via jumper cable.", "price": 80000, @@ -195,7 +195,7 @@ "id": "bio_chain_lightning", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Chain Lightning CBM", + "name": { "str": "Chain Lightning CBM" }, "looks_like": "bio_int_enhancer", "description": "A chain lightning generator that emits a blast of lightning at a target, leaving a trail of lightning in its wake and jumping to additional targets within 4 tiles of the previous target.", "price": 220000, @@ -205,7 +205,7 @@ "id": "bio_claws", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Bionic Claws CBM", + "name": { "str": "Bionic Claws CBM" }, "looks_like": "bio_int_enhancer", "description": "Vicious, retractable claws that are implanted inside the user's fingers. These do considerable cutting damage, but prevent the user from holding anything else while extended.", "price": 550000, @@ -226,7 +226,7 @@ "id": "bio_cloak", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Cloaking System CBM", + "name": { "str": "Cloaking System CBM" }, "looks_like": "bio_int_enhancer", "description": "This high-power system uses a set of cameras and LEDs to make the user blend into their surroundings, rendering them fully invisible to eyes and optical sensors. However, this doesn't prevent detection from other means such as infrared, sonar, etc.", "price": 850000, @@ -236,7 +236,7 @@ "id": "bio_cqb", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Close Quarters Battle CBM", + "name": { "str": "Close Quarters Battle CBM" }, "looks_like": "bio_int_enhancer", "description": "A set of bionic processors and databanks, loaded with martial arts combat programs. Whilst active, the CQB module will improve the user's hand-to-hand combat skills, but prevents them from improving them through combat experience.", "price": 220000, @@ -309,7 +309,7 @@ "id": "bio_evap", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Aero-Evaporator CBM", + "name": { "str": "Aero-Evaporator CBM" }, "looks_like": "bio_int_enhancer", "description": "This unit draws moisture from the surrounding air, which slowly trickles directly into your blood stream. It may fail in very dry environments.", "price": 550000, @@ -482,7 +482,7 @@ "id": "bio_int_enhancer", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Cerebral Booster CBM", + "name": { "str": "Cerebral Booster CBM" }, "description": "Bionic coprocessors that are implanted in the brain, granting a +2 bonus to intelligence.", "price": 800000, "weight": "100 g", @@ -602,7 +602,7 @@ "id": "bio_night", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Artificial Night Generator CBM", + "name": { "str": "Artificial Night Generator CBM" }, "looks_like": "bio_int_enhancer", "description": "When active, this bionic eliminates all light within a 15 tile radius through destructive interference.", "price": 850000, @@ -699,7 +699,7 @@ "id": "bio_purifier", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Air Filtration System CBM", + "name": { "str": "Air Filtration System CBM" }, "looks_like": "bio_int_enhancer", "description": "An advanced filtration system that is implanted in the trachea. If toxins, or airborne diseases find their way into the windpipe, the filter will attempt to remove them.", "price": 450000, @@ -852,7 +852,7 @@ "id": "bio_surgical_razor", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Autonomous Surgical Scalpels CBM", + "name": { "str": "Autonomous Surgical Scalpels CBM" }, "looks_like": "bio_int_enhancer", "description": "A system of surgical grade scalpels that is implanted in the user's fingers. They allow for automated precise cuts and can be used as a high-quality butchering tool.", "price": 220000, @@ -863,7 +863,7 @@ "id": "bio_sunglasses", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Anti-Glare Compensators CBM", + "name": { "str": "Anti-Glare Compensators CBM" }, "looks_like": "bio_int_enhancer", "description": "A set of quick-reacting transition lenses that are installed over the user's eyes. They negate glare penalties, partially protect from bright flashes, and protect the eyes when welding.", "price": 450000, @@ -1053,7 +1053,7 @@ "id": "bio_dis_acid", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Acidic Leaking CBM", + "name": { "str": "Acidic Leaking CBM" }, "description": "This CBM has been breached in several places and some acid is leaking from it.", "weight": "700 g", "difficulty": 11 @@ -1116,7 +1116,7 @@ "id": "bio_nostril", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Bionic Nostril", + "name": { "str": "Bionic Nostril" }, "description": "This thing was up someone's nose, they're probably glad to be rid of it.", "weight": "50 g", "difficulty": 3 @@ -1125,7 +1125,7 @@ "id": "bio_pokedeye", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Bionic Visual Impairment", + "name": { "str": "Bionic Visual Impairment" }, "description": "A defective bionic that impairs vision.", "weight": "100 g", "difficulty": 8 @@ -1142,7 +1142,7 @@ "id": "bio_shakes", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Bionic Short Circuit", + "name": { "str": "Bionic Short Circuit" }, "description": "This bionic is poorly wired and occasionally short-circuits.", "difficulty": 7 }, From 164a32e55386f4d6fa9ab3c4be53518c4290c7e2 Mon Sep 17 00:00:00 2001 From: Xenomorph-III Date: Sat, 22 Feb 2020 17:42:58 +1300 Subject: [PATCH 07/56] Update Spike and Makeshift Knife recipe to be more reasonable. (#38033) * Update spike recipe. Now uses 1 chunk of steel: a survvior cannot possibly hammer out a spike from 2 steel pieces with only a rock and no welding equipment. Where does the second steel chunk go, anyway? --- data/json/items/melee/swords_and_blades.json | 2 +- data/json/recipes/recipe_others.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index e3ee629576558..f6f0b73a43f9c 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -223,7 +223,7 @@ "name": { "str": "makeshift knife", "str_pl": "makeshift knives" }, "description": "A knife consisting of a long, somewhat sharpened, spike and a tightly wrapped rag as a handle. It makes a good melee weapon.", "weight": "550 g", - "volume": "500 ml", + "volume": "251 ml", "price": 0, "to_hit": -1, "bashing": 2, diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index c13d8dcbcfde9..6defbbded6eaa 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1369,7 +1369,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "steel_chunk", 2 ], [ "scrap", 5 ] ] ] + "components": [ [ [ "steel_chunk", 1 ] ] ] }, { "type": "recipe", From a4ad844f47d39c9fdcd3320480dce13ff2ef58fc Mon Sep 17 00:00:00 2001 From: culithir Date: Mon, 17 Feb 2020 15:55:14 -0600 Subject: [PATCH 08/56] Fix an issue preventing Luo (beggar) from being recruited. In one conversation path, Luo could not be recruited. Added the appropriate flag to the json to allow correct recruiting. --- data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json b/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json index 23fc54ee133df..50ab8e56e353e 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json @@ -448,6 +448,7 @@ "type": "talk_topic", "id": "TALK_REFUGEE_BEGGAR_3_RECRUITED1", "dynamic_line": "Aw damn, I was worried you'd say that. Okay, listen: you've got yourself a deal. I'll come to your base, but you've gotta get me hooked up with a microscope as soon as you can. This could be the beginning of something really cool. Oh, and it should go without saying that I'm not coming unless you can find a place for my friends here in your base. I'm sure you anticipated that. Talk them into going and I'm in. It should be easy, they're a bunch of sweet hearted saps.", + "speaker_effect": [ { "effect": { "u_add_var": "luo_recruited", "type": "general", "context": "recruit", "value": "yes" } } ], "responses": [ { "condition": { From 42d9e25a3df874e2abea07da003c70c3164cb6c5 Mon Sep 17 00:00:00 2001 From: saurocyte <40738100+saurocyte@users.noreply.github.com> Date: Sat, 22 Feb 2020 09:38:32 +0300 Subject: [PATCH 09/56] Fix remote vehicles teleporting when folding (#37974) * One and only --- src/vehicle_use.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp index 61f5b841709cf..c6e90526023e3 100644 --- a/src/vehicle_use.cpp +++ b/src/vehicle_use.cpp @@ -815,7 +815,7 @@ bool vehicle::fold_up() bicycle.set_var( "description", string_format( _( "A folded %s." ), name ) ); } - g->m.add_item_or_charges( g->u.pos(), bicycle ); + g->m.add_item_or_charges( global_part_pos3( 0 ), bicycle ); g->m.destroy_vehicle( this ); // TODO: take longer to fold bigger vehicles From cc186e678c9beb2712a984a679f716f936aaaf63 Mon Sep 17 00:00:00 2001 From: jkraybill Date: Sat, 22 Feb 2020 17:53:26 +1100 Subject: [PATCH 10/56] add purse to bride and ballroom dancer professions --- data/json/professions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 86f7358649af8..cfa565f1af588 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1617,7 +1617,7 @@ "items": { "both": { "items": [ "socks", "knit_scarf", "dance_shoes" ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "briefs", "tux" ], - "female": [ "bra", "panties", "dress" ] + "female": [ "bra", "panties", "dress", "purse" ] } }, { @@ -2268,7 +2268,7 @@ "items": { "both": { "items": [ ], "entries": [ { "group": "charged_cell_phone" } ] }, "male": [ "tux", "socks", "dress_shoes", "briefs" ], - "female": [ "veil_wedding", "dress_wedding", "stockings", "dress_shoes", "bra", "panties" ] + "female": [ "veil_wedding", "dress_wedding", "stockings", "dress_shoes", "bra", "panties", "purse" ] } }, { From d9c6079762217e8a13caeeb76bc1dc9bc752bd84 Mon Sep 17 00:00:00 2001 From: Eric <52087122+Ramza13@users.noreply.github.com> Date: Sat, 22 Feb 2020 02:47:10 -0500 Subject: [PATCH 11/56] Moved more string consts into single file (#38220) --- src/cata_string_consts.h | 24 ++++++++++++++ src/construction.cpp | 3 +- src/handle_action.cpp | 7 ++-- src/iuse.cpp | 6 ++-- src/mapgen.cpp | 2 +- src/pathfinding.cpp | 2 +- src/player.cpp | 4 +-- src/savegame_json.cpp | 18 +++++------ src/turret.cpp | 2 +- src/veh_interact.cpp | 10 +++--- src/vehicle.cpp | 53 ++++++++++++++++--------------- src/vehicle_display.cpp | 7 ++-- src/vehicle_move.cpp | 6 ++-- src/vehicle_use.cpp | 16 +++++----- tests/npc_test.cpp | 2 -- tests/vehicle_drag_test.cpp | 7 ++-- tests/vehicle_efficiency_test.cpp | 25 +++++++-------- tests/vehicle_part_test.cpp | 3 +- tests/vehicle_turrets_test.cpp | 4 +-- 19 files changed, 110 insertions(+), 91 deletions(-) diff --git a/src/cata_string_consts.h b/src/cata_string_consts.h index 63a92e22da6ca..775eba95b9e54 100644 --- a/src/cata_string_consts.h +++ b/src/cata_string_consts.h @@ -944,6 +944,7 @@ static const std::string flag_ALLOWS_REMOTE_USE( "ALLOWS_REMOTE_USE" ); static const std::string flag_ALWAYS_TWOHAND( "ALWAYS_TWOHAND" ); static const std::string flag_ANESTHESIA( "ANESTHESIA" ); static const std::string flag_ANIMAL_CTRL( "ANIMAL_CTRL" ); +static const std::string flag_ARMOR( "ARMOR" ); static const std::string flag_AURA( "AURA" ); static const std::string flag_AUT_START( "AUT_START" ); static const std::string flag_auto_wield( "auto_wield" ); @@ -1007,6 +1008,7 @@ static const std::string flag_CONDUCTIVE( "CONDUCTIVE" ); static const std::string flag_CONSOLE( "CONSOLE" ); static const std::string flag_CONSUMABLE( "CONSUMABLE" ); static const std::string flag_CONTAINER( "CONTAINER" ); +static const std::string flag_CONTROL_ANIMAL( "CONTROL_ANIMAL" ); static const std::string flag_CONTROLS( "CONTROLS" ); static const std::string flag_COOKED( "COOKED" ); static const std::string flag_COOLER( "COOLER" ); @@ -1089,6 +1091,7 @@ static const std::string flag_FLAMMABLE_ASH( "FLAMMABLE_ASH" ); static const std::string flag_FLASH_PROTECTION( "FLASH_PROTECTION" ); static const std::string flag_FLAT( "FLAT" ); static const std::string flag_FLAT_SURF( "FLAT_SURF" ); +static const std::string flag_FLOATS( "FLOATS" ); static const std::string flag_FLOTATION( "FLOTATION" ); static const std::string flag_FLOWER( "FLOWER" ); static const std::string flag_FOLDABLE( "FOLDABLE" ); @@ -1115,6 +1118,7 @@ static const std::string flag_GROWTH_HARVEST( "GROWTH_HARVEST" ); static const std::string flag_GROWTH_MATURE( "GROWTH_MATURE" ); static const std::string flag_GROWTH_SEEDLING( "GROWTH_SEEDLING" ); static const std::string flag_HALF_BOARD( "HALF_BOARD" ); +static const std::string flag_HARNESS_any( "HARNESS_any" ); static const std::string flag_HEAT_IMMUNE( "HEAT_IMMUNE" ); static const std::string flag_HELI_CRASH( "HELI_CRASH" ); static const std::string flag_HELMET_COMPAT( "HELMET_COMPAT" ); @@ -1217,6 +1221,7 @@ static const std::string flag_NONCONDUCTIVE( "NONCONDUCTIVE" ); static const std::string flag_NPC_ACTIVATE( "NPC_ACTIVATE" ); static const std::string flag_NPC_SAFE( "NPC_SAFE" ); static const std::string flag_NUTRIENT_OVERRIDE( "NUTRIENT_OVERRIDE" ); +static const std::string flag_OBSTACLE( "OBSTACLE" ); static const std::string flag_ON_CONTROLS( "ON_CONTROLS" ); static const std::string flag_ON_ROOF( "ON_ROOF" ); static const std::string flag_ONLY_ONE( "ONLY_ONE" ); @@ -1303,6 +1308,7 @@ static const std::string flag_SEAT( "SEAT" ); static const std::string flag_SEATBELT( "SEATBELT" ); static const std::string flag_SECRET( "SECRET" ); static const std::string flag_SECURITY( "SECURITY" ); +static const std::string flag_SELF_JACK( "SELF_JACK" ); static const std::string flag_SEMITANGIBLE( "SEMITANGIBLE" ); static const std::string flag_SHARP( "SHARP" ); static const std::string flag_SHORT( "SHORT" ); @@ -1363,6 +1369,7 @@ static const std::string flag_UNCRAFT_LIQUIDS_CONTAINED( "UNCRAFT_LIQUIDS_CONTAI static const std::string flag_UNCRAFT_SINGLE_CHARGE( "UNCRAFT_SINGLE_CHARGE " ); static const std::string flag_UNDERSIZE( "UNDERSIZE" ); static const std::string flag_UNDERWATER_GUN( "UNDERWATER_GUN" ); +static const std::string flag_UNMOUNT_ON_DAMAGE( "UNMOUNT_ON_DAMAGE" ); static const std::string flag_UNMOUNT_ON_MOVE( "UNMOUNT_ON_MOVE" ); static const std::string flag_UNRECOVERABLE( "UNRECOVERABLE" ); static const std::string flag_UNSTABLE( "UNSTABLE" ); @@ -1405,6 +1412,7 @@ static const std::string flag_WRITE_MESSAGE( "WRITE_MESSAGE" ); static const std::string flag_YOUNG( "YOUNG" ); static const std::string flag_ZOOM( "ZOOM" ); + static const skill_id skill_archery( "archery" ); static const skill_id skill_barter( "barter" ); static const skill_id skill_bashing( "bashing" ); @@ -1580,6 +1588,7 @@ static const ter_str_id ter_moss( "t_moss" ); static const ter_str_id ter_nanofab_body( "t_nanofab_body" ); static const ter_str_id ter_ov_smreb_cage( "t_ov_smreb_cage" ); static const ter_str_id ter_palisade_gate_o( "t_palisade_gate_o" ); +static const ter_str_id ter_pavement( "t_pavement" ); static const ter_str_id ter_pit( "t_pit" ); static const ter_str_id ter_pit_corpsed( "t_pit_corpsed" ); static const ter_str_id ter_pit_covered( "t_pit_covered" ); @@ -1707,6 +1716,21 @@ static const std::string part_location_structure( "structure" ); static const std::string part_location_center( "center" ); static const std::string part_location_onroof( "on_roof" ); +static const vpart_id vpart_frame_vertical( "frame_vertical" ); +static const vpart_id vpart_frame_vertical_2( "frame_vertical_2" ); +static const vpart_id vpart_halfboard_horizontal( "halfboard_horizontal" ); +static const vpart_id vpart_horn_bicycle( "horn_bicycle" ); +static const vpart_id vpart_seat( "seat" ); +static const vpart_id vpart_storage_battery( "storage_battery" ); +static const vpart_id vpart_turret_mount( "turret_mount" ); +static const vpart_id vpart_wheel_mount_heavy( "wheel_mount_heavy" ); +static const vpart_id vpart_wheel_mount_heavy_steerable( "wheel_mount_heavy_steerable" ); +static const vpart_id vpart_wheel_mount_light( "wheel_mount_light" ); +static const vpart_id vpart_wheel_mount_light_steerable( "wheel_mount_light_steerable" ); +static const vpart_id vpart_wheel_mount_medium( "wheel_mount_medium" ); +static const vpart_id vpart_wheel_mount_medium_steerable( "wheel_mount_medium_steerable" ); +static const vpart_id vpart_wheel_wide( "wheel_wide" ); + static const std::string GUN_MODE_VAR_NAME( "item::mode" ); static const std::string CLOTHING_MOD_VAR_PREFIX( "clothing_mod_" ); diff --git a/src/construction.cpp b/src/construction.cpp index d85de1033d2df..88299c4e1efc4 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -1090,8 +1090,7 @@ static vpart_id vpart_from_item( const std::string &item_id ) } } debugmsg( "item %s used by construction is not base item of any vehicle part!", item_id.c_str() ); - static const vpart_id frame_id( "frame_vertical_2" ); - return frame_id; + return vpart_frame_vertical_2; } void construct::done_vehicle( const tripoint &p ) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 958c2bcf6869b..6230d737f48f2 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -408,9 +408,8 @@ static void pldrive( int x, int y ) return; } if( !remote ) { - static const itype_id fuel_type_animal( "animal" ); - const bool has_animal_controls = veh->part_with_feature( part, "CONTROL_ANIMAL", true ) >= 0; - const bool has_controls = veh->part_with_feature( part, "CONTROLS", true ) >= 0; + const bool has_animal_controls = veh->part_with_feature( part, flag_CONTROL_ANIMAL, true ) >= 0; + const bool has_controls = veh->part_with_feature( part, flag_CONTROLS, true ) >= 0; const bool has_animal = veh->has_engine_type( fuel_type_animal, false ) && veh->has_harnessed_animal(); if( !has_controls && !has_animal_controls ) { @@ -423,7 +422,7 @@ static void pldrive( int x, int y ) return; } } else { - if( empty( veh->get_avail_parts( "REMOTE_CONTROLS" ) ) ) { + if( empty( veh->get_avail_parts( flag_REMOTE_CONTROLS ) ) ) { add_msg( m_info, _( "Can't drive this vehicle remotely. It has no working controls." ) ); return; } diff --git a/src/iuse.cpp b/src/iuse.cpp index d4ac711da29d7..46496ded0d2c9 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -5591,7 +5591,7 @@ int iuse::unfold_generic( player *p, item *it, bool, const tripoint & ) g->m.destroy_vehicle( veh ); return 0; } - const bool can_float = size( veh->get_avail_parts( "FLOATS" ) ) > 2; + const bool can_float = size( veh->get_avail_parts( flag_FLOATS ) ) > 2; const auto invalid_pos = []( const tripoint & pp, bool can_float ) { return ( g->m.has_flag_ter( TFLAG_DEEP_WATER, pp ) && !can_float ) || @@ -8068,7 +8068,7 @@ static bool hackveh( player &p, item &it, vehicle &veh ) if( !veh.is_locked || !veh.has_security_working() ) { return true; } - const bool advanced = !empty( veh.get_avail_parts( "REMOTE_CONTROLS" ) ); + const bool advanced = !empty( veh.get_avail_parts( flag_REMOTE_CONTROLS ) ); if( advanced && veh.is_alarm_on ) { p.add_msg_if_player( m_bad, _( "This vehicle's security system has locked you out!" ) ); return false; @@ -8225,7 +8225,7 @@ int iuse::remoteveh( player *p, item *it, bool t, const tripoint &pos ) } } } else if( choice == 1 ) { - const auto rctrl_parts = veh->get_avail_parts( "REMOTE_CONTROLS" ); + const auto rctrl_parts = veh->get_avail_parts( flag_REMOTE_CONTROLS ); // Revert to original behaviour if we can't find remote controls. if( empty( rctrl_parts ) ) { veh->use_controls( pos ); diff --git a/src/mapgen.cpp b/src/mapgen.cpp index b436cffb8da70..e8df1bdc016ff 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -6023,7 +6023,7 @@ std::unique_ptr map::add_vehicle_to_map( std::vector frame_indices = veh->all_parts_at_location( "structure" ); //Check for boat type vehicles that should be placeable in deep water - const bool can_float = size( veh->get_avail_parts( "FLOATS" ) ) > 2; + const bool can_float = size( veh->get_avail_parts( flag_FLOATS ) ) > 2; //When hitting a wall, only smash the vehicle once (but walls many times) bool needs_smashing = false; diff --git a/src/pathfinding.cpp b/src/pathfinding.cpp index 5629d5d29148e..1b24ec8a85e97 100644 --- a/src/pathfinding.cpp +++ b/src/pathfinding.cpp @@ -345,7 +345,7 @@ std::vector map::route( const tripoint &f, const tripoint &t, part = vpobst ? vpobst->part_index() : -1; int dummy = -1; if( doors && veh->part_flag( part, VPFLAG_OPENABLE ) && - ( !veh->part_flag( part, "OPENCLOSE_INSIDE" ) || + ( !veh->part_flag( part, flag_OPENCLOSE_INSIDE ) || veh_at_internal( cur, dummy ) == veh ) ) { // Handle car doors, but don't try to path through curtains newg += 10; // One turn to open, 4 to move there diff --git a/src/player.cpp b/src/player.cpp index 52b3090c606d1..38d6012990b17 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1034,7 +1034,7 @@ bool player::has_alarm_clock() const { return ( has_item_with_flag( flag_ALARMCLOCK, true ) || ( g->m.veh_at( pos() ) && - !empty( g->m.veh_at( pos() )->vehicle().get_avail_parts( "ALARMCLOCK" ) ) ) || + !empty( g->m.veh_at( pos() )->vehicle().get_avail_parts( flag_ALARMCLOCK ) ) ) || has_bionic( bio_watch ) ); } @@ -1042,7 +1042,7 @@ bool player::has_watch() const { return ( has_item_with_flag( flag_WATCH, true ) || ( g->m.veh_at( pos() ) && - !empty( g->m.veh_at( pos() )->vehicle().get_avail_parts( "WATCH" ) ) ) || + !empty( g->m.veh_at( pos() )->vehicle().get_avail_parts( flag_WATCH ) ) ) || has_bionic( bio_watch ) ); } diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index f985136ada60b..964bd61f91d37 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -2477,7 +2477,7 @@ void vehicle_part::deserialize( JsonIn &jsin ) // if we don't know what type of part it is, it'll cause problems later. if( !pid.is_valid() ) { if( pid.str() == "wheel_underbody" ) { - pid = vpart_id( "wheel_wide" ); + pid = vpart_wheel_wide; } else { data.throw_error( "bad vehicle part", "id" ); } @@ -2520,7 +2520,7 @@ void vehicle_part::deserialize( JsonIn &jsin ) // with VEHICLE tag migrate fuel tanks only if amount field exists if( base.has_flag( flag_VEHICLE ) ) { - if( data.has_int( "amount" ) && ammo_capacity() > 0 && legacy_fuel != "battery" ) { + if( data.has_int( "amount" ) && ammo_capacity() > 0 && legacy_fuel != fuel_type_battery ) { ammo_set( legacy_fuel, data.get_int( "amount" ) ); } @@ -2686,7 +2686,7 @@ void vehicle::deserialize( JsonIn &jsin ) } for( const vpart_reference &vp : get_any_parts( "TURRET" ) ) { - install_part( vp.mount(), vpart_id( "turret_mount" ), false ); + install_part( vp.mount(), vpart_turret_mount, false ); //Forcibly set turrets' targeting mode to manual if no turret control unit is present on turret's tile on loading save if( !has_part( global_part_pos3( vp.part() ), "TURRET_CONTROLS" ) ) { @@ -2701,23 +2701,23 @@ void vehicle::deserialize( JsonIn &jsin ) // Add vehicle mounts to cars that are missing them. for( const vpart_reference &vp : get_any_parts( "NEEDS_WHEEL_MOUNT_LIGHT" ) ) { if( vp.info().has_flag( flag_STEERABLE ) ) { - install_part( vp.mount(), vpart_id( "wheel_mount_light_steerable" ), false ); + install_part( vp.mount(), vpart_wheel_mount_light_steerable, false ); } else { - install_part( vp.mount(), vpart_id( "wheel_mount_light" ), false ); + install_part( vp.mount(), vpart_wheel_mount_light, false ); } } for( const vpart_reference &vp : get_any_parts( "NEEDS_WHEEL_MOUNT_MEDIUM" ) ) { if( vp.info().has_flag( flag_STEERABLE ) ) { - install_part( vp.mount(), vpart_id( "wheel_mount_medium_steerable" ), false ); + install_part( vp.mount(), vpart_wheel_mount_medium_steerable, false ); } else { - install_part( vp.mount(), vpart_id( "wheel_mount_medium" ), false ); + install_part( vp.mount(), vpart_wheel_mount_medium, false ); } } for( const vpart_reference &vp : get_any_parts( "NEEDS_WHEEL_MOUNT_HEAVY" ) ) { if( vp.info().has_flag( flag_STEERABLE ) ) { - install_part( vp.mount(), vpart_id( "wheel_mount_heavy_steerable" ), false ); + install_part( vp.mount(), vpart_wheel_mount_heavy_steerable, false ); } else { - install_part( vp.mount(), vpart_id( "wheel_mount_heavy" ), false ); + install_part( vp.mount(), vpart_wheel_mount_heavy, false ); } } diff --git a/src/turret.cpp b/src/turret.cpp index c43d3f12d8027..bdaae9db90ea4 100644 --- a/src/turret.cpp +++ b/src/turret.cpp @@ -331,7 +331,7 @@ void vehicle::turrets_set_targeting() turrets[sel]->enabled = false; } - for( const vpart_reference &vp : get_avail_parts( "TURRET_CONTROLS" ) ) { + for( const vpart_reference &vp : get_avail_parts( flag_TURRET_CONTROLS ) ) { vehicle_part &e = vp.part(); if( e.mount == turrets[sel]->mount ) { e.enabled = turrets[sel]->enabled; diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp index a21b7dddbbb4d..9107ea531bf10 100644 --- a/src/veh_interact.cpp +++ b/src/veh_interact.cpp @@ -629,7 +629,7 @@ bool veh_interact::can_self_jack() { int lvl = jack_quality( *veh ); - for( const vpart_reference &vp : veh->get_avail_parts( "SELF_JACK" ) ) { + for( const vpart_reference &vp : veh->get_avail_parts( flag_SELF_JACK ) ) { if( vp.part().base.has_quality( quality_SELF_JACK, lvl ) ) { return true; } @@ -679,8 +679,8 @@ bool veh_interact::can_install_part() int engines = 0; int dif_eng = 0; if( is_engine && sel_vpart_info->has_flag( flag_E_HIGHER_SKILL ) ) { - for( const vpart_reference &vp : veh->get_avail_parts( "ENGINE" ) ) { - if( vp.has_feature( "E_HIGHER_SKILL" ) ) { + for( const vpart_reference &vp : veh->get_avail_parts( flag_ENGINE ) ) { + if( vp.has_feature( flag_E_HIGHER_SKILL ) ) { engines++; dif_eng = dif_eng / 2 + 8; } @@ -691,7 +691,7 @@ bool veh_interact::can_install_part() if( sel_vpart_info->has_flag( flag_STEERABLE ) ) { std::set axles; for( auto &p : veh->steering ) { - if( !veh->part_flag( p, "TRACKED" ) ) { + if( !veh->part_flag( p, flag_TRACKED ) ) { // tracked parts don't contribute to axle complexity axles.insert( veh->parts[p].mount.x ); } @@ -2987,7 +2987,7 @@ void veh_interact::complete_vehicle( player &p ) contents.clear(); // Power cables must remove parts from the target vehicle, too. - if( veh->part_flag( vehicle_part, "POWER_TRANSFER" ) ) { + if( veh->part_flag( vehicle_part, flag_POWER_TRANSFER ) ) { veh->remove_remote_part( vehicle_part ); } diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 294fb2edbeeb5..a7eea2a7ddaf5 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -183,7 +183,7 @@ void vehicle_stack::insert( const item &newitem ) units::volume vehicle_stack::max_volume() const { - if( myorigin->part_flag( part_num, "CARGO" ) && myorigin->parts[part_num].is_available() ) { + if( myorigin->part_flag( part_num, flag_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, 10000_liter ); } @@ -245,7 +245,7 @@ bool vehicle::remote_controlled( const player &p ) const return false; } - for( const vpart_reference &vp : get_avail_parts( "REMOTE_CONTROLS" ) ) { + for( const vpart_reference &vp : get_avail_parts( flag_REMOTE_CONTROLS ) ) { if( rl_dist( p.pos(), vp.pos() ) <= 40 ) { return true; } @@ -260,7 +260,6 @@ bool vehicle::remote_controlled( const player &p ) const * loading from a game saved before the vehicle construction rules overhaul). */ void vehicle::add_missing_frames() { - static const vpart_id frame_id( "frame_vertical" ); //No need to check the same spot more than once std::set locations_checked; for( auto &i : parts ) { @@ -278,7 +277,7 @@ void vehicle::add_missing_frames() } if( !found ) { // Install missing frame - parts.emplace_back( frame_id, i.mount, item( frame_id->item ) ); + parts.emplace_back( vpart_frame_vertical, i.mount, item( vpart_frame_vertical->item ) ); } } } @@ -403,7 +402,7 @@ void vehicle::init_state( int init_veh_fuel, int init_veh_status ) //Provide some variety to non-mint vehicles if( veh_status != 0 ) { //Leave engine running in some vehicles, if the engine has not been destroyed - if( veh_fuel_mult > 0 && !empty( get_avail_parts( "ENGINE" ) ) && + if( veh_fuel_mult > 0 && !empty( get_avail_parts( flag_ENGINE ) ) && one_in( 8 ) && !destroyEngine && !has_no_key && has_engine_type_not( fuel_type_muscle, true ) ) { engine_on = true; } @@ -1108,7 +1107,7 @@ bool vehicle::has_security_working() const bool found_security = false; if( fuel_left( fuel_type_battery ) > 0 ) { for( int s : speciality ) { - if( part_flag( s, "SECURITY" ) && parts[ s ].is_available() ) { + if( part_flag( s, flag_SECURITY ) && parts[ s ].is_available() ) { found_security = true; break; } @@ -2007,7 +2006,7 @@ bool vehicle::remove_part( const int p, RemovePartHandler &handler ) const tripoint part_loc = global_part_pos3( p ); // Unboard any entities standing on removed boardable parts - if( part_flag( p, "BOARDABLE" ) && parts[p].has_flag( vehicle_part::passenger_flag ) ) { + if( part_flag( p, flag_BOARDABLE ) && parts[p].has_flag( vehicle_part::passenger_flag ) ) { handler.unboard( part_loc ); } @@ -2044,7 +2043,7 @@ bool vehicle::remove_part( const int p, RemovePartHandler &handler ) } // Update current engine configuration if needed - if( part_flag( p, "ENGINE" ) && engines.size() > 1 ) { + if( part_flag( p, flag_ENGINE ) && engines.size() > 1 ) { bool any_engine_on = false; for( auto &e : engines ) { @@ -2066,7 +2065,7 @@ bool vehicle::remove_part( const int p, RemovePartHandler &handler ) const auto lz_iter = loot_zones.find( parts[p].mount ); const bool no_zone = lz_iter != loot_zones.end(); - if( no_zone && part_flag( p, "CARGO" ) ) { + if( no_zone && part_flag( p, flag_CARGO ) ) { // Using the key here (instead of the iterator) will remove all zones on // this mount points regardless of how many there are loot_zones.erase( parts[p].mount ); @@ -2348,7 +2347,7 @@ bool vehicle::find_and_split_vehicles( int exclude ) void vehicle::relocate_passengers( const std::vector &passengers ) { - const auto boardables = get_avail_parts( "BOARDABLE" ); + const auto boardables = get_avail_parts( flag_BOARDABLE ); for( player *passenger : passengers ) { for( const vpart_reference &vp : boardables ) { if( vp.part().passenger_id == passenger->getID() ) { @@ -2438,7 +2437,7 @@ bool vehicle::split_vehicles( const std::vector> &new_vehs, player *passenger = nullptr; // Unboard any entities standing on any transferred part - if( part_flag( mov_part, "BOARDABLE" ) ) { + if( part_flag( mov_part, flag_BOARDABLE ) ) { passenger = get_passenger( mov_part ); if( passenger ) { passengers.push_back( passenger ); @@ -2792,7 +2791,7 @@ int vehicle::next_part_to_close( int p, bool outside ) const if( part_flag( *part_it, VPFLAG_OPENABLE ) && parts[ *part_it ].is_available() && parts[*part_it].open == 1 - && ( !outside || !part_flag( *part_it, "OPENCLOSE_INSIDE" ) ) ) { + && ( !outside || !part_flag( *part_it, flag_OPENCLOSE_INSIDE ) ) ) { return *part_it; } } @@ -2806,7 +2805,7 @@ int vehicle::next_part_to_open( int p, bool outside ) const // We want forwards, since we open the innermost thing first (curtains), and then the innermost thing (door) for( auto &elem : parts_here ) { if( part_flag( elem, VPFLAG_OPENABLE ) && parts[ elem ].is_available() && parts[elem].open == 0 && - ( !outside || !part_flag( elem, "OPENCLOSE_INSIDE" ) ) ) { + ( !outside || !part_flag( elem, flag_OPENCLOSE_INSIDE ) ) ) { return elem; } } @@ -3115,7 +3114,7 @@ int vehicle::roof_at_part( const int part ) const { std::vector parts_in_square = parts_at_relative( parts[part].mount, true ); for( const int p : parts_in_square ) { - if( part_info( p ).location == "on_roof" || part_flag( p, "ROOF" ) ) { + if( part_info( p ).location == "on_roof" || part_flag( p, flag_ROOF ) ) { return p; } } @@ -3769,7 +3768,7 @@ void vehicle::noise_and_smoke( int load, time_duration time ) double muffle = 1.0; double m = 0.0; int exhaust_part = -1; - for( const vpart_reference &vp : get_avail_parts( "MUFFLER" ) ) { + for( const vpart_reference &vp : get_avail_parts( flag_MUFFLER ) ) { m = 1.0 - ( 1.0 - vp.info().bonus / 100.0 ) * vp.part().health_percent(); if( m < muffle ) { muffle = m; @@ -5629,7 +5628,8 @@ void vehicle::remove_remote_part( int part_num ) int remote_partnum = veh->loose_parts[j]; auto remote_part = &veh->parts[remote_partnum]; - if( veh->part_flag( remote_partnum, "POWER_TRANSFER" ) && remote_part->target.first == local_abs ) { + if( veh->part_flag( remote_partnum, flag_POWER_TRANSFER ) && + remote_part->target.first == local_abs ) { veh->remove_part( remote_partnum ); return; } @@ -5643,7 +5643,7 @@ void vehicle::shed_loose_parts() // it will stay empty. while( !loose_parts.empty() ) { const int elem = loose_parts.front(); - if( part_flag( elem, "POWER_TRANSFER" ) ) { + if( part_flag( elem, flag_POWER_TRANSFER ) ) { remove_remote_part( elem ); } @@ -5694,12 +5694,12 @@ void vehicle::refresh_insides() bool cover = false; for( auto &j : parts_n3ar ) { // another roof -- cover - if( part_flag( j, "ROOF" ) && parts[ j ].is_available() ) { + if( part_flag( j, flag_ROOF ) && parts[ j ].is_available() ) { cover = true; break; - } else if( part_flag( j, "OBSTACLE" ) && parts[ j ].is_available() ) { + } else if( part_flag( j, flag_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 ) ) { + if( parts[j].inside || ( part_flag( j, flag_OPENABLE ) && parts[j].open ) ) { // door and it's open -- can't cover continue; } @@ -5748,8 +5748,8 @@ int vehicle::damage( int p, int dmg, damage_type type, bool aimed ) if( !aimed ) { bool found_obs = false; for( auto &i : pl ) { - if( part_flag( i, "OBSTACLE" ) && - ( !part_flag( i, "OPENABLE" ) || !parts[i].open ) ) { + if( part_flag( i, flag_OBSTACLE ) && + ( !part_flag( i, flag_OPENABLE ) || !parts[i].open ) ) { found_obs = true; break; } @@ -5763,12 +5763,12 @@ int vehicle::damage( int p, int dmg, damage_type type, bool aimed ) int target_part = random_entry( pl ); // door motor mechanism is protected by closed doors - if( part_flag( target_part, "DOOR_MOTOR" ) ) { + if( part_flag( target_part, flag_DOOR_MOTOR ) ) { // find the most strong openable that is not open int strongest_door_part = -1; int strongest_door_durability = INT_MIN; for( int part : pl ) { - if( part_flag( part, "OPENABLE" ) && !parts[part].open ) { + if( part_flag( part, flag_OPENABLE ) && !parts[part].open ) { int door_durability = part_info( part ).durability; if( door_durability > strongest_door_durability ) { strongest_door_part = part; @@ -5793,7 +5793,8 @@ int vehicle::damage( int p, int dmg, damage_type type, bool aimed ) // Covered by armor -- hit both armor and part, but reduce damage by armor's reduction int protection = part_info( armor_part ).damage_reduction[ type ]; // Parts on roof aren't protected - bool overhead = part_flag( target_part, "ROOF" ) || part_info( target_part ).location == "on_roof"; + bool overhead = part_flag( target_part, flag_ROOF ) || + part_info( target_part ).location == "on_roof"; // Calling damage_direct may remove the damaged part // completely, therefore the other index (target_part) becomes // wrong if target_part > armor_part. @@ -6037,7 +6038,7 @@ int vehicle::damage_direct( int p, int dmg, damage_type type ) if( parts[p].is_fuel_store() ) { explode_fuel( p, type ); - } else if( parts[ p ].is_broken() && part_flag( p, "UNMOUNT_ON_DAMAGE" ) ) { + } else if( parts[ p ].is_broken() && part_flag( p, flag_UNMOUNT_ON_DAMAGE ) ) { g->m.spawn_item( global_part_pos3( p ), part_info( p ).item, 1, 0, calendar::turn ); monster *mon = get_pet( p ); if( mon != nullptr && mon->has_effect( effect_harnessed ) ) { diff --git a/src/vehicle_display.cpp b/src/vehicle_display.cpp index 87d03854a956a..0a619ecf315fc 100644 --- a/src/vehicle_display.cpp +++ b/src/vehicle_display.cpp @@ -20,9 +20,8 @@ #include "units.h" #include "color.h" #include "optional.h" +#include "cata_string_consts.h" -static const std::string part_location_structure( "structure" ); -static const itype_id fuel_type_muscle( "muscle" ); std::string vehicle::disp_name() const { @@ -171,7 +170,7 @@ int vehicle::print_part_list( const catacurses::window &win, int y1, const int m } } - if( part_flag( pl[i], "CARGO" ) ) { + if( part_flag( pl[i], flag_CARGO ) ) { //~ used/total volume of a cargo vehicle part partname += string_format( _( " (vol: %s/%s %s)" ), format_volume( stored_volume( pl[i] ) ), @@ -179,7 +178,7 @@ int vehicle::print_part_list( const catacurses::window &win, int y1, const int m volume_units_abbr() ); } - bool armor = part_flag( pl[i], "ARMOR" ); + bool armor = part_flag( pl[i], flag_ARMOR ); std::string left_sym; std::string right_sym; if( armor ) { diff --git a/src/vehicle_move.cpp b/src/vehicle_move.cpp index 82d2da1dd839f..fe75bf33e5588 100644 --- a/src/vehicle_move.cpp +++ b/src/vehicle_move.cpp @@ -652,7 +652,7 @@ veh_collision vehicle::part_collision( int part, const tripoint &p, // No blood from hallucinations if( critter != nullptr && !critter->is_hallucination() ) { - if( part_flag( ret.part, "SHARP" ) ) { + if( part_flag( ret.part, flag_SHARP ) ) { parts[ret.part].blood += ( 20 + dam ) * 5; } else if( dam > rng( 10, 30 ) ) { parts[ret.part].blood += ( 10 + dam / 2 ) * 5; @@ -669,7 +669,7 @@ veh_collision vehicle::part_collision( int part, const tripoint &p, if( ph != nullptr ) { ph->hitall( dam, 40, driver ); } else { - const int armor = part_flag( ret.part, "SHARP" ) ? + const int armor = part_flag( ret.part, flag_SHARP ) ? critter->get_armor_cut( bp_torso ) : critter->get_armor_bash( bp_torso ); dam = std::max( 0, dam - armor ); @@ -727,7 +727,7 @@ veh_collision vehicle::part_collision( int part, const tripoint &p, } } - if( part_flag( ret.part, "SHARP" ) ) { + if( part_flag( ret.part, flag_SHARP ) ) { critter->bleed(); } else { sounds::sound( p, 20, sounds::sound_t::combat, snd, false, "smash_success", "hit_vehicle" ); diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp index c6e90526023e3..f09462cf799c1 100644 --- a/src/vehicle_use.cpp +++ b/src/vehicle_use.cpp @@ -114,7 +114,7 @@ void vehicle::add_toggle_to_opts( std::vector &options, void vehicle::control_doors() { - const auto door_motors = get_avail_parts( "DOOR_MOTOR" ); + const auto door_motors = get_avail_parts( flag_DOOR_MOTOR ); // Indices of doors std::vector< int > doors_with_motors; // Locations used to display the doors @@ -174,7 +174,7 @@ void vehicle::control_doors() if( open ) { int part = next_part_to_open( motor ); if( part != -1 ) { - if( !part_flag( part, "CURTAIN" ) && option == OPENCURTAINS ) { + if( !part_flag( part, flag_CURTAIN ) && option == OPENCURTAINS ) { continue; } open_or_close( part, open ); @@ -188,7 +188,7 @@ void vehicle::control_doors() } else { int part = next_part_to_close( motor ); if( part != -1 ) { - if( part_flag( part, "CURTAIN" ) && option == CLOSEDOORS ) { + if( part_flag( part, flag_CURTAIN ) && option == CLOSEDOORS ) { continue; } open_or_close( part, open ); @@ -447,7 +447,7 @@ void vehicle::smash_security_system() int s = -1; int c = -1; for( int p : speciality ) { - if( part_flag( p, "SECURITY" ) && !parts[ p ].is_broken() ) { + if( part_flag( p, flag_SECURITY ) && !parts[ p ].is_broken() ) { s = p; c = part_with_feature( s, "CONTROLS", true ); break; @@ -1057,10 +1057,10 @@ void vehicle::honk_horn() const bool no_power = !fuel_left( fuel_type_battery, true ); bool honked = false; - for( const vpart_reference &vp : get_avail_parts( "HORN" ) ) { + for( const vpart_reference &vp : get_avail_parts( flag_HORN ) ) { //Only bicycle horn doesn't need electricity to work const vpart_info &horn_type = vp.info(); - if( ( horn_type.get_id() != vpart_id( "horn_bicycle" ) ) && no_power ) { + if( ( horn_type.get_id() != vpart_horn_bicycle ) && no_power ) { continue; } if( !honked ) { @@ -1138,7 +1138,7 @@ void vehicle::beeper_sound() } const bool odd_turn = calendar::once_every( 2_turns ); - for( const vpart_reference &vp : get_avail_parts( "BEEPER" ) ) { + for( const vpart_reference &vp : get_avail_parts( flag_BEEPER ) ) { if( ( odd_turn && vp.has_feature( VPFLAG_EVENTURN ) ) || ( !odd_turn && vp.has_feature( VPFLAG_ODDTURN ) ) ) { continue; @@ -1716,7 +1716,7 @@ void vehicle::use_harness( int part, const tripoint &pos ) } else if( !m.has_flag( MF_PET_MOUNTABLE ) && !m.has_flag( MF_PET_HARNESSABLE ) ) { add_msg( m_info, _( "This creature cannot be harnessed." ) ); return; - } else if( !part_flag( part, Harness_Bodytype ) && !part_flag( part, "HARNESS_any" ) ) { + } else if( !part_flag( part, Harness_Bodytype ) && !part_flag( part, flag_HARNESS_any ) ) { add_msg( m_info, _( "The harness is not adapted for this creature morphology." ) ); return; } diff --git a/tests/npc_test.cpp b/tests/npc_test.cpp index 3c55d4561e34e..7e611734e6993 100644 --- a/tests/npc_test.cpp +++ b/tests/npc_test.cpp @@ -309,8 +309,6 @@ TEST_CASE( "npc-movement" ) const ter_id t_floor( "t_floor" ); const furn_id f_rubble( "f_rubble" ); const furn_id f_null( "f_null" ); - const vpart_id vpart_frame_vertical( "frame_vertical" ); - const vpart_id vpart_seat( "seat" ); g->place_player( tripoint( 60, 60, 0 ) ); diff --git a/tests/vehicle_drag_test.cpp b/tests/vehicle_drag_test.cpp index 0968ca6b5ed21..8a67870ca7316 100644 --- a/tests/vehicle_drag_test.cpp +++ b/tests/vehicle_drag_test.cpp @@ -18,11 +18,10 @@ #include "type_id.h" #include "point.h" #include "vpart_position.h" +#include "cata_string_consts.h" using efficiency_stat = statistics; -const efftype_id effect_blind( "blind" ); - static void clear_game_drag( const ter_id &terrain ) { // Set to turn 0 to prevent solars from producing power @@ -60,7 +59,7 @@ static void clear_game_drag( const ter_id &terrain ) static vehicle *setup_drag_test( const vproto_id &veh_id ) { - clear_game_drag( ter_id( "t_pavement" ) ); + clear_game_drag( ter_pavement ); const tripoint map_starting_point( 60, 60, 0 ); vehicle *veh_ptr = g->m.add_vehicle( veh_id, map_starting_point, -90, 0, 0 ); @@ -77,7 +76,7 @@ static vehicle *setup_drag_test( const vproto_id &veh_id ) veh_ptr->toggle_specific_part( vp.part_index(), true ); } // close the doors - const auto doors = veh_ptr->get_avail_parts( "OPENABLE" ); + const auto doors = veh_ptr->get_avail_parts( flag_OPENABLE ); for( const vpart_reference vp : doors ) { const size_t door = vp.part_index(); veh_ptr->close( door ); diff --git a/tests/vehicle_efficiency_test.cpp b/tests/vehicle_efficiency_test.cpp index ef9b7b2a86e53..4b3eabf3f3053 100644 --- a/tests/vehicle_efficiency_test.cpp +++ b/tests/vehicle_efficiency_test.cpp @@ -32,11 +32,10 @@ #include "type_id.h" #include "point.h" #include "vpart_position.h" +#include "cata_string_consts.h" using efficiency_stat = statistics; -const efftype_id effect_blind( "blind" ); - static void clear_game( const ter_id &terrain ) { // Set to turn 0 to prevent solars from producing power @@ -86,7 +85,7 @@ static std::map set_vehicle_fuel( vehicle &v, const float veh_fue } // We ignore battery when setting fuel because it uses designated "tanks" - actually_used.erase( "battery" ); + actually_used.erase( fuel_type_battery ); // Currently only one liquid fuel supported REQUIRE( actually_used.size() <= 1 ); @@ -105,8 +104,8 @@ static std::map set_vehicle_fuel( vehicle &v, const float veh_fue vehicle_part &pt = vp.part(); if( pt.is_battery() ) { - pt.ammo_set( "battery", pt.ammo_capacity() * veh_fuel_mult ); - ret[ "battery" ] += pt.ammo_capacity() * veh_fuel_mult; + pt.ammo_set( fuel_type_battery, pt.ammo_capacity() * veh_fuel_mult ); + ret[ fuel_type_battery ] += pt.ammo_capacity() * veh_fuel_mult; } else if( pt.is_tank() && liquid_fuel != "null" ) { float qty = pt.ammo_capacity() * veh_fuel_mult; qty *= std::max( item::find_type( liquid_fuel )->stack_size, 1 ); @@ -119,7 +118,7 @@ static std::map set_vehicle_fuel( vehicle &v, const float veh_fue } // We re-add battery because we want it accounted for, just not in the section above - actually_used.insert( "battery" ); + actually_used.insert( fuel_type_battery ); for( auto iter = ret.begin(); iter != ret.end(); ) { if( iter->second <= 0 || actually_used.count( iter->first ) == 0 ) { iter = ret.erase( iter ); @@ -199,7 +198,7 @@ static int test_efficiency( const vproto_id &veh_id, int &expected_mass, veh_ptr->get_items( vp.part_index() ).clear(); vp.part().ammo_consume( vp.part().ammo_remaining(), vp.pos() ); } - for( const vpart_reference vp : veh.get_avail_parts( "OPENABLE" ) ) { + for( const vpart_reference vp : veh.get_avail_parts( flag_OPENABLE ) ) { veh.close( vp.part_index() ); } @@ -355,29 +354,29 @@ static void test_vehicle( const int pavement_target_smooth_stops = 0, const int dirt_target_smooth_stops = 0 ) { SECTION( type + " on pavement" ) { - test_efficiency( vproto_id( type ), expected_mass, ter_id( "t_pavement" ), -1, + test_efficiency( vproto_id( type ), expected_mass, ter_pavement, -1, pavement_target ); } SECTION( type + " on dirt" ) { - test_efficiency( vproto_id( type ), expected_mass, ter_id( "t_dirt" ), -1, dirt_target ); + test_efficiency( vproto_id( type ), expected_mass, ter_dirt, -1, dirt_target ); } SECTION( type + " on pavement, full stop every 5 turns" ) { - test_efficiency( vproto_id( type ), expected_mass, ter_id( "t_pavement" ), 5, + test_efficiency( vproto_id( type ), expected_mass, ter_pavement, 5, pavement_target_w_stops ); } SECTION( type + " on dirt, full stop every 5 turns" ) { - test_efficiency( vproto_id( type ), expected_mass, ter_id( "t_dirt" ), 5, + test_efficiency( vproto_id( type ), expected_mass, ter_dirt, 5, dirt_target_w_stops ); } if( pavement_target_smooth_stops > 0 ) { SECTION( type + " on pavement, alternating 5 turns of acceleration and 5 turns of decceleration" ) { - test_efficiency( vproto_id( type ), expected_mass, ter_id( "t_pavement" ), 5, + test_efficiency( vproto_id( type ), expected_mass, ter_pavement, 5, pavement_target_smooth_stops, true ); } } if( dirt_target_smooth_stops > 0 ) { SECTION( type + " on dirt, alternating 5 turns of acceleration and 5 turns of decceleration" ) { - test_efficiency( vproto_id( type ), expected_mass, ter_id( "t_dirt" ), 5, + test_efficiency( vproto_id( type ), expected_mass, ter_dirt, 5, dirt_target_smooth_stops, true ); } } diff --git a/tests/vehicle_part_test.cpp b/tests/vehicle_part_test.cpp index c8fedbc139e1c..380a211cc17aa 100644 --- a/tests/vehicle_part_test.cpp +++ b/tests/vehicle_part_test.cpp @@ -1,11 +1,12 @@ #include "catch/catch.hpp" #include "veh_type.h" +#include "cata_string_consts.h" TEST_CASE( "verify_copy_from_gets_damage_reduction", "[vehicle]" ) { // Picking halfboard_horizontal as a vpart which is likely to remain // defined via copy-from, and which should have non-zero damage reduction. - const vpart_info &vp = vpart_id( "halfboard_horizontal" ).obj(); + const vpart_info &vp = vpart_halfboard_horizontal.obj(); CHECK( vp.damage_reduction[DT_BASH] != 0 ); } diff --git a/tests/vehicle_turrets_test.cpp b/tests/vehicle_turrets_test.cpp index 0bd67ad94903d..7bbc608b983cc 100644 --- a/tests/vehicle_turrets_test.cpp +++ b/tests/vehicle_turrets_test.cpp @@ -70,12 +70,12 @@ TEST_CASE( "vehicle_turret", "[vehicle] [gun] [magazine] [.]" ) const int idx = veh->install_part( point_zero, e->get_id(), true ); REQUIRE( idx >= 0 ); - REQUIRE( veh->install_part( point_zero, vpart_id( "storage_battery" ), true ) >= 0 ); + REQUIRE( veh->install_part( point_zero, vpart_storage_battery, true ) >= 0 ); veh->charge_battery( 10000 ); auto ammo = ammotype( veh->turret_query( veh->parts[idx] ).base()->ammo_default() ); - if( veh->part_flag( idx, "USE_TANKS" ) ) { + if( veh->part_flag( idx, flag_USE_TANKS ) ) { auto *tank = biggest_tank( ammo ); REQUIRE( tank ); INFO( tank->get_id().str() ); From 9a78ab5c7c25b5bc89fc8ca1e72f5d26fcf8ec4d Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Sat, 22 Feb 2020 02:11:23 -0600 Subject: [PATCH 12/56] Grammar/Spelling (#38006) --- CMakeLists.txt | 2 +- data/json/items/armor/hats.json | 2 +- data/json/items/book/misc.json | 2 +- data/json/monsters/reptile_amphibian.json | 2 +- data/mods/Aftershock/items/items.json | 2 +- data/mods/Aftershock/items/obsolete.json | 2 +- data/mods/CRT_EXPANSION/items/crt_armor.json | 18 +++++++++--------- data/mods/CRT_EXPANSION/items/crt_gunmods.json | 2 +- .../CRT_EXPANSION/items/crt_toolarmor.json | 2 +- data/mods/Magiclysm/effects/effects.json | 2 +- data/xdg/cataclysm-dda.appdata.xml | 2 +- doc/BASECAMP.md | 8 ++++---- doc/SOUNDPACKS.md | 2 +- src/cata_tiles.cpp | 6 +++--- src/item.cpp | 14 +++++++------- src/item.h | 2 +- src/material.h | 2 +- tests/catch/catch.hpp | 2 +- tests/temperature_test.cpp | 14 +++++++------- 19 files changed, 44 insertions(+), 44 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8a74260c2b57..21089148f6b38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ ELSE (CMAKE_BUILD_TYPE STREQUAL Debug) MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH : ${PIXMAPS_UNITY_ENTRY_PATH}") MESSAGE(STATUS "MANPAGE_ENTRY_PATH : ${MANPAGE_ENTRY_PATH}\n") ADD_DEFINITIONS(-DRELEASE) - # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS. + # Use PREFIX as storage of data,gfx, etc.. Useful only on *nix OS. IF (PREFIX AND NOT WIN32) ADD_DEFINITIONS(-DDATA_DIR_PREFIX) ENDIF (PREFIX AND NOT WIN32) diff --git a/data/json/items/armor/hats.json b/data/json/items/armor/hats.json index 07813890e5b1e..76526491b9ede 100644 --- a/data/json/items/armor/hats.json +++ b/data/json/items/armor/hats.json @@ -593,7 +593,7 @@ "type": "ARMOR", "name": "golf cap", "//": "Head encumbrance stops you from wearing additional headgear. No helmet over a ballcap, sorry. But brimmed gear gets the anti-glare flag!", - "description": "You're not actually sure if this is called a golf cap but it's the stereotypical cap golfers wear.", + "description": "You're not actually sure if this is called a golf cap, but it's the stereotypical cap golfers wear.", "weight": "85 g", "volume": "500 ml", "price": 2200, diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json index 975b1559d0f8e..761eea45f34c1 100644 --- a/data/json/items/book/misc.json +++ b/data/json/items/book/misc.json @@ -1647,7 +1647,7 @@ }, { "id": "fancy9", - "text": "This copy of Ray Bradbury's \"Farenheit 451\" has a certificate of authenticity declaring it to be an early edition. It would have been worth an enormous amount of money, not long ago." + "text": "This copy of Ray Bradbury's \"Fahrenheit 451\" has a certificate of authenticity declaring it to be an early edition. It would have been worth an enormous amount of money, not long ago." }, { "id": "fancy10", diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json index a3904f354cd57..0655fcb1734dd 100644 --- a/data/json/monsters/reptile_amphibian.json +++ b/data/json/monsters/reptile_amphibian.json @@ -33,7 +33,7 @@ "id": "mon_gator", "type": "MONSTER", "name": "sewer gator", - "description": "In the late 20th century there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers. This large specimen doesn't look like it sees humans as anything other than a meal.", + "description": "In the late 20th century, there was an urban legend about pet alligators getting flushed down the toilet and growing to adulthood in sewers. This large specimen doesn't look like it sees humans as anything other than a meal.", "default_faction": "gator", "bodytype": "gator", "categories": [ "WILDLIFE" ], diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json index c29f17d589b22..a86418a72ceaf 100644 --- a/data/mods/Aftershock/items/items.json +++ b/data/mods/Aftershock/items/items.json @@ -198,7 +198,7 @@ "category": "spare_parts", "name": "titanium", "name_plural": "titanium", - "description": "A strong, durable metal. Highly valued for its weight to strength ratio, it was an excellent upgrade to aluminium for those properties albeit a lot more expensive due to rarity. More commonly used in jewellery and medical implants.", + "description": "A strong, durable metal. Highly valued for its weight to strength ratio, it was an excellent upgrade to aluminum for those properties albeit a lot more expensive due to rarity. More commonly used in jewelery and medical implants.", "weight": "1 g", "//": "Density 4.506g/cm³ ~ 1.127kg/250ml @ stack 1000 = 1g/unit", "volume": "50 ml", diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json index 7d56651b12f54..4616cf36e2756 100644 --- a/data/mods/Aftershock/items/obsolete.json +++ b/data/mods/Aftershock/items/obsolete.json @@ -238,7 +238,7 @@ "id": "afs_brigandine_crafted", "type": "ARMOR", "name": "crafted brigandine", - "description": "Modelled after a proper brigandine from medieval times, this makeshift piece of body armor consists of layered cloth with small pieces of sheet metal affixed to the underside. While not as protective as a proper piece of armor, it'll still keep you relatively safe.", + "description": "Modeled after a proper brigandine from medieval times, this makeshift piece of body armor consists of layered cloth with small pieces of sheet metal affixed to the underside. While not as protective as a proper piece of armor, it'll still keep you relatively safe.", "weight": "3268 g", "volume": "1500 ml", "price": 1000, diff --git a/data/mods/CRT_EXPANSION/items/crt_armor.json b/data/mods/CRT_EXPANSION/items/crt_armor.json index 773440e8e17ee..b25dd4bd65ed2 100644 --- a/data/mods/CRT_EXPANSION/items/crt_armor.json +++ b/data/mods/CRT_EXPANSION/items/crt_armor.json @@ -4,7 +4,7 @@ "type": "ARMOR", "category": "armor", "name": "CRIT face mask", - "description": "This is the C.R.I.T standard issue face mask, lined with kevlar for extra protection. A few filters provide decent enviromental safety, but it was not intended for extended use. It has a basic integrated HUD.", + "description": "This is the C.R.I.T standard issue face mask, lined with Kevlar for extra protection. A few filters provide decent environmental safety, but it was not intended for extended use. It has a basic integrated HUD.", "weight": "5 kg", "volume": "1 L", "price": 2500000, @@ -26,7 +26,7 @@ "copy-from": "crt_la_boots", "type": "ARMOR", "name": { "str": "pair of CRIT boots", "str_pl": "pairs of CRIT boots" }, - "description": "C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and hygenic during long-term missions while absorbing shock and heat from outside-sources. Superalloy mesh and rubber offer quite a bit of chemical protection as well. Decently heavy though", + "description": "C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and hygienic during long-term missions while absorbing shock and heat from outside-sources. Superalloy mesh and rubber offer quite a bit of chemical protection as well. Decently heavy though", "color": "dark_gray", "weight": "1500 g", "price": 250000, @@ -78,7 +78,7 @@ "type": "ARMOR", "name": "pair of CRIT fingertip-less liners", "name_plural": "pairs of CRIT fingertip-less liners", - "description": "C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh for warmth and fingertip-less for those with gene-modding and/or mutations while still allowing greater manipulation of items and moderate protection.", + "description": "C.R.I.T standard-issue glove liners. Made with neoprene and rubber mesh for warmth and fingertip-less for those with gene-modding and/or mutations while still allowing greater manipulation of items and moderate protection.", "encumbrance": 3, "coverage": 85, "warmth": 15, @@ -206,7 +206,7 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Engineering Suit", - "description": "An airtight, flexible suit of woven composite fibers complete with segmented plates of armor. A complex system digitizes items in an individual pocket universe for storage while built in joint-torsion ratchets generate the neccessary energy required to power the interface.", + "description": "An airtight, flexible suit of woven composite fibers complete with segmented plates of armor. A complex system digitizes items in an individual pocket universe for storage while built in joint-torsion ratchets generate the necessary energy required to power the interface.", "weight": "13460 g", "volume": "14250 ml", "price": 900000000, @@ -230,7 +230,7 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Armored Anomaly Suit", - "description": "A relatively simple suit of armor. A suit of woven composite fibers combined with a cleansuit core and strategically placed segmented kevlar plates keep the suit light-weight and the one wearing it alive while offering superb resistance to the elements and ambient radiation. ", + "description": "A relatively simple suit of armor. A suit of woven composite fibers combined with a cleansuit core and strategically placed segmented Kevlar plates keep the suit light-weight and the one wearing it alive while offering superb resistance to the elements and ambient radiation. ", "weight": "11460 g", "volume": "11250 ml", "price": 900000000, @@ -272,7 +272,7 @@ "type": "ARMOR", "category": "armor", "name": { "str": "CRIT Enforcer armor assembly", "str_pl": "CRIT Enforcer armor assemblies" }, - "description": "A series of plates, guards and buckles which assemble into a suit of sturdy body-armor which usually goes over other armor. Overlapping steel plates on top of kevlar plates cover vast expanses as the armor juts off in places so it can deflect attacks. Built with the idea that comfort is less important than safety, this heavy suit is difficult to move about in but highly protective. Various adjustable conectors such as straps and clips hold it together.", + "description": "A series of plates, guards and buckles which assemble into a suit of sturdy body-armor which usually goes over other armor. Overlapping steel plates on top of Kevlar plates cover vast expanses as the armor juts off in places so it can deflect attacks. Built with the idea that comfort is less important than safety, this heavy suit is difficult to move about in but highly protective. Various adjustable connectors such as straps and clips hold it together.", "weight": "21460 g", "volume": "11250 ml", "price": 900000000, @@ -296,7 +296,7 @@ "category": "armor", "name": "pair of CRIT Enforcer docks", "name_plural": "pairs of CRIT Enforcer docks", - "description": "C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of oversized feet which clamp down onto your owm footwear keep your feet out of harms way. It looks terrible and feels clunky unlike most of C.R.I.T's designs, but they do seem to be worth using if you were to be in the middle of a warzone.", + "description": "C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of oversized feet which clamp down onto your own footwear keep your feet out of harms way. It looks terrible and feels clunky unlike most of C.R.I.T's designs, but they do seem to be worth using if you were to be in the middle of a warzone.", "weight": "2060 g", "volume": "1500 ml", "price": 100000, @@ -318,7 +318,7 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Soldier Suit", - "description": "A suit of modern body-armor. Strategically placed superalloy plates keep the suit's weight minimal while kevlar plates other areas and a lining of soft neoprene pads areas for extra comfort. Most importantly, this can be worn comfortably under other armor.", + "description": "A suit of modern body-armor. Strategically placed superalloy plates keep the suit's weight minimal while Kevlar plates other areas and a lining of soft neoprene pads areas for extra comfort. Most importantly, this can be worn comfortably under other armor.", "weight": "5439 g", "volume": "6250 ml", "price": 900000000, @@ -339,7 +339,7 @@ "type": "ARMOR", "category": "armor", "name": "CRIT Lone Wolf Series Armor", - "description": "A matte black suit of outdated and bulky looking plate armor fitted onto a soft kevlar body-suit. Retrofitted with new armor improvements, this heavy armor will definitely protect you from practically anything. Just make sure you can actually walk with it on though.", + "description": "A matte black suit of outdated and bulky looking plate armor fitted onto a soft Kevlar body-suit. Retrofitted with new armor improvements, this heavy armor will definitely protect you from practically anything. Just make sure you can actually walk with it on though.", "weight": "42563 g", "volume": "12500 ml", "price": 100000000, diff --git a/data/mods/CRT_EXPANSION/items/crt_gunmods.json b/data/mods/CRT_EXPANSION/items/crt_gunmods.json index 7a8d901e64ae8..b6ce28ff018ab 100644 --- a/data/mods/CRT_EXPANSION/items/crt_gunmods.json +++ b/data/mods/CRT_EXPANSION/items/crt_gunmods.json @@ -97,7 +97,7 @@ "id": "flash_acc_on", "type": "GUNMOD", "name": { "str": "tactical flashlight (on)", "str_pl": "tactical flashlights (on)" }, - "description": "A compact flashlight which is attatched to the side of your weapon, not powerful, but good enough for tight hallways.", + "description": "A compact flashlight which is attached to the side of your weapon, not powerful, but good enough for tight hallways.", "weight": "250 g", "volume": "125 ml", "integral_volume": 0, diff --git a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json index 20c9ed0e40ca9..d9c370b53c5ef 100644 --- a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json +++ b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json @@ -181,7 +181,7 @@ "copy-from": "helmet_army", "type": "TOOL_ARMOR", "name": { "str": "CRIT helmet (on)", "str_pl": "CRIT helmets (on)" }, - "description": "C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of insulated steel mesh for neck warmth and protection. A tactically dim flashlight is attatched to the side. This light is currently on and drawing power.", + "description": "C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of insulated steel mesh for neck warmth and protection. A tactically dim flashlight is attached to the side. This light is currently on and drawing power.", "color": "light_gray", "material": [ "kevlar", "hardsteel" ], "flags": [ diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 625ca6607debf..0bbba250cf1e7 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -63,7 +63,7 @@ { "type": "effect_type", "id": "protect_env", - "name": [ "Enviromental Protection" ], + "name": [ "Environmental Protection" ], "desc": [ "You are protected by an energy field." ], "apply_message": "You are protected by an energy field.", "remove_message": "Your energy field fades.", diff --git a/data/xdg/cataclysm-dda.appdata.xml b/data/xdg/cataclysm-dda.appdata.xml index 8d524ea844095..9ed337eaacb13 100644 --- a/data/xdg/cataclysm-dda.appdata.xml +++ b/data/xdg/cataclysm-dda.appdata.xml @@ -20,7 +20,7 @@

As your game begins, you awaken with hazy memories of violence - and terror from when the world suddenly unravelled around + and terror from when the world suddenly unraveled around you. Now you need to explore your surroundings, and secure food, water and safety. After that, who knows? Long term survival will mean tapping abilities you haven’t used before, learning to diff --git a/doc/BASECAMP.md b/doc/BASECAMP.md index ab1708ad0e193..a0fececdc6e27 100644 --- a/doc/BASECAMP.md +++ b/doc/BASECAMP.md @@ -11,14 +11,14 @@ A basecamp upgrade path is a series of basecamp upgrade missions that upgrade th Bascamp upgrade paths are defined by several related files: * The recipe JSONs that define what the material, tool, and skill requirements to perform an upgrade mission and the blueprint mapgen, blueprint requirements, blueprint provides, and blueprint resources associated with each upgrade mission. * The mapgen_update JSONs that define how the map will change when the upgrade mission is complete. These may include shared instances of nested mapgen, such a standard room or tent. -* The recipe_group JSONs that define what recipes can be crafted after completing the upgrade mission and what camps and expansions are avialable. +* The recipe_group JSONs that define what recipes can be crafted after completing the upgrade mission and what camps and expansions are available. ## recipe JSONs The recipe JSONs are standard recipe JSONs, with the addition of a few fields. New field | Description -- | -- -`"construction_blueprint"` | string, the `"update_mapgen_id"` of the mapgen_update JSON that will be peformed when the upgrade mission is complete. +`"construction_blueprint"` | string, the `"update_mapgen_id"` of the mapgen_update JSON that will be performed when the upgrade mission is complete. `"construction_name"` | string, a short description/name of the upgrade mission that is displayed in the base camp mission selector. The recipe's `"description"` field has the extended description that explains why a player might want to have an NPC perform this upgrade mission. `"blueprint_provides"` | array of objects, with each object having an `"id"` string and an optional `"amount"` integer. These are the camp features that are available when the upgrade mission is complete. Every upgrade mission provides its recipe `"result"` with an amount of 1 automatically and that string does not need to be listed in `"blueprint_provides"`. `"blueprint_requires"` | array of objects, with each object having an `"id"` string and an optional `"amount"` integer. These are the camp features that are required before the upgrade mission can be attempted. @@ -28,7 +28,7 @@ New field | Description ### blueprint requires, provides, and excludes blueprint requires, blueprint provides, and blueprint exlcudes are abstract concepts or flags that an upgrade mission requires to start, or that are provided by a previous upgrade mission to satisfy the blueprint requirements of a current upgrade mission, or that prevent an upgrade mission from being available. Each one has an `"id"` and an `"amount"`. Multiple requires, provides, or excludes with the same `"id"` sum their `"amount"` if they're on the same basecamp expansion. -Every upgrade mission has its recipe `"result"` as a blueprint_provides and a blueprint_excludes, so upgrade missions will automatically prevent themselves from being repatable. +Every upgrade mission has its recipe `"result"` as a blueprint_provides and a blueprint_excludes, so upgrade missions will automatically prevent themselves from being repeatable. These are arbitrary strings and can be used to control the branching of the upgrade paths. However, some strings have meaning within the basecamp code: @@ -54,7 +54,7 @@ provides `"id"` | meaning `"dismantling"` | after this upgrade mission is complete, the Chop Shop basecamp mission will be available. `"farming"` | after this upgrade mission is complete, the Plow Fields, Plant Fields, Fertilize Fields, and Harvest Fields basecamp missions will be available. -`blueprint_provides` can also be used to name objects from `recipe_group.json`. The recipes will be craftable by NPCs at that expansion, allowing the creation of custom recipes that can be performed exlusively at faction camps. +`blueprint_provides` can also be used to name objects from `recipe_group.json`. The recipes will be craftable by NPCs at that expansion, allowing the creation of custom recipes that can be performed exclusively at faction camps. ### Sample recipe JSON ```JSON diff --git a/doc/SOUNDPACKS.md b/doc/SOUNDPACKS.md index 54f93622f7fca..25ce2c972377f 100644 --- a/doc/SOUNDPACKS.md +++ b/doc/SOUNDPACKS.md @@ -124,7 +124,7 @@ Where id describes the id of the sound effect, and a list of variants separated * `reload ` * `bullet_hit hit_flesh|hit_wall|hit_metal|hit_glass|hit_water` - # enviromental sfx, here divided by sections for clarity + # environmental sfx, here divided by sections for clarity * `environment thunder_near|thunder_far` * `environment daytime|nighttime` * `environment indoors|indoors_rain|underground` diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index a27c515e949b7..0ae953c69f1a3 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -2205,7 +2205,7 @@ bool cata_tiles::draw_terrain( const tripoint &p, const lit_level ll, int &heigh // and then draw the override terrain const ter_id &t2 = overridden ? override->second : t; if( t2 ) { - // both the current and neighbouring overrides may change the appearance + // both the current and neighboring overrides may change the appearance // of the tile, so always re-calculate it. int subtile = 0; int rotation = 0; @@ -2369,7 +2369,7 @@ bool cata_tiles::draw_furniture( const tripoint &p, const lit_level ll, int &hei // and then draw the override furniture const furn_id &f2 = overridden ? override->second : f; if( f2 ) { - // both the current and neighbouring overrides may change the appearance + // both the current and neighboring overrides may change the appearance // of the tile, so always re-calculate it. const auto furn = [&]( const tripoint & q, const bool invis ) -> furn_id { const auto it = furniture_override.find( q ); @@ -2443,7 +2443,7 @@ bool cata_tiles::draw_trap( const tripoint &p, const lit_level ll, int &height_3 // and then draw the override trap const trap_id &tr2 = overridden ? override->second : tr; if( tr2 ) { - // both the current and neighbouring overrides may change the appearance + // both the current and neighboring overrides may change the appearance // of the tile, so always re-calculate it. const auto tr_at = [&]( const tripoint & q, const bool invis ) -> trap_id { const auto it = trap_override.find( q ); diff --git a/src/item.cpp b/src/item.cpp index 7c85ba1c9114d..687179425f4d5 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -8330,7 +8330,7 @@ void item::process_temperature_rot( float insulation, const tripoint &pos, // Process the past of this item since the last time it was processed while( time < now - 1_hours ) { - // Get the enviroment temperature + // Get the environment temperature time_duration time_delta = std::min( 1_hours, now - 1_hours - time ); time += time_delta; @@ -8363,8 +8363,8 @@ void item::process_temperature_rot( float insulation, const tripoint &pos, debugmsg( "Temperature flag enum not valid. Using normal temperature." ); } - // Calculate item temperature from enviroment temperature - // If the time was more than 2 d ago just set the item to enviroment temperature + // Calculate item temperature from environment temperature + // If the time was more than 2 d ago just set the item to environment temperature if( now - time > 2_days ) { // This value shouldn't be there anymore after the loop is done so we don't bother with the set_item_temperature() temperature = static_cast( 100000 * temp_to_kelvin( env_temperature ) ); @@ -8413,7 +8413,7 @@ void item::calc_temp( const int temp, const float insulation, const time_point & } const float mass = to_gram( weight() ); // g - // If item has negative energy set to enviroment temperature (it not been processed ever) + // If item has negative energy set to environment temperature (it not been processed ever) if( specific_energy < 0 ) { set_item_temperature( env_temperature ); last_temp_check = time; @@ -8441,7 +8441,7 @@ void item::calc_temp( const int temp, const float insulation, const time_point & // Temperature calculations based on Newton's law of cooling. // Calculations are done assuming that the item stays in its phase. - // This assumption can cause over heating when transitioning from meltiong to liquid. + // This assumption can cause over heating when transitioning from melting to liquid. // In other transitions the item may cool/heat too little but that won't be a problem. if( 0.00001 * specific_energy < completely_frozen_specific_energy ) { // Was solid. @@ -8464,7 +8464,7 @@ void item::calc_temp( const int temp, const float insulation, const time_point & if( new_specific_energy > completely_liquid_specific_energy ) { // The item then also finished melting. // This may happen rarely with very small items - // Just set the item to enviroment temperature + // Just set the item to environment temperature set_item_temperature( env_temperature ); last_temp_check = time; return; @@ -8493,7 +8493,7 @@ void item::calc_temp( const int temp, const float insulation, const time_point & if( new_specific_energy < completely_frozen_specific_energy ) { // The item then also finished freezing. // This may happen rarely with very small items - // Just set the item to enviroment temperature + // Just set the item to environment temperature set_item_temperature( env_temperature ); last_temp_check = time; return; diff --git a/src/item.h b/src/item.h index fdb28fd834016..47eb4085e896f 100644 --- a/src/item.h +++ b/src/item.h @@ -1138,7 +1138,7 @@ class item : public visitable float get_specific_heat_liquid() const; float get_specific_heat_solid() const; float get_latent_heat() const; - float get_freeze_point() const; // Farenheit + float get_freeze_point() const; // Fahrenheit // If this is food, returns itself. If it contains food, return that // contents. Otherwise, returns nullptr. diff --git a/src/material.h b/src/material.h index db2d43a010581..ba110253a9642 100644 --- a/src/material.h +++ b/src/material.h @@ -44,7 +44,7 @@ class material_type float _specific_heat_liquid = 4.186; float _specific_heat_solid = 2.108; float _latent_heat = 334; - int _freeze_point = 32; // Farenheit + int _freeze_point = 32; // Fahrenheit bool _edible = false; bool _rotting = false; bool _soft = false; diff --git a/tests/catch/catch.hpp b/tests/catch/catch.hpp index 7b561176d74dc..68816f142240a 100644 --- a/tests/catch/catch.hpp +++ b/tests/catch/catch.hpp @@ -226,7 +226,7 @@ namespace Catch { # endif // Universal Windows platform does not support SEH -// Or console colours (or console at all...) +// Or console colors (or console at all...) # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) # define CATCH_CONFIG_COLOUR_NONE # else diff --git a/tests/temperature_test.cpp b/tests/temperature_test.cpp index f7f8229264163..dc3a7d4514db1 100644 --- a/tests/temperature_test.cpp +++ b/tests/temperature_test.cpp @@ -48,13 +48,13 @@ TEST_CASE( "Item spawns with right thermal attributes" ) TEST_CASE( "Rate of temperature change" ) { - // Farenheits and kelvins get used and converted around + // Fahrenheits and kelvins get used and converted around // So there are small rounding errors everywhere // Check ranges instead of values when rounding errors // The calculations are done once every 101 turns (10 min 6 seconds) // Don't bother with times shorter than this - // Note: If process interval is longer than 1 hour the calculations will be done using the enviroment temperature + // Note: If process interval is longer than 1 hour the calculations will be done using the environment temperature // Processing intervals should be kept below 1 hour to avoid this. // Sections: @@ -64,7 +64,7 @@ TEST_CASE( "Rate of temperature change" ) SECTION( "Water bottle test (ralisticity)" ) { // Water at 55 C - // Enviroment at 20 C + // Environment at 20 C // 75 minutes // Water 1 and 2 processed at slightly different intervals // Temperature after should be approx 30 C for realistic values @@ -106,7 +106,7 @@ TEST_CASE( "Rate of temperature change" ) } SECTION( "Hot liquid to frozen" ) { - // 2x cooked meat (50 C) cooling in -20 C enviroment for several hours + // 2x cooked meat (50 C) cooling in -20 C environment for several hours // 1) Both at 50C and hot // 2) Wait a short time then Meat 1 at 33.5 C and not hot // 3) Wait less than an hour then Meat 1 and 2 at 0 C not frozen @@ -182,13 +182,13 @@ TEST_CASE( "Rate of temperature change" ) } SECTION( "Cold solid to liquid" ) { - // 2x cooked meat (-20 C) warming in 20 C enviroment for ~190 minutes + // 2x cooked meat (-20 C) warming in 20 C environment for ~190 minutes // 0 min: both at -20 C and frozen // 11 min: meat 1 at -5.2 C // 22 min: meat 1 step // 33 min: meat 1 step // 53 min: Meat 1, 2 at 0 C an frozen - // 143 min: Meat 1 and 2 at 0 C not fozen. + // 143 min: Meat 1 and 2 at 0 C not frozen. // Both have same energy (within rounding error) // 154 min: meat 1 step // 174 min: meat 1 step @@ -240,7 +240,7 @@ TEST_CASE( "Rate of temperature change" ) meat2.process_temperature_rot( 1, tripoint_zero, nullptr ); // 0C - // same tmep + // same temp // not frozen CHECK( is_nearly( meat1.temperature, 27315000 ) ); CHECK( is_nearly( meat2.temperature, meat1.temperature ) ); From 12fd7680c2ba97f34c0254ebf540644fce436a66 Mon Sep 17 00:00:00 2001 From: jkraybill Date: Sat, 22 Feb 2020 19:22:47 +1100 Subject: [PATCH 13/56] #38201, #37504 tweaked canning ratios --- data/json/items/containers.json | 2 +- data/json/recipes/food/canned.json | 31 ++++++++++++------------ data/json/recipes/food/offal_dishes.json | 4 +-- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 31b5950cc0827..fb0200d9ddbe0 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -1180,7 +1180,7 @@ "id": "can_food_big_unsealed", "copy-from": "can_food_big", "type": "CONTAINER", - "name": "opened large tin can", + "name": "large opened tin can", "description": "A large tin can, like what beans come in. This one is opened and can't be easily sealed.", "symbol": ")", "color": "blue", diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 97aafbbcb2d70..b4792d0e87095 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -358,16 +358,16 @@ "skill_used": "cooking", "difficulty": 4, "time": "30 m", - "result_mult": 2, + "result_mult": 4, "autolearn": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], "components": [ - [ [ "water", 11 ], [ "water_clean", 11 ] ], + [ [ "water", 12 ], [ "water_clean", 12 ] ], [ [ "jar_glass", 1 ] ], - [ [ "sweet_fruit", 3, "LIST" ] ], - [ [ "sugar", 20 ] ] + [ [ "sweet_fruit", 4, "LIST" ] ], + [ [ "sugar_standard", 2, "LIST" ] ] ] }, { @@ -570,12 +570,12 @@ "skill_used": "cooking", "difficulty": 4, "time": "30 m", - "result_mult": 2, + "result_mult": 4, "autolearn": true, "batch_time_factors": [ 83, 5 ], "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 ] ], [ [ "tomato", 2 ], [ "irradiated_tomato", 2 ] ] ] + "components": [ [ [ "water", 12 ], [ "water_clean", 12 ] ], [ [ "jar_glass", 1 ] ], [ [ "tomato", 4 ], [ "irradiated_tomato", 4 ] ] ] }, { "type": "recipe", @@ -682,7 +682,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "charges": 1, + "charges": 2, "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], @@ -697,8 +697,8 @@ [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "sweet_fruit", 1, "LIST" ] ], - [ [ "sugar", 15 ] ] + [ [ "sweet_fruit", 2, "LIST" ] ], + [ [ "sugar_standard", 1, "LIST" ] ] ] }, { @@ -712,6 +712,7 @@ "autolearn": true, "contained": true, "batch_time_factors": [ 83, 5 ], + "charges": 2, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, @@ -723,7 +724,7 @@ [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "tomato", 1 ] ] + [ [ "tomato", 2 ], [ "irradiated_tomato", 2 ] ] ] }, { @@ -890,12 +891,12 @@ "skill_used": "cooking", "difficulty": 4, "time": "40 m", - "result_mult": 12, + "result_mult": 24, "autolearn": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], - "components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 36, "LIST" ] ] ] + "components": [ [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 24, "LIST" ] ], [ [ "sugar_standard", 12, "LIST" ] ] ] }, { "type": "recipe", @@ -950,13 +951,13 @@ "time": "40 m", "autolearn": true, "batch_time_factors": [ 83, 5 ], - "charges": 12, + "charges": 24, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], "components": [ - [ [ "water", 16 ], [ "water_clean", 16 ] ], + [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "jar_3l_glass", 1 ] ], - [ [ "tomato", 12 ], [ "irradiated_tomato", 12 ] ] + [ [ "tomato", 24 ], [ "irradiated_tomato", 24 ] ] ] }, { diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 3a639ec676d82..45cd264770d51 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -287,9 +287,9 @@ [ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "liver", 8 ] ] + [ [ "liver", 4 ] ] ], - "charges": 8, + "charges": 4, "autolearn": true }, { From 9df131e2c3909f77005d8d623ef3826410eda2e6 Mon Sep 17 00:00:00 2001 From: jkraybill Date: Sat, 22 Feb 2020 19:50:51 +1100 Subject: [PATCH 14/56] linted --- data/json/recipes/food/canned.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index b4792d0e87095..bd48a164dc748 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -896,7 +896,12 @@ "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], - "components": [ [ [ "water", 22 ], [ "water_clean", 22 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 24, "LIST" ] ], [ [ "sugar_standard", 12, "LIST" ] ] ] + "components": [ + [ [ "water", 22 ], [ "water_clean", 22 ] ], + [ [ "jar_3l_glass", 1 ] ], + [ [ "sweet_fruit", 24, "LIST" ] ], + [ [ "sugar_standard", 12, "LIST" ] ] + ] }, { "type": "recipe", From 9c05bbe88f2be22eca3bfcf859802dcdcc58f782 Mon Sep 17 00:00:00 2001 From: jkraybill Date: Sat, 22 Feb 2020 20:28:33 +1100 Subject: [PATCH 15/56] reduced calories of canned fruit --- data/json/items/comestibles/fruit_dishes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index ce9044360f8fa..07ab36652537d 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -229,7 +229,7 @@ "symbol": "%", "quench": 3, "healthy": 1, - "calories": 367, + "calories": 275, "description": "This sodden mass of preserved fruit was boiled and canned in an earlier life. Bland, mushy and losing color.", "price": 220, "material": "fruit", From 52a776f0bfb0ed45fd43e5c07a3078dc338e1c56 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sat, 22 Feb 2020 09:03:10 -0500 Subject: [PATCH 16/56] Disable grenade_lethality test for sanitizer CI The Travis CI test using the sanitizers is *still* timing out sometimes, so disable the next-slowest test. This one should save about 90 seconds. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56bc66740c31b..ed0aff6312e6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "astyle"] sources: *apt_sources - - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~starve_test" + - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~starve_test ~grenade_lethality" name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled" compiler: clang addons: &clang8 From e0855b36aa7eaad1d30efce3852d326c55afac4d Mon Sep 17 00:00:00 2001 From: Fris0uman Date: Sat, 22 Feb 2020 18:10:45 +0100 Subject: [PATCH 17/56] Add dark_craftable bool to construction --- src/construction.cpp | 21 +++++++++++++-------- src/construction.h | 3 +++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/construction.cpp b/src/construction.cpp index 88299c4e1efc4..6926ba65ad141 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -690,15 +690,10 @@ construction_id construction_menu( const bool blueprint ) } if( !blueprint ) { if( player_can_build( g->u, total_inv, constructs[select] ) ) { - 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." ) ); - } else { - place_construction( constructs[select] ); - uistate.last_construction = constructs[select]; - } + place_construction( constructs[select] ); + uistate.last_construction = constructs[select]; exit = true; } else { - popup( _( "You can't build that!" ) ); draw_grid( w_con, w_list_width + w_list_x0 ); update_info = true; } @@ -738,6 +733,7 @@ bool player_can_build( player &p, const inventory &inv, const std::string &desc bool player_can_build( player &p, const inventory &inv, const construction &con ) { + if( p.has_trait( trait_DEBUG_HS ) ) { return true; } @@ -745,7 +741,15 @@ bool player_can_build( player &p, const inventory &inv, const construction &con if( !p.meets_skill_requirements( con ) ) { return false; } - return con.requirements->can_make_with_inventory( inv, is_crafting_component ); + + const bool can_build = con.requirements->can_make_with_inventory( inv, is_crafting_component ); + if( !can_build ) { + popup( _( "You can't build that!" ) ); + } else if( g->u.fine_detail_vision_mod() > 4 && !con.dark_craftable ) { + popup( _( "It is too dark to construct right now." ) ); + return false; + } + return can_build; } bool can_construct( const std::string &desc ) @@ -1456,6 +1460,7 @@ void load_construction( const JsonObject &jo ) con.vehicle_start = jo.get_bool( "vehicle_start", false ); con.on_display = jo.get_bool( "on_display", true ); + con.dark_craftable = jo.get_bool( "dark_craftable", false ); constructions.push_back( con ); construction_id_map.emplace( con.str_id, con.id ); diff --git a/src/construction.h b/src/construction.h index c9d2767bc5714..49bab027cd766 100644 --- a/src/construction.h +++ b/src/construction.h @@ -102,6 +102,9 @@ struct construction { // make the construction available for selection bool on_display = true; + + //can be build in the dark + bool dark_craftable = false; private: std::string get_time_string() const; }; From 58ad188b454f028c4c67ea2fdb99048e6d2753c2 Mon Sep 17 00:00:00 2001 From: Fris0uman Date: Sat, 22 Feb 2020 18:11:59 +0100 Subject: [PATCH 18/56] Make spots dark craftable --- data/json/construction.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/json/construction.json b/data/json/construction.json index 5e1f87291525b..12c8cb53b25ec 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -34,6 +34,7 @@ "pre_note": "Mark a spot for crafting. Crafting tasks next to this tile will automatically use this location instead of attempting to craft in your hands, with the usual crafting speed penalty for working on the ground. Does not prevent using a proper workbench, if available. Deconstruct or smash to remove.", "pre_special": "check_empty", "post_flags": [ "keep_items" ], + "dark_craftable": true, "post_terrain": "f_ground_crafting_spot" }, { @@ -3040,6 +3041,7 @@ "pre_note": "Firewood or other flammable materials on a nearby tile marked in this way may be used to automatically refuel fires. This will be done to maintain light during long-running tasks that require it such as crafting or reading, but not (for example) if you are simply waiting nearby.", "pre_special": "check_no_trap", "post_special": "done_mark_firewood", + "dark_craftable": true, "post_flags": [ "keep_items" ] }, { @@ -3052,6 +3054,7 @@ "pre_note": "Mark a spot for target practice. Firing will automatically target the first practice target location found in gun range, if no enemies are around.", "pre_special": "check_no_trap", "post_special": "done_mark_practice_target", + "dark_craftable": true, "post_flags": [ "keep_items" ] }, { From d2634f569c24fdeee594739cbdb7d2950dd544e7 Mon Sep 17 00:00:00 2001 From: Fris0uman Date: Sat, 22 Feb 2020 18:39:24 +0100 Subject: [PATCH 19/56] Disallow bashing liquids --- src/map.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/map.cpp b/src/map.cpp index 5d33e7616b0fc..3c8788dda98a4 100755 --- a/src/map.cpp +++ b/src/map.cpp @@ -2767,8 +2767,12 @@ void map::smash_items( const tripoint &p, const int power, const std::string &ca std::string damaged_item_name; std::vector contents; - auto items = i_at( p ); + map_stack items = i_at( p ); for( auto i = items.begin(); i != items.end(); ) { + if( i->made_of( LIQUID ) ) { + i++; + continue; + } if( i->active ) { // Get the explosion item actor if( i->type->get_use( "explosion" ) != nullptr ) { From 5c80905b5f61a2728fdc252bedb59dc6c916bf39 Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Sun, 23 Feb 2020 02:09:23 +0800 Subject: [PATCH 20/56] Routine i18n updates on 22 Feb 2020 (#38230) --- lang/po/cataclysm-dda.pot | 2685 +++++++++++++++++++------------------ lang/po/de.po | 2309 ++++++++++++++++--------------- lang/po/es_AR.po | 1908 ++++++++++++++------------ lang/po/es_ES.po | 2054 +++++++++++++++------------- lang/po/hu.po | 1756 ++++++++++++------------ lang/po/ja.po | 2163 ++++++++++++++++-------------- lang/po/pl.po | 1989 ++++++++++++++------------- lang/po/pt_BR.po | 2327 +++++++++++++++++--------------- lang/po/ru.po | 2363 +++++++++++++++++--------------- lang/po/zh_CN.po | 2115 +++++++++++++++-------------- lang/po/zh_TW.po | 1873 ++++++++++++++------------ 11 files changed, 12471 insertions(+), 11071 deletions(-) diff --git a/lang/po/cataclysm-dda.pot b/lang/po/cataclysm-dda.pot index 10b3ddcbed14b..d1046e160f6e2 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: 2020-02-15 13:05+0800\n" +"POT-Creation-Date: 2020-02-22 21:03+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -284,15 +284,6 @@ msgid "" "solid. With proper equipment, it could be heated to plasma." msgstr "" -#: lang/json/AMMO_from_json.py -msgid "unused .22 casing" -msgstr "" - -#. ~ Description for {'str': 'unused .22 casing'} -#: lang/json/AMMO_from_json.py -msgid "An unfired, like-new .22 round casing, with the primer still intact." -msgstr "" - #: lang/json/AMMO_from_json.py msgid "mixed smokeless gunpowder" msgstr "" @@ -1057,7 +1048,7 @@ msgstr[1] "" msgid "" "A handful of waxy hexamine tablets. This ubiquitous fuel was used to start " "up almost every garden grill and no 'real' camping trip could do its cooking " -"without it, until the Cataclysm. Nowadays, it is even more valuable then " +"without it, until the Cataclysm. Nowadays, it is even more valuable than " "before, being the key component in the preparation of several military-grade " "explosives." msgstr "" @@ -1511,7 +1502,7 @@ msgstr "" #. ~ Description for blunderbuss shot #: lang/json/AMMO_from_json.py msgid "" -"A prepared blunderbuss shot of a marbles, pebbles, bearings, basically " +"A prepared blunderbuss shot of marbles, pebbles, bearings, basically " "whatever is at hand. The homemade pellet spread and number makes up for the " "shoddy quality." msgstr "" @@ -1569,7 +1560,7 @@ msgid_plural "40mm incendiaries" msgstr[0] "" msgstr[1] "" -#. ~ Description for 40mm incendiary +#. ~ Description for {'str': '40mm incendiary', 'str_pl': '40mm incendiaries'} #: lang/json/AMMO_from_json.py msgid "" "A 40mm grenade with a small napalm load, designed to create a burst of flame." @@ -1998,7 +1989,7 @@ msgstr "" msgid ".300 AAC Blackout" msgstr "" -#. ~ Description for .300 AAC Blackout +#. ~ Description for {'str': '.300 AAC Blackout'} #: lang/json/AMMO_from_json.py msgid "" "A .300 AAC Blackout round with a 125gr open tip match bullet. 300 BLK is an " @@ -2007,7 +1998,7 @@ msgid "" "receivers and will feed from STANAG magazines." msgstr "" -#. ~ Description for .300 AAC Blackout +#. ~ Description for {'str': '.300 AAC Blackout'} #: lang/json/AMMO_from_json.py msgid "" "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet. 300 " @@ -2024,7 +2015,7 @@ msgstr "" msgid ".300 AAC Blackout, reloaded" msgstr "" -#. ~ Description for .300 AAC Blackout, reloaded +#. ~ Description for {'str': '.300 AAC Blackout, reloaded'} #: lang/json/AMMO_from_json.py msgid "" ".300 AAC Blackout is an intermediate cartridge that achieves ballistics " @@ -2038,7 +2029,7 @@ msgstr "" msgid ".308 Winchester" msgstr "" -#. ~ Description for .308 Winchester +#. ~ Description for {'str': '.308 Winchester'} #: lang/json/AMMO_from_json.py msgid "" ".308 Winchester ammunition with 168gr hollow point bullets. The .308 round " @@ -2097,7 +2088,7 @@ msgstr "" msgid ".32 ACP" msgstr "" -#. ~ Description for .32 ACP +#. ~ Description for {'str': '.32 ACP'} #: lang/json/AMMO_from_json.py msgid "" "The .32 ACP was a popular handgun cartridge in the 20th century. Not so " @@ -3165,8 +3156,8 @@ msgstr "" #. ~ Description for 7.62x25mm FMJ hot load #: lang/json/AMMO_from_json.py msgid "" -"A high-pressure commercial version of the 7.62x25mm cartridge, loaded with a " -"85 gr. FMJ bullet. It is more powerful than the original." +"A high-pressure commercial version of the 7.62x25mm cartridge, loaded with " +"an 85 gr. FMJ bullet. It is more powerful than the original." msgstr "" #: lang/json/AMMO_from_json.py @@ -3767,7 +3758,7 @@ msgstr "" #: lang/json/AMMO_from_json.py 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." +"with handmade bearings, stabilizing its flight pattern a tiny bit." msgstr "" #: lang/json/AMMO_from_json.py @@ -5083,8 +5074,8 @@ msgstr[1] "" #: lang/json/AMMO_from_json.py msgid "" "A strong, durable metal. Highly valued for its weight to strength ratio, it " -"was an excellent upgrade to aluminium for those properties albeit a lot more " -"expensive due to rarity. More commonly used in jewellery and medical " +"was an excellent upgrade to aluminum for those properties albeit a lot more " +"expensive due to rarity. More commonly used in jewelery and medical " "implants." msgstr "" @@ -6334,7 +6325,7 @@ msgid_plural "pairs of bone arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bone arm guards +#. ~ Description for {'str': 'pair of bone arm guards', 'str_pl': 'pairs of bone arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from leather, reinforced with bone. Light and " @@ -6360,7 +6351,7 @@ msgid_plural "pairs of bone armor gauntlets" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bone armor gauntlets +#. ~ Description for {'str': 'pair of bone armor gauntlets', 'str_pl': 'pairs of bone armor gauntlets'} #: lang/json/ARMOR_from_json.py msgid "" "Leather gauntlets with bone armor reinforcement. Very light and strong." @@ -6612,7 +6603,7 @@ msgstr[1] "" #. ~ Use action holster_msg for ankle sheath. #. ~ Use action holster_msg for back scabbard. #. ~ Use action holster_msg for scabbard. -#. ~ Use action holster_msg for sheath. +#. ~ Use action holster_msg for {'str': 'sheath', 'str_pl': 'sheathes'}. #. ~ Use action holster_msg for hiking backpack. #. ~ Use action holster_msg for pair of boots. #. ~ Use action holster_msg for pair of bone armor boots. @@ -7033,7 +7024,7 @@ msgid_plural "pairs of chitin arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of chitin arm guards +#. ~ Description for {'str': 'pair of chitin arm guards', 'str_pl': 'pairs of chitin arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from the exoskeletons of insects. Light and " @@ -7046,7 +7037,7 @@ msgid_plural "pairs of biosilicified chitin arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of biosilicified chitin arm guards +#. ~ Description for {'str': 'pair of biosilicified chitin arm guards', 'str_pl': 'pairs of biosilicified chitin arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards crafted from the carefully cleaned and pruned " @@ -7070,7 +7061,7 @@ msgid_plural "pairs of leather arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather arm guards +#. ~ Description for {'str': 'pair of leather arm guards', 'str_pl': 'pairs of leather arm guards'} #: lang/json/ARMOR_from_json.py msgid "A pair of tough leather arm guards. Light and comfortable." msgstr "" @@ -7081,7 +7072,7 @@ msgid_plural "pairs of steel arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of steel arm guards +#. ~ Description for {'str': 'pair of steel arm guards', 'str_pl': 'pairs of steel arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A full assembly of medieval arm protection. Rerebraces, couters, and " @@ -7095,7 +7086,7 @@ msgid_plural "pairs of metal arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of metal arm guards +#. ~ Description for {'str': 'pair of metal arm guards', 'str_pl': 'pairs of metal arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards hammered out from metal. Perfect for the Post-" @@ -7108,7 +7099,7 @@ msgid_plural "pairs of paper arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of paper arm guards +#. ~ Description for {'str': 'pair of paper arm guards', 'str_pl': 'pairs of paper arm guards'} #: lang/json/ARMOR_from_json.py msgid "Arm guards made of stacked paper sheets held together with duct tape." msgstr "" @@ -7119,7 +7110,7 @@ msgid_plural "pairs of scrap arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of scrap arm guards +#. ~ Description for {'str': 'pair of scrap arm guards', 'str_pl': 'pairs of scrap arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of arm guards made from scraps of metal secured by simple strings; " @@ -7133,7 +7124,7 @@ msgid_plural "pairs of neoprene arm sleeves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of neoprene arm sleeves +#. ~ Description for {'str': 'pair of neoprene arm sleeves', 'str_pl': 'pairs of neoprene arm sleeves'} #: lang/json/ARMOR_from_json.py msgid "A pair of soft neoprene arm sleeves. Often used in contact sports." msgstr "" @@ -7144,7 +7135,7 @@ msgid_plural "pairs of chainmail sleeves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of chainmail sleeves +#. ~ Description for {'str': 'pair of chainmail sleeves', 'str_pl': 'pairs of chainmail sleeves'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail arms. Each sleeve has straps to connect them with each " @@ -7158,7 +7149,7 @@ msgid_plural "pairs of elbow pads" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of elbow pads +#. ~ Description for {'str': 'pair of elbow pads', 'str_pl': 'pairs of elbow pads'} #: lang/json/ARMOR_from_json.py msgid "A pair of elbow pads made of stout plastic and cloth." msgstr "" @@ -7169,7 +7160,7 @@ msgid_plural "pairs of leather vambraces" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather vambraces +#. ~ Description for {'str': 'pair of leather vambraces', 'str_pl': 'pairs of leather vambraces'} #: lang/json/ARMOR_from_json.py msgid "A pair of light leather arm guards, made for archery." msgstr "" @@ -7235,7 +7226,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "An embroidered leather bandolier for keeping pistol cartridges close to " -"hand. If this doesn't make you feel like a cowboy nothing will." +"hand. If this doesn't make you feel like a cowboy, nothing will." msgstr "" #: lang/json/ARMOR_from_json.py @@ -7281,7 +7272,7 @@ msgid_plural "paper cartridge pouches" msgstr[0] "" msgstr[1] "" -#. ~ Description for paper cartridge pouch +#. ~ Description for {'str': 'paper cartridge pouch', 'str_pl': 'paper cartridge pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A covered leather pouch, worn at the waist to store and protect prepared " @@ -7320,7 +7311,7 @@ msgid_plural "stone pouches" msgstr[0] "" msgstr[1] "" -#. ~ Description for stone pouch +#. ~ Description for {'str': 'stone pouch', 'str_pl': 'stone pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A medium-sized pouch for storing rocks, with straps for attaching it to your " @@ -7379,7 +7370,7 @@ msgstr[1] "" #. ~ Description for judo belt template #: lang/json/ARMOR_from_json.py -msgid "This is a template for judo belts. If found in a game it is a bug." +msgid "This is a template for judo belts. If found in a game, it is a bug." msgstr "" #: lang/json/ARMOR_from_json.py @@ -7570,7 +7561,7 @@ msgid_plural "pairs of cord sandals" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of cord sandals +#. ~ Description for {'str': 'pair of cord sandals', 'str_pl': 'pairs of cord sandals'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight sandals made from wound cord. They offer little in the way of " @@ -7583,6 +7574,7 @@ msgid_plural "pairs of boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of boots', 'str_pl': 'pairs of boots'} #. ~ Description for pair of boots #: lang/json/ARMOR_from_json.py msgid "Tough leather boots. Very durable." @@ -7594,6 +7586,7 @@ msgid_plural "pairs of bone armor boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of bone armor boots', 'str_pl': 'pairs of bone armor boots'} #. ~ Description for pair of bone armor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7606,6 +7599,7 @@ msgid_plural "pairs of turnout boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of turnout boots', 'str_pl': 'pairs of turnout boots'} #. ~ Description for pair of turnout boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7619,6 +7613,7 @@ msgid_plural "pairs of chitinous boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of chitinous boots', 'str_pl': 'pairs of chitinous boots'} #. ~ Description for pair of chitinous boots #: lang/json/ARMOR_from_json.py msgid "Boots made from the exoskeletons of insects. Light and durable." @@ -7643,6 +7638,7 @@ msgid_plural "pairs of combat boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of combat boots', 'str_pl': 'pairs of combat boots'} #. ~ Description for pair of combat boots #: lang/json/ARMOR_from_json.py msgid "Modern reinforced tactical combat boots. Very durable." @@ -7654,6 +7650,7 @@ msgid_plural "pairs of survivor fireboots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of survivor fireboots', 'str_pl': 'pairs of survivor fireboots'} #. ~ Description for pair of survivor fireboots #: lang/json/ARMOR_from_json.py msgid "" @@ -7668,6 +7665,7 @@ msgid_plural "pairs of fur boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of fur boots', 'str_pl': 'pairs of fur boots'} #. ~ Description for pair of fur boots #: lang/json/ARMOR_from_json.py msgid "Boots lined with fur for warmth." @@ -7679,6 +7677,7 @@ msgid_plural "pairs of survivor wetsuit boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of survivor wetsuit boots', 'str_pl': 'pairs of survivor wetsuit boots'} #. ~ Description for pair of survivor wetsuit boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7693,6 +7692,7 @@ msgid_plural "pairs of hiking boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of hiking boots', 'str_pl': 'pairs of hiking boots'} #. ~ Description for pair of hiking boots #: lang/json/ARMOR_from_json.py msgid "Tough yet light leather boots. Durable and comfortable." @@ -7704,6 +7704,7 @@ msgid_plural "pairs of heavy survivor boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of heavy survivor boots', 'str_pl': 'pairs of heavy survivor boots'} #. ~ Description for pair of heavy survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7717,6 +7718,7 @@ msgid_plural "pairs of leather armor boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of leather armor boots', 'str_pl': 'pairs of leather armor boots'} #. ~ Description for pair of leather armor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7755,6 +7757,7 @@ msgid_plural "pairs of rubber boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of rubber boots', 'str_pl': 'pairs of rubber boots'} #. ~ Description for pair of rubber boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7767,7 +7770,7 @@ msgid_plural "pairs of scrap boots" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of scrap boots +#. ~ Description for {'str': 'pair of scrap boots', 'str_pl': 'pairs of scrap boots'} #: lang/json/ARMOR_from_json.py msgid "Boots made of random scraps." msgstr "" @@ -7778,6 +7781,7 @@ msgid_plural "pairs of steeltoed boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of steeltoed boots', 'str_pl': 'pairs of steeltoed boots'} #. ~ Description for pair of steeltoed boots #: lang/json/ARMOR_from_json.py msgid "Leather boots with a steel toe. Extremely durable." @@ -7789,6 +7793,7 @@ msgid_plural "pairs of survivor boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of survivor boots', 'str_pl': 'pairs of survivor boots'} #. ~ Description for pair of survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7816,6 +7821,7 @@ msgid_plural "pairs of winter boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of winter boots', 'str_pl': 'pairs of winter boots'} #. ~ Description for pair of winter boots #: lang/json/ARMOR_from_json.py msgid "Cumbersome boots designed for warmth." @@ -7827,6 +7833,7 @@ msgid_plural "pairs of winter survivor boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of winter survivor boots', 'str_pl': 'pairs of winter survivor boots'} #. ~ Description for pair of winter survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -7855,7 +7862,7 @@ msgid_plural "pairs of cleats" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of cleats +#. ~ Description for {'str': 'pair of cleats', 'str_pl': 'pairs of cleats'} #: lang/json/ARMOR_from_json.py msgid "" "Sport shoes with hard undersides, and studs on the bottom designed to dig " @@ -7879,7 +7886,7 @@ msgid_plural "pairs of wooden clogs" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of wooden clogs +#. ~ Description for {'str': 'pair of wooden clogs', 'str_pl': 'pairs of wooden clogs'} #: lang/json/ARMOR_from_json.py msgid "" "Known as klompen in the Netherlands and sabots in France, these wooden shoes " @@ -7892,7 +7899,7 @@ msgid_plural "pairs of clown shoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of clown shoes +#. ~ Description for {'str': 'pair of clown shoes', 'str_pl': 'pairs of clown shoes'} #: lang/json/ARMOR_from_json.py msgid "Gigantic shoes fit for a clown. Incredibly difficult to walk in." msgstr "" @@ -7903,7 +7910,7 @@ msgid_plural "pairs of dance shoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of dance shoes +#. ~ Description for {'str': 'pair of dance shoes', 'str_pl': 'pairs of dance shoes'} #: lang/json/ARMOR_from_json.py msgid "Expensive black dance shoes with large heels." msgstr "" @@ -7914,7 +7921,7 @@ msgid_plural "pairs of dress shoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of dress shoes +#. ~ Description for {'str': 'pair of dress shoes', 'str_pl': 'pairs of dress shoes'} #: lang/json/ARMOR_from_json.py msgid "Fancy patent leather shoes. Not designed for running in." msgstr "" @@ -7925,7 +7932,7 @@ msgid_plural "pairs of flip-flops" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of flip-flops +#. ~ Description for {'str': 'pair of flip-flops', 'str_pl': 'pairs of flip-flops'} #: lang/json/ARMOR_from_json.py msgid "Simple sandals. Very difficult to run in." msgstr "" @@ -7936,7 +7943,7 @@ msgid_plural "pairs of foot rags" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of foot rags +#. ~ Description for {'str': 'pair of foot rags', 'str_pl': 'pairs of foot rags'} #: lang/json/ARMOR_from_json.py msgid "" "Rags tied around your feet. Not much of an improvement over being barefoot, " @@ -7949,7 +7956,7 @@ msgid_plural "pairs of fur foot wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fur foot wraps +#. ~ Description for {'str': 'pair of fur foot wraps', 'str_pl': 'pairs of fur foot wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Fur pelts tied around your feet. Not much of an improvement over being " @@ -7962,7 +7969,7 @@ msgid_plural "pairs of leather foot wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather foot wraps +#. ~ Description for {'str': 'pair of leather foot wraps', 'str_pl': 'pairs of leather foot wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Leather patches tied around your feet. Not much of an improvement over " @@ -7975,7 +7982,7 @@ msgid_plural "pairs of wool foot wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of wool foot wraps +#. ~ Description for {'str': 'pair of wool foot wraps', 'str_pl': 'pairs of wool foot wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Felt patches tied around your feet. Not much of an improvement over being " @@ -7988,7 +7995,7 @@ msgid_plural "pairs of geta" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of geta +#. ~ Description for {'str': 'pair of geta', 'str_pl': 'pairs of geta'} #: lang/json/ARMOR_from_json.py msgid "Simple wooden geta." msgstr "" @@ -7999,7 +8006,7 @@ msgid_plural "pairs of heels" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of heels +#. ~ Description for {'str': 'pair of heels', 'str_pl': 'pairs of heels'} #: lang/json/ARMOR_from_json.py msgid "A pair of high heels. Difficult to even walk in." msgstr "" @@ -8010,6 +8017,7 @@ msgid_plural "pairs of knee-high boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of knee-high boots', 'str_pl': 'pairs of knee-high boots'} #. ~ Description for pair of knee-high boots #: lang/json/ARMOR_from_json.py msgid "" @@ -8023,7 +8031,7 @@ msgid_plural "pairs of leather sandals" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather sandals +#. ~ Description for {'str': 'pair of leather sandals', 'str_pl': 'pairs of leather sandals'} #: lang/json/ARMOR_from_json.py msgid "" "Sturdy leather hiking sandals with a heel strap. Offers little in the way " @@ -8036,7 +8044,7 @@ msgid_plural "pairs of lowtop tennis shoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of lowtop tennis shoes +#. ~ Description for {'str': 'pair of lowtop tennis shoes', 'str_pl': 'pairs of lowtop tennis shoes'} #: lang/json/ARMOR_from_json.py msgid "Lightweight shoes made of cloth and rubber." msgstr "" @@ -8047,7 +8055,7 @@ msgid_plural "pairs of moccasins" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of moccasins +#. ~ Description for {'str': 'pair of moccasins', 'str_pl': 'pairs of moccasins'} #: lang/json/ARMOR_from_json.py msgid "Simple shoes made from animal pelts." msgstr "" @@ -8058,7 +8066,7 @@ msgid_plural "pairs of motorcycle boots" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of motorcycle boots +#. ~ Description for {'str': 'pair of motorcycle boots', 'str_pl': 'pairs of motorcycle boots'} #: lang/json/ARMOR_from_json.py msgid "A pair of durable boots to be used by dirt bikers and motorcyclists." msgstr "" @@ -8069,7 +8077,7 @@ msgid_plural "pairs of rollerblades" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of rollerblades +#. ~ Description for {'str': 'pair of rollerblades', 'str_pl': 'pairs of rollerblades'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of inline skates. Very fast on flat floors, but they make it hard to " @@ -8082,7 +8090,7 @@ msgid_plural "pairs of rollerskates" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of rollerskates +#. ~ Description for {'str': 'pair of rollerskates', 'str_pl': 'pairs of rollerskates'} #: lang/json/ARMOR_from_json.py msgid "" "An old-fashioned pair of leather rollerskates with steel frames. While " @@ -8096,7 +8104,7 @@ msgid_plural "pairs of birchbark shoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of birchbark shoes +#. ~ Description for {'str': 'pair of birchbark shoes', 'str_pl': 'pairs of birchbark shoes'} #: lang/json/ARMOR_from_json.py msgid "" "Simple shoes woven from strips of birch bark. Not very comfortable, but " @@ -8109,7 +8117,7 @@ msgid_plural "pairs of bowling shoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bowling shoes +#. ~ Description for {'str': 'pair of bowling shoes', 'str_pl': 'pairs of bowling shoes'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of flat-soled shoes designed to give you a grip on slippery surfaces." @@ -8121,7 +8129,7 @@ msgid_plural "pairs of slippers" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of slippers +#. ~ Description for {'str': 'pair of slippers', 'str_pl': 'pairs of slippers'} #: lang/json/ARMOR_from_json.py msgid "Soft shoes that keep your feet warm. Not suitable for running." msgstr "" @@ -8132,7 +8140,7 @@ msgid_plural "pairs of sneakers" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of sneakers +#. ~ Description for {'str': 'pair of sneakers', 'str_pl': 'pairs of sneakers'} #: lang/json/ARMOR_from_json.py msgid "Guaranteed to make you run faster and jump higher!" msgstr "" @@ -8143,7 +8151,7 @@ msgid_plural "pairs of straw sandals" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of straw sandals +#. ~ Description for {'str': 'pair of straw sandals', 'str_pl': 'pairs of straw sandals'} #: lang/json/ARMOR_from_json.py msgid "" "Sandals made from straw rope. Not very comfortable, but can keep your feet " @@ -8156,7 +8164,7 @@ msgid_plural "pairs of swim fins" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of swim fins +#. ~ Description for {'str': 'pair of swim fins', 'str_pl': 'pairs of swim fins'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of rubber flippers worn on the feet which improve swimming speed " @@ -8169,7 +8177,7 @@ msgid_plural "pairs of thigh-high boots" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of thigh-high boots +#. ~ Description for {'str': 'pair of thigh-high boots', 'str_pl': 'pairs of thigh-high boots'} #: lang/json/ARMOR_from_json.py msgid "" "Very long leather boots that reach past the knees. Difficult to wear but " @@ -8182,7 +8190,7 @@ msgid_plural "pairs of swimming booties" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of swimming booties +#. ~ Description for {'str': 'pair of swimming booties', 'str_pl': 'pairs of swimming booties'} #: lang/json/ARMOR_from_json.py msgid "A pair of neoprene swimming booties, with individual toes." msgstr "" @@ -8193,12 +8201,12 @@ msgid_plural "pairs of heelys (off)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for pair of heelys (off). +#. ~ Use action msg for {'str': 'pair of heelys (off)', 'str_pl': 'pairs of heelys (off)'}. #: lang/json/ARMOR_from_json.py msgid "You pop the wheels out." msgstr "" -#. ~ Description for pair of heelys (off) +#. ~ Description for {'str': 'pair of heelys (off)', 'str_pl': 'pairs of heelys (off)'} #: lang/json/ARMOR_from_json.py msgid "A pair of sneakers with wheels, currently the wheels are hidden." msgstr "" @@ -8209,12 +8217,12 @@ msgid_plural "pairs of heelys (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for pair of heelys (on). +#. ~ Use action msg for {'str': 'pair of heelys (on)', 'str_pl': 'pairs of heelys (on)'}. #: lang/json/ARMOR_from_json.py msgid "You pop the wheels back in." msgstr "" -#. ~ Description for pair of heelys (on) +#. ~ Description for {'str': 'pair of heelys (on)', 'str_pl': 'pairs of heelys (on)'} #: lang/json/ARMOR_from_json.py msgid "A pair of sneakers with wheels, currently the wheels are out." msgstr "" @@ -8238,7 +8246,7 @@ msgid_plural "pairs of fetlock furs" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fetlock furs +#. ~ Description for {'str': 'pair of fetlock furs', 'str_pl': 'pairs of fetlock furs'} #: lang/json/ARMOR_from_json.py msgid "Snug fur sleeves to keep your fetlocks warm." msgstr "" @@ -8249,7 +8257,7 @@ msgid_plural "pairs of flame-resistant socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of flame-resistant socks +#. ~ Description for {'str': 'pair of flame-resistant socks', 'str_pl': 'pairs of flame-resistant socks'} #: lang/json/ARMOR_from_json.py msgid "" "A snug fitting pair of stockings made from thin and lightweight Nomex fire-" @@ -8263,7 +8271,7 @@ msgid_plural "pairs of socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of socks +#. ~ Description for {'str': 'pair of socks', 'str_pl': 'pairs of socks'} #: lang/json/ARMOR_from_json.py msgid "Socks. Put 'em on your feet." msgstr "" @@ -8287,7 +8295,7 @@ msgid_plural "pairs of bag socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bag socks +#. ~ Description for {'str': 'pair of bag socks', 'str_pl': 'pairs of bag socks'} #: lang/json/ARMOR_from_json.py msgid "A pair of disposable plastic bags, adapted to be used as socks." msgstr "" @@ -8298,7 +8306,7 @@ msgid_plural "pairs of disposable bowling socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of disposable bowling socks +#. ~ Description for {'str': 'pair of disposable bowling socks', 'str_pl': 'pairs of disposable bowling socks'} #: lang/json/ARMOR_from_json.py msgid "" "Cheap one time socks. Can keep your feet clean, but too thin to give any " @@ -8311,7 +8319,7 @@ msgid_plural "pairs of wool socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of wool socks +#. ~ Description for {'str': 'pair of wool socks', 'str_pl': 'pairs of wool socks'} #: lang/json/ARMOR_from_json.py msgid "Warm socks made of wool." msgstr "" @@ -8322,7 +8330,7 @@ msgid_plural "pairs of stockings" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of stockings +#. ~ Description for {'str': 'pair of stockings', 'str_pl': 'pairs of stockings'} #: lang/json/ARMOR_from_json.py msgid "" "Long cotton socks that reach above the knees to help protect from the cold." @@ -8334,7 +8342,7 @@ msgid_plural "pairs of tentacle stockings" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of tentacle stockings +#. ~ Description for {'str': 'pair of tentacle stockings', 'str_pl': 'pairs of tentacle stockings'} #: lang/json/ARMOR_from_json.py msgid "" "Six long cotton tubes sized to fit over tentacles and help protect them from " @@ -8347,7 +8355,7 @@ msgid_plural "pairs of tabi" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of tabi +#. ~ Description for {'str': 'pair of tabi', 'str_pl': 'pairs of tabi'} #: lang/json/ARMOR_from_json.py msgid "A pair of black tabi, as worn with traditional Japanese clothes." msgstr "" @@ -8358,7 +8366,7 @@ msgid_plural "pairs of gi tabi" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of gi tabi +#. ~ Description for {'str': 'pair of gi tabi', 'str_pl': 'pairs of gi tabi'} #: lang/json/ARMOR_from_json.py msgid "A pair of white tabi, as used by martial arts practitioners." msgstr "" @@ -8889,7 +8897,7 @@ msgstr[1] "" #. ~ Description for yukata #: lang/json/ARMOR_from_json.py msgid "" -"An easy to wear, breezy robe secured with a sash. Essentially Japanese " +"An easy-to-wear, breezy robe secured with a sash. Essentially Japanese " "pajamas. Great for summer nights." msgstr "" @@ -9235,7 +9243,7 @@ msgid_plural "pairs of eclipse glasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of eclipse glasses +#. ~ Description for {'str': 'pair of eclipse glasses', 'str_pl': 'pairs of eclipse glasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped " @@ -9249,7 +9257,7 @@ msgid_plural "pairs of stylish sunglasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of stylish sunglasses +#. ~ Description for {'str': 'pair of stylish sunglasses', 'str_pl': 'pairs of stylish sunglasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of stylish sunglasses. Look good while keeping the glare out of your " @@ -9262,7 +9270,7 @@ msgid_plural "pairs of fit-over sunglasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fit-over sunglasses +#. ~ Description for {'str': 'pair of fit-over sunglasses', 'str_pl': 'pairs of fit-over sunglasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of fit-over sunglasses designed to be worn over a pair of corrective " @@ -9275,7 +9283,7 @@ msgid_plural "pairs of ballistic glasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of ballistic glasses +#. ~ Description for {'str': 'pair of ballistic glasses', 'str_pl': 'pairs of ballistic glasses'} #: lang/json/ARMOR_from_json.py msgid "" "Modern tactical eyewear that protects from small projectiles and fragments. " @@ -9288,7 +9296,7 @@ msgid_plural "pairs of bifocal glasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bifocal glasses +#. ~ Description for {'str': 'pair of bifocal glasses', 'str_pl': 'pairs of bifocal glasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of bifocal glasses for those who are both near-sighted and far-" @@ -9301,7 +9309,7 @@ msgid_plural "pairs of eyeglasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of eyeglasses +#. ~ Description for {'str': 'pair of eyeglasses', 'str_pl': 'pairs of eyeglasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of glasses for the near-sighted. The concave lenses diffuse the " @@ -9328,7 +9336,7 @@ msgid_plural "pairs of reading glasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of reading glasses +#. ~ Description for {'str': 'pair of reading glasses', 'str_pl': 'pairs of reading glasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of glasses for the far-sighted. Useless for anyone else. You can " @@ -9341,7 +9349,7 @@ msgid_plural "pairs of safety glasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of safety glasses +#. ~ Description for {'str': 'pair of safety glasses', 'str_pl': 'pairs of safety glasses'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of plastic glasses, used in workshops, sports, chemistry labs, and " @@ -9354,7 +9362,7 @@ msgid_plural "pairs of ski goggles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of ski goggles +#. ~ Description for {'str': 'pair of ski goggles', 'str_pl': 'pairs of ski goggles'} #: lang/json/ARMOR_from_json.py msgid "" "A large pair of goggles that completely seal off your eyes. Provides " @@ -9367,7 +9375,7 @@ msgid_plural "pairs of welding goggles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of welding goggles +#. ~ Description for {'str': 'pair of welding goggles', 'str_pl': 'pairs of welding goggles'} #: lang/json/ARMOR_from_json.py msgid "" "A dark pair of goggles. They make seeing very difficult, but protect you " @@ -9380,10 +9388,10 @@ msgid_plural "pairs of snow goggles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of snow goggles +#. ~ Description for {'str': 'pair of snow goggles', 'str_pl': 'pairs of snow goggles'} #: lang/json/ARMOR_from_json.py msgid "" -"Eyewear carved from from wood or bone, with only a thin slit to see out of. " +"Eyewear carved from wood or bone, with only a thin slit to see out of. " "Helps reduce glare, traditionally used by the Inuit to protect against snow " "blindness." msgstr "" @@ -9394,7 +9402,7 @@ msgid_plural "pairs of sunglasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of sunglasses +#. ~ Description for {'str': 'pair of sunglasses', 'str_pl': 'pairs of sunglasses'} #: lang/json/ARMOR_from_json.py msgid "A pair of sunglasses, good for keeping the glare out of your eyes." msgstr "" @@ -9405,7 +9413,7 @@ msgid_plural "pairs of survivor goggles" msgstr[0] "" msgstr[1] "" -#. ~ Description for survivor goggles +#. ~ Description for {'str': 'survivor goggles', 'str_pl': 'pairs of survivor goggles'} #: lang/json/ARMOR_from_json.py msgid "" "A custom-built pair of armored goggles with tinted lenses. Comfortable and " @@ -9418,7 +9426,7 @@ msgid_plural "pairs of beekeeping gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of beekeeping gloves +#. ~ Description for {'str': 'pair of beekeeping gloves', 'str_pl': 'pairs of beekeeping gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of white beekeeping gloves made out of smooth leather." msgstr "" @@ -9429,7 +9437,7 @@ msgid_plural "pairs of boxing gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of boxing gloves +#. ~ Description for {'str': 'pair of boxing gloves', 'str_pl': 'pairs of boxing gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near " @@ -9455,7 +9463,7 @@ msgid_plural "pairs of fire gauntlets" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fire gauntlets +#. ~ Description for {'str': 'pair of fire gauntlets', 'str_pl': 'pairs of fire gauntlets'} #: lang/json/ARMOR_from_json.py msgid "" "A heavy pair of gloves, used by firefighters and metalworkers for heat " @@ -9469,7 +9477,7 @@ msgid_plural "pairs of chitinous gauntlets" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of chitinous gauntlets +#. ~ Description for {'str': 'pair of chitinous gauntlets', 'str_pl': 'pairs of chitinous gauntlets'} #: lang/json/ARMOR_from_json.py msgid "" "Gauntlets made from the exoskeletons of insects. Very light and durable." @@ -9481,7 +9489,7 @@ msgid_plural "pairs of biosilicified chitin gauntlets" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of biosilicified chitin gauntlets +#. ~ Description for {'str': 'pair of biosilicified chitin gauntlets', 'str_pl': 'pairs of biosilicified chitin gauntlets'} #: lang/json/ARMOR_from_json.py msgid "" "Gauntlets crafted from the carefully cleaned and pruned biosilicified " @@ -9520,7 +9528,7 @@ msgid_plural "pairs of leather armor gauntlets" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather armor gauntlets +#. ~ Description for {'str': 'pair of leather armor gauntlets', 'str_pl': 'pairs of leather armor gauntlets'} #: lang/json/ARMOR_from_json.py msgid "Heavy fingerless leather gloves. Very flexible and comfortable." msgstr "" @@ -9531,7 +9539,7 @@ msgid_plural "pairs of bag gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bag gloves +#. ~ Description for {'str': 'pair of bag gloves', 'str_pl': 'pairs of bag gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of disposable plastic bags, adapted to be used as gloves." msgstr "" @@ -9542,7 +9550,7 @@ msgid_plural "pairs of fingerless gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fingerless gloves +#. ~ Description for {'str': 'pair of fingerless gloves', 'str_pl': 'pairs of fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -9568,7 +9576,7 @@ msgid_plural "pairs of survivor firegloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of survivor firegloves +#. ~ Description for {'str': 'pair of survivor firegloves', 'str_pl': 'pairs of survivor firegloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to " @@ -9581,7 +9589,7 @@ msgid_plural "pairs of fur gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fur gloves +#. ~ Description for {'str': 'pair of fur gloves', 'str_pl': 'pairs of fur gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of warm fur gloves. They are somewhat cumbersome." msgstr "" @@ -9592,7 +9600,7 @@ msgid_plural "pairs of heavy survivor gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of heavy survivor gloves +#. ~ Description for {'str': 'pair of heavy survivor gloves', 'str_pl': 'pairs of heavy survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of heavily customized, steel-backed armored Kevlar gloves, modified " @@ -9606,7 +9614,7 @@ msgid_plural "white gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for white glove +#. ~ Description for {'str': 'white glove'} #: lang/json/ARMOR_from_json.py msgid "A single white glove covered with hundreds of rhinestones." msgstr "" @@ -9617,7 +9625,7 @@ msgid_plural "pairs of leather gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather gloves +#. ~ Description for {'str': 'pair of leather gloves', 'str_pl': 'pairs of leather gloves'} #: lang/json/ARMOR_from_json.py msgid "A thin pair of black leather gloves." msgstr "" @@ -9628,7 +9636,7 @@ msgid_plural "pairs of light gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of light gloves +#. ~ Description for {'str': 'pair of light gloves', 'str_pl': 'pairs of light gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of cotton gloves." msgstr "" @@ -9664,7 +9672,7 @@ msgid_plural "pairs of fingerless survivor gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fingerless survivor gloves +#. ~ Description for {'str': 'pair of fingerless survivor gloves', 'str_pl': 'pairs of fingerless survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of customized, Kevlar armored cloth gloves with no fingers, modified " @@ -9678,7 +9686,7 @@ msgid_plural "pairs of medical gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of medical gloves +#. ~ Description for {'str': 'pair of medical gloves', 'str_pl': 'pairs of medical gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of thin latex gloves, designed to limit the spread of disease." msgstr "" @@ -9689,7 +9697,7 @@ msgid_plural "pairs of armored gauntlets" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of armored gauntlets +#. ~ Description for {'str': 'pair of armored gauntlets', 'str_pl': 'pairs of armored gauntlets'} #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor-plated leather gloves." msgstr "" @@ -9700,7 +9708,7 @@ msgid_plural "pairs of rubber gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of rubber gloves +#. ~ Description for {'str': 'pair of rubber gloves', 'str_pl': 'pairs of rubber gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of rubber gloves, often used while cleaning with caustic materials." @@ -9712,7 +9720,7 @@ msgid_plural "pairs of survivor gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of survivor gloves +#. ~ Description for {'str': 'pair of survivor gloves', 'str_pl': 'pairs of survivor gloves'} #. ~ Description for pair of black dragonhide gloves #: lang/json/ARMOR_from_json.py msgid "" @@ -9726,7 +9734,7 @@ msgid_plural "pairs of tactical gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of tactical gloves +#. ~ Description for {'str': 'pair of tactical gloves', 'str_pl': 'pairs of tactical gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of reinforced Kevlar tactical gloves. Commonly used by police and " @@ -9739,7 +9747,7 @@ msgid_plural "pairs of winter gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of winter gloves +#. ~ Description for {'str': 'pair of winter gloves', 'str_pl': 'pairs of winter gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of padded gloves. Cumbersome, but warm." msgstr "" @@ -9750,7 +9758,7 @@ msgid_plural "pairs of wool gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of wool gloves +#. ~ Description for {'str': 'pair of wool gloves', 'str_pl': 'pairs of wool gloves'} #: lang/json/ARMOR_from_json.py msgid "A thick pair of wool gloves. Cumbersome, but warm." msgstr "" @@ -9761,7 +9769,7 @@ msgid_plural "pairs of work gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of work gloves +#. ~ Description for {'str': 'pair of work gloves', 'str_pl': 'pairs of work gloves'} #: lang/json/ARMOR_from_json.py msgid "A tough pair of gloves, for tough everyday work." msgstr "" @@ -9772,7 +9780,7 @@ msgid_plural "pairs of cut resistant gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of cut resistant gloves +#. ~ Description for {'str': 'pair of cut resistant gloves', 'str_pl': 'pairs of cut resistant gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of cut resistant gloves, useful when rapidly breaking down carcasses." @@ -9784,7 +9792,7 @@ msgid_plural "pairs of hand wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of hand wraps +#. ~ Description for {'str': 'pair of hand wraps', 'str_pl': 'pairs of hand wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Long pieces of cloth that are meant to be wrapped around your hands. " @@ -9798,7 +9806,7 @@ msgid_plural "pairs of fur hand wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fur hand wraps +#. ~ Description for {'str': 'pair of fur hand wraps', 'str_pl': 'pairs of fur hand wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Pieces of animal pelt that are meant to be wrapped around your hands. " @@ -9812,7 +9820,7 @@ msgid_plural "pairs of leather hand wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leather hand wraps +#. ~ Description for {'str': 'pair of leather hand wraps', 'str_pl': 'pairs of leather hand wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Pieces of leather that are meant to be wrapped around your hands. Provide " @@ -9826,7 +9834,7 @@ msgid_plural "pairs of wool hand wraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of wool hand wraps +#. ~ Description for {'str': 'pair of wool hand wraps', 'str_pl': 'pairs of wool hand wraps'} #: lang/json/ARMOR_from_json.py msgid "" "Long pieces of wool that are meant to be wrapped around your hands. Provide " @@ -9840,7 +9848,7 @@ msgid_plural "pairs of winter survivor gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of winter survivor gloves +#. ~ Description for {'str': 'pair of winter survivor gloves', 'str_pl': 'pairs of winter survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear " @@ -9866,7 +9874,7 @@ msgid_plural "pairs of extra long white gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of extra long white gloves +#. ~ Description for {'str': 'pair of extra long white gloves', 'str_pl': 'pairs of extra long white gloves'} #: lang/json/ARMOR_from_json.py msgid "Long white costume gloves." msgstr "" @@ -9877,7 +9885,7 @@ msgid_plural "pairs of mittens" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of mittens +#. ~ Description for {'str': 'pair of mittens', 'str_pl': 'pairs of mittens'} #: lang/json/ARMOR_from_json.py msgid "A pair of warm mittens. They are extremely cumbersome." msgstr "" @@ -9888,7 +9896,7 @@ msgid_plural "pairs of flame-resistant gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of flame-resistant gloves +#. ~ Description for {'str': 'pair of flame-resistant gloves', 'str_pl': 'pairs of flame-resistant gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A snug fitting pair of gloves made from thin and lightweight Nomex fire-" @@ -9902,7 +9910,7 @@ msgid_plural "pairs of sock mitts" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of sock mitts +#. ~ Description for {'str': 'pair of sock mitts', 'str_pl': 'pairs of sock mitts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised gloves made from socks with holes poked through them." @@ -9914,7 +9922,7 @@ msgid_plural "pairs of tentacle sleeves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of tentacle sleeves +#. ~ Description for {'str': 'pair of tentacle sleeves', 'str_pl': 'pairs of tentacle sleeves'} #: lang/json/ARMOR_from_json.py msgid "" "Long cotton tubes sized to fit over tentacles and help protect them from the " @@ -9927,7 +9935,7 @@ msgid_plural "pairs of army winter gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of army winter gloves +#. ~ Description for {'str': 'pair of army winter gloves', 'str_pl': 'pairs of army winter gloves'} #: lang/json/ARMOR_from_json.py msgid "A pair of padded gloves. Favored by the military." msgstr "" @@ -9938,7 +9946,7 @@ msgid_plural "pairs of golfing gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of golfing gloves +#. ~ Description for {'str': 'pair of golfing gloves', 'str_pl': 'pairs of golfing gloves'} #: lang/json/ARMOR_from_json.py msgid "A thin pair of black leather golfing gloves." msgstr "" @@ -10329,7 +10337,7 @@ msgstr[1] "" #. ~ Description for golf cap #: lang/json/ARMOR_from_json.py msgid "" -"You're not actually sure if this is called a golf cap but its the " +"You're not actually sure if this is called a golf cap, but it's the " "stereotypical cap golfers wear." msgstr "" @@ -10657,7 +10665,7 @@ msgid_plural "pickelhauben" msgstr[0] "" msgstr[1] "" -#. ~ Description for pickelhaube +#. ~ Description for {'str': 'pickelhaube', 'str_pl': 'pickelhauben'} #: lang/json/ARMOR_from_json.py msgid "" "A spiked helmet once worn by German military officers. The spike is very " @@ -10776,7 +10784,7 @@ msgid_plural "survivor harnesses" msgstr[0] "" msgstr[1] "" -#. ~ Description for survivor harness +#. ~ Description for {'str': 'survivor harness', 'str_pl': 'survivor harnesses'} #: lang/json/ARMOR_from_json.py msgid "" "A custom-built light harness covered with pouches and including an integral " @@ -10929,7 +10937,7 @@ msgid_plural "pairs of beaded earrings" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of beaded earrings +#. ~ Description for {'str': 'pair of beaded earrings', 'str_pl': 'pairs of beaded earrings'} #: lang/json/ARMOR_from_json.py msgid "" "A simple pair of earrings made of string and wooden beads. You can wear it " @@ -11194,7 +11202,7 @@ msgid_plural "pairs of copper earrings" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of copper earrings +#. ~ Description for {'str': 'pair of copper earrings', 'str_pl': 'pairs of copper earrings'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of copper earrings. It's pretty heavy. You can wear it if you like, " @@ -12154,8 +12162,8 @@ msgstr[1] "" #. ~ Description for radiation badge #: lang/json/ARMOR_from_json.py msgid "" -"A plastic badge with an embedded film strip. The film strip changes color " -"as it is exposed to radiation. Wear on your lapel so you can notice if it " +"A plastic badge with an embedded filmstrip. The filmstrip changes color as " +"it is exposed to radiation. Wear on your lapel so you can notice if it " "changes." msgstr "" @@ -12168,7 +12176,7 @@ msgstr[1] "" #. ~ Description for badge template #: lang/json/ARMOR_from_json.py msgid "" -"This is a template for police/medical badges. If found in a game it is a " +"This is a template for police/medical badges. If found in a game, it is a " "bug." msgstr "" @@ -12252,7 +12260,7 @@ msgstr[1] "" #. ~ Description for Foodkid badge #: lang/json/ARMOR_from_json.py msgid "" -"A star shaped badge, on it you can read \"Foodkid\" in bold letters. This " +"A star shaped badge. On it, you can read \"Foodkid\" in bold letters. This " "is Foodperson's trusty sidekick's badge." msgstr "" @@ -12928,7 +12936,7 @@ msgstr[1] "" #. ~ Description for {'str': 'amethyst and gold ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A gold ring with a amethyst mounted on top of it. You can wear it if you " +"A gold ring with an amethyst mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -12941,7 +12949,7 @@ msgstr[1] "" #. ~ Description for {'str': 'aquamarine and gold ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A gold ring with a aquamarine mounted on top of it. You can wear it if you " +"A gold ring with an aquamarine mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -12954,7 +12962,7 @@ msgstr[1] "" #. ~ Description for {'str': 'emerald and gold ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A gold ring with a emerald mounted on top of it. You can wear it if you " +"A gold ring with an emerald mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -12967,8 +12975,8 @@ msgstr[1] "" #. ~ Description for {'str': 'alexandrite and gold ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A gold ring with a alexandrite mounted on top of it. You can wear it if you " -"like, but it won't provide any effects." +"A gold ring with an alexandrite mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -13058,7 +13066,7 @@ msgstr[1] "" #. ~ Description for {'str': 'opal and gold ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A gold ring with a opal mounted on top of it. You can wear it if you like, " +"A gold ring with an opal mounted on top of it. You can wear it if you like, " "but it won't provide any effects." msgstr "" @@ -13110,7 +13118,7 @@ msgstr[1] "" #. ~ Description for {'str': 'amethyst and silver ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A silver ring with a amethyst mounted on top of it. You can wear it if you " +"A silver ring with an amethyst mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -13123,7 +13131,7 @@ msgstr[1] "" #. ~ Description for {'str': 'aquamarine and silver ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A silver ring with a aquamarine mounted on top of it. You can wear it if " +"A silver ring with an aquamarine mounted on top of it. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -13136,7 +13144,7 @@ msgstr[1] "" #. ~ Description for {'str': 'emerald and silver ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A silver ring with a emerald mounted on top of it. You can wear it if you " +"A silver ring with an emerald mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -13149,7 +13157,7 @@ msgstr[1] "" #. ~ Description for {'str': 'alexandrite and silver ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A silver ring with a alexandrite mounted on top of it. You can wear it if " +"A silver ring with an alexandrite mounted on top of it. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -13240,7 +13248,7 @@ msgstr[1] "" #. ~ Description for {'str': 'opal and silver ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A silver ring with a opal mounted on top of it. You can wear it if you " +"A silver ring with an opal mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -13292,7 +13300,7 @@ msgstr[1] "" #. ~ Description for {'str': 'amethyst and platinum ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A platinum ring with a amethyst mounted on top of it. You can wear it if " +"A platinum ring with an amethyst mounted on top of it. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -13305,7 +13313,7 @@ msgstr[1] "" #. ~ Description for {'str': 'aquamarine and platinum ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A platinum ring with a aquamarine mounted on top of it. You can wear it if " +"A platinum ring with an aquamarine mounted on top of it. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -13318,8 +13326,8 @@ msgstr[1] "" #. ~ Description for {'str': 'emerald and platinum ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A platinum ring with a emerald mounted on top of it. You can wear it if you " -"like, but it won't provide any effects." +"A platinum ring with an emerald mounted on top of it. You can wear it if " +"you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -13331,8 +13339,8 @@ msgstr[1] "" #. ~ Description for {'str': 'alexandrite and platinum ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A platinum ring with a alexandrite mounted on top of it. You can wear it if " -"you like, but it won't provide any effects." +"A platinum ring with an alexandrite mounted on top of it. You can wear it " +"if you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -13422,7 +13430,7 @@ msgstr[1] "" #. ~ Description for {'str': 'opal and platinum ring'} #: lang/json/ARMOR_from_json.py msgid "" -"A platinum ring with a opal mounted on top of it. You can wear it if you " +"A platinum ring with an opal mounted on top of it. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -14020,7 +14028,7 @@ msgstr[1] "" #. ~ Description for {'str': 'amethyst and gold pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, gold necklace adorned with a amethyst pendant. You can wear it if " +"A shiny, gold necklace adorned with an amethyst pendant. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -14033,7 +14041,7 @@ msgstr[1] "" #. ~ Description for {'str': 'aquamarine and gold pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, gold necklace adorned with a aquamarine pendant. You can wear it " +"A shiny, gold necklace adorned with an aquamarine pendant. You can wear it " "if you like, but it won't provide any effects." msgstr "" @@ -14046,7 +14054,7 @@ msgstr[1] "" #. ~ Description for {'str': 'emerald and gold pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, gold necklace adorned with a emerald pendant. You can wear it if " +"A shiny, gold necklace adorned with an emerald pendant. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -14059,7 +14067,7 @@ msgstr[1] "" #. ~ Description for {'str': 'alexandrite and gold pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, gold necklace adorned with a alexandrite pendant. You can wear it " +"A shiny, gold necklace adorned with an alexandrite pendant. You can wear it " "if you like, but it won't provide any effects." msgstr "" @@ -14150,7 +14158,7 @@ msgstr[1] "" #. ~ Description for {'str': 'opal and gold pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, gold necklace adorned with a opal pendant. You can wear it if you " +"A shiny, gold necklace adorned with an opal pendant. You can wear it if you " "like, but it won't provide any effects." msgstr "" @@ -14202,7 +14210,7 @@ msgstr[1] "" #. ~ Description for {'str': 'amethyst and silver pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, silver necklace adorned with a amethyst pendant. You can wear it " +"A shiny, silver necklace adorned with an amethyst pendant. You can wear it " "if you like, but it won't provide any effects." msgstr "" @@ -14215,8 +14223,8 @@ msgstr[1] "" #. ~ Description for {'str': 'aquamarine and silver pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, silver necklace adorned with a aquamarine pendant. You can wear it " -"if you like, but it won't provide any effects." +"A shiny, silver necklace adorned with an aquamarine pendant. You can wear " +"it if you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14228,8 +14236,8 @@ msgstr[1] "" #. ~ Description for {'str': 'emerald and silver pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, silver necklace adorned with a emerald pendant. You can wear it if " -"you like, but it won't provide any effects." +"A shiny, silver necklace adorned with an emerald pendant. You can wear it " +"if you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14241,7 +14249,7 @@ msgstr[1] "" #. ~ Description for {'str': 'alexandrite and silver pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, silver necklace adorned with a alexandrite pendant. You can wear " +"A shiny, silver necklace adorned with an alexandrite pendant. You can wear " "it if you like, but it won't provide any effects." msgstr "" @@ -14332,7 +14340,7 @@ msgstr[1] "" #. ~ Description for {'str': 'opal and silver pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, silver necklace adorned with a opal pendant. You can wear it if " +"A shiny, silver necklace adorned with an opal pendant. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -14384,8 +14392,8 @@ msgstr[1] "" #. ~ Description for {'str': 'amethyst and platinum pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, platinum necklace adorned with a amethyst pendant. You can wear it " -"if you like, but it won't provide any effects." +"A shiny, platinum necklace adorned with an amethyst pendant. You can wear " +"it if you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14397,7 +14405,7 @@ msgstr[1] "" #. ~ Description for {'str': 'aquamarine and platinum pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, platinum necklace adorned with a aquamarine pendant. You can wear " +"A shiny, platinum necklace adorned with an aquamarine pendant. You can wear " "it if you like, but it won't provide any effects." msgstr "" @@ -14410,7 +14418,7 @@ msgstr[1] "" #. ~ Description for {'str': 'emerald and platinum pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, platinum necklace adorned with a emerald pendant. You can wear it " +"A shiny, platinum necklace adorned with an emerald pendant. You can wear it " "if you like, but it won't provide any effects." msgstr "" @@ -14423,8 +14431,8 @@ msgstr[1] "" #. ~ Description for {'str': 'alexandrite and platinum pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, platinum necklace adorned with a alexandrite pendant. You can wear " -"it if you like, but it won't provide any effects." +"A shiny, platinum necklace adorned with an alexandrite pendant. You can " +"wear it if you like, but it won't provide any effects." msgstr "" #: lang/json/ARMOR_from_json.py @@ -14514,7 +14522,7 @@ msgstr[1] "" #. ~ Description for {'str': 'opal and platinum pendant necklace'} #: lang/json/ARMOR_from_json.py msgid "" -"A shiny, platinum necklace adorned with a opal pendant. You can wear it if " +"A shiny, platinum necklace adorned with an opal pendant. You can wear it if " "you like, but it won't provide any effects." msgstr "" @@ -15013,7 +15021,7 @@ msgid_plural "turnout trousers" msgstr[0] "" msgstr[1] "" -#. ~ Description for turnout trousers +#. ~ Description for {'str': 'turnout trousers', 'str_pl': 'turnout trousers'} #: lang/json/ARMOR_from_json.py msgid "" "A heavy pair of protective overalls worn by firefighters. Highly resistant " @@ -15063,7 +15071,7 @@ msgid_plural "pairs of knee pads" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of knee pads +#. ~ Description for {'str': 'pair of knee pads', 'str_pl': 'pairs of knee pads'} #: lang/json/ARMOR_from_json.py msgid "A pair of knee pads made of stout plastic and cloth." msgstr "" @@ -15074,7 +15082,7 @@ msgid_plural "pairs of bronze greaves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of bronze greaves +#. ~ Description for {'str': 'pair of bronze greaves', 'str_pl': 'pairs of bronze greaves'} #: lang/json/ARMOR_from_json.py msgid "A pair of bronze leg guards with a simple leather lining." msgstr "" @@ -15085,7 +15093,7 @@ msgid_plural "pairs of hard leg guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of hard leg guards +#. ~ Description for {'str': 'pair of hard leg guards', 'str_pl': 'pairs of hard leg guards'} #: lang/json/ARMOR_from_json.py msgid "A pair of polyurethane leg guards with neoprene backing." msgstr "" @@ -15096,7 +15104,7 @@ msgid_plural "pairs of steel leg guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of steel leg guards +#. ~ Description for {'str': 'pair of steel leg guards', 'str_pl': 'pairs of steel leg guards'} #: lang/json/ARMOR_from_json.py msgid "" "A full assembly of medieval leg protection. Cuisses, poleyns, and greaves, " @@ -15109,7 +15117,7 @@ msgid_plural "pairs of iron greaves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of iron greaves +#. ~ Description for {'str': 'pair of iron greaves', 'str_pl': 'pairs of iron greaves'} #: lang/json/ARMOR_from_json.py msgid "A pair of iron leg guards with a simple leather lining." msgstr "" @@ -15120,7 +15128,7 @@ msgid_plural "pairs of paper leg guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of paper leg guards +#. ~ Description for {'str': 'pair of paper leg guards', 'str_pl': 'pairs of paper leg guards'} #: lang/json/ARMOR_from_json.py msgid "Leg guards made of stacked paper sheets held together with duct tape." msgstr "" @@ -15131,7 +15139,7 @@ msgid_plural "pairs of scrap leg guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of scrap leg guards +#. ~ Description for {'str': 'pair of scrap leg guards', 'str_pl': 'pairs of scrap leg guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leg guards made from scraps of metal secured by simple strings; " @@ -15172,7 +15180,7 @@ msgstr[1] "" #. ~ Description for {'str': 'survivor cargo pants', 'str_pl': 'survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" -"A pair of Kevlar armored pants covered with pouches and pockets. Custom " +"A pair of Kevlar armored pants covered with pouches and pockets. Custom-" "built to be durable, comfortable, and easy to wear." msgstr "" @@ -15206,7 +15214,7 @@ msgid_plural "pairs of fishing waders" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fishing waders +#. ~ Description for {'str': 'pair of fishing waders', 'str_pl': 'pairs of fishing waders'} #: lang/json/ARMOR_from_json.py msgid "Waterproof plastic fishing waders with a single large front pocket." msgstr "" @@ -15261,7 +15269,7 @@ msgid_plural "red jeans" msgstr[0] "" msgstr[1] "" -#. ~ Description for red jeans +#. ~ Description for {'str': 'red jeans', 'str_pl': 'red jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of tight-fitting candy-apple-red jeans with two deep pockets." msgstr "" @@ -15445,7 +15453,7 @@ msgid_plural "ski pants" msgstr[0] "" msgstr[1] "" -#. ~ Description for ski pants +#. ~ Description for {'str': 'ski pants', 'str_pl': 'ski pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants meant for alpine skiing." msgstr "" @@ -15467,7 +15475,7 @@ msgid_plural "shorts" msgstr[0] "" msgstr[1] "" -#. ~ Description for shorts +#. ~ Description for {'str': 'shorts', 'str_pl': 'shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of khaki shorts." msgstr "" @@ -15889,7 +15897,7 @@ msgid_plural "wedding veils" msgstr[0] "" msgstr[1] "" -#. ~ Description for wedding veil +#. ~ Description for {'str': 'wedding veil'} #: lang/json/ARMOR_from_json.py msgid "A lacy white wedding veil." msgstr "" @@ -15982,7 +15990,7 @@ msgstr[1] "" #. ~ Description for power armor hauling frame #: lang/json/ARMOR_from_json.py -msgid "A heavy duty hauling frame designed to interface with power armor." +msgid "A heavy-duty hauling frame designed to interface with power armor." msgstr "" #: lang/json/ARMOR_from_json.py @@ -16157,7 +16165,7 @@ msgstr[0] "" msgstr[1] "" #. ~ Use action holster_prompt for ankle sheath. -#. ~ Use action holster_prompt for sheath. +#. ~ Use action holster_prompt for {'str': 'sheath', 'str_pl': 'sheathes'}. #. ~ Use action holster_prompt for pair of boots. #. ~ Use action holster_prompt for pair of bone armor boots. #. ~ Use action holster_prompt for pair of turnout boots. @@ -16225,7 +16233,7 @@ msgid_plural "sheathes" msgstr[0] "" msgstr[1] "" -#. ~ Description for sheath +#. ~ Description for {'str': 'sheath', 'str_pl': 'sheathes'} #: lang/json/ARMOR_from_json.py msgid "" "A leather sheath for holding knives and other small blades. It is easy to " @@ -16336,7 +16344,7 @@ msgstr[1] "" #. ~ Description for high-volume rucksack #: lang/json/ARMOR_from_json.py msgid "" -"Also know as a \"bigpack\", this rucksack is prized by pack rats but may " +"Also known as a \"bigpack\", this rucksack is prized by pack rats but may " "lead to a bad back." msgstr "" @@ -16429,7 +16437,7 @@ msgid_plural "tactical dump pouches" msgstr[0] "" msgstr[1] "" -#. ~ Description for tactical dump pouch +#. ~ Description for {'str': 'tactical dump pouch', 'str_pl': 'tactical dump pouches'} #: lang/json/ARMOR_from_json.py msgid "" "An expandable pouch secured with straps. Provides a bit of extra storage " @@ -17323,7 +17331,7 @@ msgid "" "The WebbStar moisture retention suit utilizes advanced technology to prevent " "up to 30% of moisture loss through perspiration. The suit is powered by the " "micro-motions of the body, especially breathing and walking motions. " -"Because of this your walking speed is impaired while wearing it." +"Because of this, your walking speed is impaired while wearing it." msgstr "" #: lang/json/ARMOR_from_json.py @@ -17426,7 +17434,7 @@ msgid_plural "pairs of swimming trunks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of swimming trunks +#. ~ Description for {'str': 'pair of swimming trunks', 'str_pl': 'pairs of swimming trunks'} #: lang/json/ARMOR_from_json.py msgid "A pair of swimming trunks, with netting." msgstr "" @@ -17484,7 +17492,7 @@ msgid_plural "pairs of survivor wetsuit gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of survivor wetsuit gloves +#. ~ Description for {'str': 'pair of survivor wetsuit gloves', 'str_pl': 'pairs of survivor wetsuit gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of customized, Kevlar armored neoprene gloves, modified to be easy to " @@ -17538,7 +17546,7 @@ msgid_plural "pairs of swim goggles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of swim goggles +#. ~ Description for {'str': 'pair of swim goggles', 'str_pl': 'pairs of swim goggles'} #: lang/json/ARMOR_from_json.py msgid "A small pair of goggles made for swimming." msgstr "" @@ -17549,7 +17557,7 @@ msgid_plural "pairs of swimming gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of swimming gloves +#. ~ Description for {'str': 'pair of swimming gloves', 'str_pl': 'pairs of swimming gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of very flexible neoprene-silicone rubber gloves, suitable for " @@ -17649,7 +17657,7 @@ msgid_plural "scrap cuirasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for scrap cuirass +#. ~ Description for {'str': 'scrap cuirass', 'str_pl': 'scrap cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A cuirass made from scraps of metal secured by simple strings; the loose " @@ -17743,7 +17751,7 @@ msgstr[1] "" #. ~ Description for light survivor body armor #: lang/json/ARMOR_from_json.py msgid "" -"Lightweight, custom built body armor made from Kevlar and tough fabric. " +"Lightweight, custom-built body armor made from Kevlar and tough fabric. " "Mostly waterproof." msgstr "" @@ -18494,7 +18502,7 @@ msgid_plural "pairs of leg warmers" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of leg warmers +#. ~ Description for {'str': 'pair of leg warmers', 'str_pl': 'pairs of leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your legs warm." msgstr "" @@ -18505,7 +18513,7 @@ msgid_plural "pairs of fur leggings" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of fur leggings +#. ~ Description for {'str': 'pair of fur leggings', 'str_pl': 'pairs of fur leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Snug fur sleeves to keep your legs warm. Simple yet effective since " @@ -18562,7 +18570,7 @@ msgid_plural "panties" msgstr[0] "" msgstr[1] "" -#. ~ Description for panties +#. ~ Description for {'str': 'panties', 'str_pl': 'panties'} #: lang/json/ARMOR_from_json.py msgid "" "Underwear designed to be worn by women. Preserves your modesty in desperate " @@ -18612,7 +18620,7 @@ msgid_plural "tights" msgstr[0] "" msgstr[1] "" -#. ~ Description for tights +#. ~ Description for {'str': 'tights', 'str_pl': 'tights'} #: lang/json/ARMOR_from_json.py msgid "" "A snug cloth garment which clings tightly to the legs and feet to protect " @@ -18961,7 +18969,7 @@ msgstr[1] "" #. ~ Description for crafted brigandine #: lang/json/ARMOR_from_json.py msgid "" -"Modelled after a proper brigandine from medieval times, this makeshift piece " +"Modeled after a proper brigandine from medieval times, this makeshift piece " "of body armor consists of layered cloth with small pieces of sheet metal " "affixed to the underside. While not as protective as a proper piece of " "armor, it'll still keep you relatively safe." @@ -18976,8 +18984,8 @@ msgstr[1] "" #. ~ Description for CRIT face mask #: lang/json/ARMOR_from_json.py msgid "" -"This is the C.R.I.T standard issue face mask, lined with kevlar for extra " -"protection. A few filters provide decent enviromental safety, but it was " +"This is the C.R.I.T standard issue face mask, lined with Kevlar for extra " +"protection. A few filters provide decent environmental safety, but it was " "not intended for extended use. It has a basic integrated HUD." msgstr "" @@ -18991,7 +18999,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "C.R.I.T standard-issue boots. Next-gen gels keep feet comfortable and " -"hygenic during long-term missions while absorbing shock and heat from " +"hygienic during long-term missions while absorbing shock and heat from " "outside-sources. Superalloy mesh and rubber offer quite a bit of chemical " "protection as well. Decently heavy though" msgstr "" @@ -19034,9 +19042,9 @@ msgstr[1] "" #. ~ Description for pair of CRIT fingertip-less liners #: lang/json/ARMOR_from_json.py msgid "" -"C.R.I.T standard-issue glove liners. Made with neroprene and rubber mesh " -"for warmth and fingertip-less for those with gene-modding and/or mutations " -"while still allowing greater manipulation of items and moderate protection." +"C.R.I.T standard-issue glove liners. Made with neoprene and rubber mesh for " +"warmth and fingertip-less for those with gene-modding and/or mutations while " +"still allowing greater manipulation of items and moderate protection." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19134,7 +19142,7 @@ msgid "" "An airtight, flexible suit of woven composite fibers complete with segmented " "plates of armor. A complex system digitizes items in an individual pocket " "universe for storage while built in joint-torsion ratchets generate the " -"neccessary energy required to power the interface." +"necessary energy required to power the interface." msgstr "" #: lang/json/ARMOR_from_json.py @@ -19147,7 +19155,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A relatively simple suit of armor. A suit of woven composite fibers " -"combined with a cleansuit core and strategically placed segmented kevlar " +"combined with a cleansuit core and strategically placed segmented Kevlar " "plates keep the suit light-weight and the one wearing it alive while " "offering superb resistance to the elements and ambient radiation. " msgstr "" @@ -19176,10 +19184,10 @@ msgstr[1] "" msgid "" "A series of plates, guards and buckles which assemble into a suit of sturdy " "body-armor which usually goes over other armor. Overlapping steel plates on " -"top of kevlar plates cover vast expanses as the armor juts off in places so " +"top of Kevlar plates cover vast expanses as the armor juts off in places so " "it can deflect attacks. Built with the idea that comfort is less important " "than safety, this heavy suit is difficult to move about in but highly " -"protective. Various adjustable conectors such as straps and clips hold it " +"protective. Various adjustable connectors such as straps and clips hold it " "together." msgstr "" @@ -19193,7 +19201,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "C.R.I.T Enforcer docks. Metal plates vaguely molded into the shape of " -"oversized feet which clamp down onto your owm footwear keep your feet out of " +"oversized feet which clamp down onto your own footwear keep your feet out of " "harms way. It looks terrible and feels clunky unlike most of C.R.I.T's " "designs, but they do seem to be worth using if you were to be in the middle " "of a warzone." @@ -19209,7 +19217,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A suit of modern body-armor. Strategically placed superalloy plates keep " -"the suit's weight minimal while kevlar plates other areas and a lining of " +"the suit's weight minimal while Kevlar plates other areas and a lining of " "soft neoprene pads areas for extra comfort. Most importantly, this can be " "worn comfortably under other armor." msgstr "" @@ -19224,7 +19232,7 @@ msgstr[1] "" #: lang/json/ARMOR_from_json.py msgid "" "A matte black suit of outdated and bulky looking plate armor fitted onto a " -"soft kevlar body-suit. Retrofitted with new armor improvements, this heavy " +"soft Kevlar body-suit. Retrofitted with new armor improvements, this heavy " "armor will definitely protect you from practically anything. Just make sure " "you can actually walk with it on though." msgstr "" @@ -19922,7 +19930,7 @@ msgstr[1] "" #. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" -"This is a testing item for the BATTERY item type. If you found one in game " +"This is a testing item for the BATTERY item type. If you found one in game, " "it's a bug." msgstr "" @@ -19970,7 +19978,7 @@ msgid_plural "Adrenaline Pump CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Adrenaline Pump CBM +#. ~ Description for {'str': 'Adrenaline Pump CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A stimulator system that is implanted alongside the adrenal glands, allowing " @@ -19984,7 +19992,7 @@ msgid_plural "Active Defense System CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Active Defense System CBM +#. ~ Description for {'str': 'Active Defense System CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "This bionic projects a thin forcefield around the user's body. Anything " @@ -19999,7 +20007,7 @@ msgid_plural "Alarm System CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Alarm System CBM +#. ~ Description for {'str': 'Alarm System CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A motion-detecting alarm system will notice almost all movement within a " @@ -20013,7 +20021,7 @@ msgid_plural "Arms Alloy Plating CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Arms Alloy Plating CBM +#. ~ Description for {'str': 'Arms Alloy Plating CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "Alloy plating that replaces the flesh on the user's arms. Provides passive " @@ -20079,7 +20087,7 @@ msgid_plural "Battery System CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Battery System CBM +#. ~ Description for {'str': 'Battery System CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A battery draining attachment to make use of the energy contained in normal, " @@ -20120,7 +20128,7 @@ msgid_plural "Blood Analysis CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Blood Analysis CBM +#. ~ Description for {'str': 'Blood Analysis CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "Small sensors that are implanted in the user's heart, allowing them to " @@ -20134,7 +20142,7 @@ msgid_plural "Blood Filter CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Blood Filter CBM +#. ~ Description for {'str': 'Blood Filter CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A filtration system that is installed in the heart and can actively filter " @@ -20149,7 +20157,7 @@ msgid_plural "Cable Charger System CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Cable Charger System CBM +#. ~ Description for {'str': 'Cable Charger System CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A complex port that is mounted above the hip. While active, it will " @@ -20175,7 +20183,7 @@ msgid_plural "Chain Lightning CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Chain Lightning CBM +#. ~ Description for {'str': 'Chain Lightning CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A chain lightning generator that emits a blast of lightning at a target, " @@ -20189,7 +20197,7 @@ msgid_plural "Bionic Claws CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Bionic Claws CBM +#. ~ Description for {'str': 'Bionic Claws CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "Vicious, retractable claws that are implanted inside the user's fingers. " @@ -20216,7 +20224,7 @@ msgid_plural "Cloaking System CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Cloaking System CBM +#. ~ Description for {'str': 'Cloaking System CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "This high-power system uses a set of cameras and LEDs to make the user blend " @@ -20231,11 +20239,11 @@ msgid_plural "Close Quarters Battle CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Close Quarters Battle CBM +#. ~ Description for {'str': 'Close Quarters Battle CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A set of bionic processors and databanks, loaded with martial arts combat " -"programs. Whilst active, the CQB module will improve the user's hand to " +"programs. Whilst active, the CQB module will improve the user's hand-to-" "hand combat skills, but prevents them from improving them through combat " "experience." msgstr "" @@ -20293,7 +20301,7 @@ msgstr[1] "" #: lang/json/BIONIC_ITEM_from_json.py msgid "" "Small parabolic EMP field generators that are mounted in the palm of the " -"user's right hand. These can be be used to instantly fire a wide, but short-" +"user's right hand. These can be used to instantly fire a wide, but short-" "ranged blast which will disable electronics and robots." msgstr "" @@ -20322,7 +20330,7 @@ msgstr[1] "" #: lang/json/BIONIC_ITEM_from_json.py msgid "" "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 " +"can store up to 500ml and accepts ethanol, methanol and denatured alcohol as " "fuel." msgstr "" @@ -20332,8 +20340,8 @@ msgid_plural "Aero-Evaporator CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Aero-Evaporator CBM -#. ~ Description for Aero-Evaporator +#. ~ Description for {'str': 'Aero-Evaporator CBM'} +#. ~ Description for {'str': 'Aero-Evaporator'} #: lang/json/BIONIC_ITEM_from_json.py lang/json/bionic_from_json.py msgid "" "This unit draws moisture from the surrounding air, which slowly trickles " @@ -20548,7 +20556,7 @@ msgid_plural "Cerebral Booster CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Cerebral Booster CBM +#. ~ Description for {'str': 'Cerebral Booster CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "Bionic coprocessors that are implanted in the brain, granting a +2 bonus to " @@ -20698,7 +20706,7 @@ msgid_plural "Artificial Night Generator CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Artificial Night Generator CBM +#. ~ Description for {'str': 'Artificial Night Generator CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "When active, this bionic eliminates all light within a 15 tile radius " @@ -20823,7 +20831,7 @@ msgid_plural "Air Filtration System CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Air Filtration System CBM +#. ~ Description for {'str': 'Air Filtration System CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "An advanced filtration system that is implanted in the trachea. If toxins, " @@ -21016,7 +21024,7 @@ msgid_plural "Autonomous Surgical Scalpels CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Autonomous Surgical Scalpels CBM +#. ~ Description for {'str': 'Autonomous Surgical Scalpels CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A system of surgical grade scalpels that is implanted in the user's " @@ -21030,7 +21038,7 @@ msgid_plural "Anti-Glare Compensators CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Anti-Glare Compensators CBM +#. ~ Description for {'str': 'Anti-Glare Compensators CBM'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A set of quick-reacting transition lenses that are installed over the user's " @@ -21278,7 +21286,7 @@ msgid_plural "Acidic Leaking CBMs" msgstr[0] "" msgstr[1] "" -#. ~ Description for Acidic Leaking CBM +#. ~ Description for {'str': '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 " @@ -21365,7 +21373,7 @@ msgid_plural "Bionic Nostrils" msgstr[0] "" msgstr[1] "" -#. ~ Description for Bionic Nostril +#. ~ Description for {'str': '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." @@ -21377,7 +21385,7 @@ msgid_plural "Bionic Visual Impairments" msgstr[0] "" msgstr[1] "" -#. ~ Description for Bionic Visual Impairment +#. ~ Description for {'str': 'Bionic Visual Impairment'} #: lang/json/BIONIC_ITEM_from_json.py msgid "A defective bionic that impairs vision." msgstr "" @@ -21399,7 +21407,7 @@ msgid_plural "Bionic Short Circuits" msgstr[0] "" msgstr[1] "" -#. ~ Description for Bionic Short Circuit +#. ~ Description for {'str': 'Bionic Short Circuit'} #: lang/json/BIONIC_ITEM_from_json.py msgid "This bionic is poorly wired and occasionally short-circuits." msgstr "" @@ -21696,6 +21704,7 @@ msgid_plural "chicken walker schematics" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'chicken walker schematics', 'str_pl': 'chicken walker schematics'} #. ~ Description for chicken walker schematics #: lang/json/BOOK_from_json.py msgid "" @@ -21711,6 +21720,7 @@ msgid_plural "tank drone schematics" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'tank drone schematics', 'str_pl': 'tank drone schematics'} #. ~ Description for tank drone schematics #: lang/json/BOOK_from_json.py msgid "" @@ -21726,6 +21736,7 @@ msgid_plural "tripod schematics" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'tripod schematics', 'str_pl': 'tripod schematics'} #. ~ Description for tripod schematics #: lang/json/BOOK_from_json.py msgid "" @@ -22232,8 +22243,8 @@ msgstr[1] "" #. ~ Description for {'str': 'Drink the Harvest', 'str_pl': 'copies of Drink the Harvest'} #: lang/json/BOOK_from_json.py msgid "" -"Canning foods doesn't have to stop with jam and pickles. This books " -"provides a plethora of juices that can be preserved." +"Canning foods doesn't have to stop with jam and pickles. This book provides " +"a plethora of juices that can be preserved." msgstr "" #: lang/json/BOOK_from_json.py @@ -25402,7 +25413,7 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "" -"This copy of Ray Bradbury's \"Farenheit 451\" has a certificate of " +"This copy of Ray Bradbury's \"Fahrenheit 451\" has a certificate of " "authenticity declaring it to be an early edition. It would have been worth " "an enormous amount of money, not long ago." msgstr "" @@ -25665,7 +25676,7 @@ msgstr[1] "" #. ~ Description for {'str': 'Survival Under Atomic Attack', 'str_pl': 'copies of Survival Under Atomic Attack'} #: lang/json/BOOK_from_json.py msgid "" -"A wordy and intricate guide to wilderness and urban survival in a worst case " +"A wordy and intricate guide to wilderness and urban survival in a worst-case " "scenario. While filled with loads of useful information, the madman who " "wrote this was a terrible writer, and gleaning knowledge from the rants is a " "chore." @@ -26535,7 +26546,7 @@ msgid_plural "liquid fertilizer" msgstr[0] "" msgstr[1] "" -#. ~ Description for liquid fertilizer +#. ~ Description for {'str': 'liquid fertilizer', 'str_pl': 'liquid fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "A nutrient rich elixir for plants." msgstr "" @@ -26570,7 +26581,7 @@ msgid_plural "insecticide" msgstr[0] "" msgstr[1] "" -#. ~ Description for insecticide +#. ~ Description for {'str': 'insecticide', 'str_pl': 'insecticide'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Agricultural-grade chemical insecticide powder designed to eradicate insect " @@ -26618,7 +26629,7 @@ msgid_plural "weak acid water" msgstr[0] "" msgstr[1] "" -#. ~ Description for weak acid water +#. ~ Description for {'str': 'weak acid water', 'str_pl': 'weak acid water'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A mixture of rain and acid rain. Don't drink it. Boiling it concentrates " @@ -26760,7 +26771,7 @@ msgid_plural "peptone broth powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for peptone broth powder +#. ~ Description for {'str': 'peptone broth powder', 'str_pl': 'peptone broth powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a pre-mixed salty solution of protein and sugar. It's meant for " @@ -26973,7 +26984,7 @@ msgstr[1] "" #. ~ Description for {'str': 'rum', 'str_pl': 'rum'} #: lang/json/COMESTIBLE_from_json.py msgid "" -"An distilled alcoholic beverage made from fermenting molasses. Drinking it " +"A distilled alcoholic beverage made from fermenting molasses. Drinking it " "might make you feel like a pirate. Or not." msgstr "" @@ -27314,7 +27325,7 @@ msgid_plural "single pot still Irish whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for single pot still Irish whiskey +#. ~ Description for {'str': 'single pot still Irish whiskey', 'str_pl': 'single pot still Irish whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "A whiskey made from a mixed mash of malted and unmalted barley." msgstr "" @@ -27362,7 +27373,7 @@ msgstr[1] "" #. ~ Description for {'str': 'Bristol Cream', 'str_pl': 'Bristol Cream'} #: lang/json/COMESTIBLE_from_json.py msgid "" -"A fine sherry that was been aged in American oak casks and bottled in " +"A fine sherry that has been aged in American oak casks and bottled in " "Bristol, England." msgstr "" @@ -27469,7 +27480,7 @@ msgid_plural "donut holes" msgstr[0] "" msgstr[1] "" -#. ~ Description for donut holes +#. ~ Description for {'str': 'donut holes', 'str_pl': 'donut holes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "These balls of dough have been cut into shape, covered with sugar, and " @@ -27592,7 +27603,7 @@ msgid_plural "whiskey washes" msgstr[0] "" msgstr[1] "" -#. ~ Description for whiskey wash +#. ~ Description for {'str': 'whiskey wash', 'str_pl': 'whiskey washes'} #: lang/json/COMESTIBLE_from_json.py msgid "Fermented, but not distilled whiskey. No longer tastes sweet." msgstr "" @@ -27603,7 +27614,7 @@ msgid_plural "fermenting gin mashes" msgstr[0] "" msgstr[1] "" -#. ~ Description for fermenting gin mash +#. ~ Description for {'str': 'fermenting gin mash', 'str_pl': 'fermenting gin mashes'} #: lang/json/COMESTIBLE_from_json.py msgid "Undistilled gin mash. Distilling it will produce gin." msgstr "" @@ -27614,7 +27625,7 @@ msgid_plural "gin mashes" msgstr[0] "" msgstr[1] "" -#. ~ Description for gin mash +#. ~ Description for {'str': 'gin mash', 'str_pl': 'gin mashes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Gin mash, after the junipers have had time to add flavor, ready to be " @@ -27638,7 +27649,7 @@ msgid_plural "vodka washes" msgstr[0] "" msgstr[1] "" -#. ~ Description for vodka wash +#. ~ Description for {'str': 'vodka wash', 'str_pl': 'vodka washes'} #: lang/json/COMESTIBLE_from_json.py msgid "Fermented, but not distilled vodka. No longer tastes sweet." msgstr "" @@ -27660,7 +27671,7 @@ msgid_plural "rum washes" msgstr[0] "" msgstr[1] "" -#. ~ Description for rum wash +#. ~ Description for {'str': 'rum wash', 'str_pl': 'rum washes'} #: lang/json/COMESTIBLE_from_json.py msgid "Fermented, but not distilled rum. No longer tastes sweet." msgstr "" @@ -27723,7 +27734,7 @@ msgid_plural "moonshine mashes" msgstr[0] "" msgstr[1] "" -#. ~ Description for moonshine mash +#. ~ Description for {'str': 'moonshine mash', 'str_pl': 'moonshine mashes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Unfermented moonshine. Just some water, sugar and corn, like good ol' " @@ -27736,7 +27747,7 @@ msgid_plural "moonshine washes" msgstr[0] "" msgstr[1] "" -#. ~ Description for moonshine wash +#. ~ Description for {'str': 'moonshine wash', 'str_pl': 'moonshine washes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fermented, but not distilled moonshine. Contains all the contaminants you " @@ -27775,7 +27786,7 @@ msgid_plural "fillets of fish" msgstr[0] "" msgstr[1] "" -#. ~ Description for fillet of fish +#. ~ Description for {'str': 'fillet of fish', 'str_pl': 'fillets of fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly caught fish. Makes a passable meal raw." msgstr "" @@ -27881,7 +27892,7 @@ msgid_plural "scraps of meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for scrap of meat +#. ~ Description for {'str': 'scrap of meat', 'str_pl': 'scraps of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a tiny scrap of edible meat. It's not much, but it'll do in a pinch." @@ -27909,7 +27920,7 @@ msgid_plural "scraps of mutant meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for scrap of mutant meat +#. ~ Description for {'str': 'scrap of mutant meat', 'str_pl': 'scraps 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, " @@ -28024,7 +28035,7 @@ msgid_plural "pickled offal" msgstr[0] "" msgstr[1] "" -#. ~ Description for pickled offal +#. ~ Description for {'str': 'pickled offal', 'str_pl': 'pickled offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a mass of entrails and organ meat, preserved in brine. Packed with " @@ -28069,21 +28080,21 @@ msgid_plural "meat jerky" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat jerky when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'meat jerky', 'str_pl': 'meat jerky'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "jerk jerky" msgid_plural "jerk jerky" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat jerky when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'meat jerky', 'str_pl': 'meat jerky'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "monster jerky" msgid_plural "monster jerky" msgstr[0] "" msgstr[1] "" -#. ~ Description for meat jerky +#. ~ Description for {'str': 'meat jerky', 'str_pl': 'meat jerky'} #: lang/json/COMESTIBLE_from_json.py msgid "Salty dried meat that lasts for a long time, but will make you thirsty." msgstr "" @@ -28094,7 +28105,7 @@ msgid_plural "salted fish" msgstr[0] "" msgstr[1] "" -#. ~ Description for salted fish +#. ~ Description for {'str': 'salted fish', 'str_pl': 'salted fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Salty dried fish that lasts for a long time, but will make you thirsty." msgstr "" @@ -28136,7 +28147,7 @@ msgid_plural "smoked fish" msgstr[0] "" msgstr[1] "" -#. ~ Description for smoked fish +#. ~ Description for {'str': 'smoked fish', 'str_pl': 'smoked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Tasty fish that has been heavily smoked for long term preservation. It " @@ -28149,7 +28160,7 @@ msgid_plural "pieces of raw lung" msgstr[0] "" msgstr[1] "" -#. ~ Description for piece of raw lung +#. ~ Description for {'str': 'piece of raw lung', 'str_pl': 'pieces of raw lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A portion of lung from an animal. It's spongy and pink, and spoils very " @@ -28190,7 +28201,7 @@ msgstr "" #. ~ Description for cooked liver #: lang/json/COMESTIBLE_from_json.py msgid "" -"Chock full of B-Vitamins! Cooked liver isn't all that bad, depending on how " +"Chock-full of B-Vitamins! Cooked liver isn't all that bad, depending on how " "you feel about the texture, but this is probably the least fancy way to do " "it." msgstr "" @@ -28201,7 +28212,7 @@ msgid_plural "raw brains" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw brains +#. ~ Description for {'str': 'raw brains', 'str_pl': 'raw brains'} #: lang/json/COMESTIBLE_from_json.py msgid "The brain from an animal. You wouldn't want to eat this raw…" msgstr "" @@ -28612,7 +28623,7 @@ msgid_plural "scraps of leech bark" msgstr[0] "" msgstr[1] "" -#. ~ Description for leech bark +#. ~ Description for {'str': 'leech bark', 'str_pl': 'scraps of leech bark'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dry and tough bark matter harvested from an alien plant. It is slightly " @@ -28642,7 +28653,7 @@ msgid_plural "shelf stable milk" msgstr[0] "" msgstr[1] "" -#. ~ Description for shelf stable milk +#. ~ Description for {'str': 'shelf stable milk', 'str_pl': 'shelf stable milk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is milk that has been pasteurized at much higher temperatures than " @@ -28656,7 +28667,7 @@ msgid_plural "evaporated milk" msgstr[0] "" msgstr[1] "" -#. ~ Description for evaporated milk +#. ~ Description for {'str': 'evaporated milk', 'str_pl': 'evaporated milk'} #: lang/json/COMESTIBLE_from_json.py #, no-python-format msgid "Milk that's had about 60% of its water removed prior to canning." @@ -28714,7 +28725,7 @@ msgid_plural "ghee" msgstr[0] "" msgstr[1] "" -#. ~ Description for ghee +#. ~ Description for {'str': 'ghee', 'str_pl': 'ghee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Clarified butter, free from milk solids and water. Will last a very long " @@ -28747,7 +28758,7 @@ msgid_plural "hard cheese" msgstr[0] "" msgstr[1] "" -#. ~ Description for hard cheese +#. ~ Description for {'str': 'hard cheese', 'str_pl': 'hard cheese'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Hard, dry cheese made to last, unlike modern processed cheese. Will make " @@ -28780,7 +28791,7 @@ msgid_plural "powdered milk" msgstr[0] "" msgstr[1] "" -#. ~ Description for powdered milk +#. ~ Description for {'str': 'powdered milk', 'str_pl': 'powdered milk'} #: lang/json/COMESTIBLE_from_json.py msgid "Dehydrated milk powder. Mix with water to make drinkable milk." msgstr "" @@ -28804,7 +28815,7 @@ msgid_plural "heavy cream" msgstr[0] "" msgstr[1] "" -#. ~ Description for heavy cream +#. ~ Description for {'str': 'heavy cream', 'str_pl': 'heavy cream'} #: lang/json/COMESTIBLE_from_json.py msgid " Cream that has been skimmed from the top of raw milk left to sit." msgstr "" @@ -28998,7 +29009,7 @@ msgid_plural "crispy cranberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for crispy cranberry +#. ~ Description for {'str': 'crispy cranberry', 'str_pl': 'crispy cranberries'} #: lang/json/COMESTIBLE_from_json.py msgid "Mixing cranberry juice and lemon-lime soda works out quite well." msgstr "" @@ -29009,7 +29020,7 @@ msgid_plural "dandelion tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for dandelion tea +#. ~ Description for {'str': 'dandelion tea', 'str_pl': 'dandelion tea'} #: lang/json/COMESTIBLE_from_json.py msgid "A healthy beverage made from dandelion roots steeped in boiling water." msgstr "" @@ -29056,7 +29067,7 @@ msgid_plural "herbal tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for herbal tea +#. ~ Description for {'str': 'herbal tea', 'str_pl': 'herbal tea'} #: lang/json/COMESTIBLE_from_json.py msgid "A healthy beverage made from herbs steeped in boiling water." msgstr "" @@ -29067,7 +29078,7 @@ msgid_plural "hot chocolate" msgstr[0] "" msgstr[1] "" -#. ~ Description for hot chocolate +#. ~ Description for {'str': 'hot chocolate', 'str_pl': 'hot chocolate'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Also known as hot cocoa, this heated chocolate beverage is perfect for a " @@ -29098,7 +29109,7 @@ msgid_plural "lemonade" msgstr[0] "" msgstr[1] "" -#. ~ Description for lemonade +#. ~ Description for {'str': 'lemonade', 'str_pl': 'lemonade'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Lemon juice mixed with water and sugar to dull the sourness. Delicious and " @@ -29136,7 +29147,7 @@ msgid_plural "milk" msgstr[0] "" msgstr[1] "" -#. ~ Description for milk +#. ~ Description for {'str': 'milk', 'str_pl': 'milk'} #: lang/json/COMESTIBLE_from_json.py msgid "Baby cow food, appropriated for adult humans. Spoils rapidly." msgstr "" @@ -29200,7 +29211,7 @@ msgid_plural "pine needle tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for pine needle tea +#. ~ Description for {'str': 'pine needle tea', 'str_pl': 'pine needle tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A fragrant and healthy beverage made from pine needles steeped in boiling " @@ -29225,7 +29236,7 @@ msgid_plural "root beer" msgstr[0] "" msgstr[1] "" -#. ~ Description for root beer +#. ~ Description for {'str': 'root beer', 'str_pl': 'root beer'} #: lang/json/COMESTIBLE_from_json.py msgid "Like cola, but without caffeine. Still not that healthy." msgstr "" @@ -29322,7 +29333,7 @@ msgid_plural "mineral water" msgstr[0] "" msgstr[1] "" -#. ~ Description for mineral water +#. ~ Description for {'str': 'mineral water', 'str_pl': 'mineral water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fancy mineral water, so fancy it makes you feel fancy just holding it." msgstr "" @@ -29342,7 +29353,7 @@ msgid_plural "maple sap" msgstr[0] "" msgstr[1] "" -#. ~ Description for maple sap +#. ~ Description for {'str': 'maple sap', 'str_pl': 'maple sap'} #: lang/json/COMESTIBLE_from_json.py msgid "A water and sugar solution that has been extracted from a maple tree." msgstr "" @@ -29353,7 +29364,7 @@ msgid_plural "mayonnaise" msgstr[0] "" msgstr[1] "" -#. ~ Description for mayonnaise +#. ~ Description for {'str': 'mayonnaise', 'str_pl': 'mayonnaise'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A gloppy mix of egg, oil, and salt that is traditionally used to moisten " @@ -29388,7 +29399,7 @@ msgid_plural "forest honey" msgstr[0] "" msgstr[1] "" -#. ~ Description for forest honey +#. ~ Description for {'str': 'forest honey', 'str_pl': 'forest honey'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Honey, that stuff bees make. This one is \"forest honey\", a liquid form of " @@ -29434,7 +29445,7 @@ msgid_plural "vegetable cooking oil" msgstr[0] "" msgstr[1] "" -#. ~ Description for vegetable cooking oil +#. ~ Description for {'str': 'vegetable cooking oil', 'str_pl': 'vegetable cooking oil'} #: lang/json/COMESTIBLE_from_json.py msgid "Thin yellow vegetable oil used for cooking." msgstr "" @@ -29456,7 +29467,7 @@ msgid_plural "molasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for molasses +#. ~ Description for {'str': 'molasses', 'str_pl': 'molasses'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An extremely sugary tar-like syrup, produced by repeatedly boiling the juice " @@ -29595,11 +29606,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "powdered egg" -msgid_plural "powdered eggs" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for powdered egg +#. ~ Description for {'str': 'powdered egg'} #: lang/json/COMESTIBLE_from_json.py msgid "Whole fresh eggs, dehydrated into an easy to store powder." msgstr "" @@ -29610,7 +29619,7 @@ msgid_plural "scrambled eggs" msgstr[0] "" msgstr[1] "" -#. ~ Description for scrambled eggs +#. ~ Description for {'str': 'scrambled eggs', 'str_pl': 'scrambled eggs'} #: lang/json/COMESTIBLE_from_json.py msgid "Fluffy and delicious scrambled eggs." msgstr "" @@ -29621,7 +29630,7 @@ msgstr "" #. ~ Description for {'str': 'boiled egg'} #: lang/json/COMESTIBLE_from_json.py -msgid "A hard boiled egg, still in its shell. Portable and nutritious!" +msgid "A hard-boiled egg, still in its shell. Portable and nutritious!" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -29636,11 +29645,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "milkshake" -msgid_plural "milkshakes" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for milkshake +#. ~ Description for {'str': 'milkshake'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An all-natural cold beverage made with milk and sweeteners. Tastes great " @@ -29653,7 +29660,7 @@ msgid_plural "fast food milkshakes" msgstr[0] "" msgstr[1] "" -#. ~ Description for fast food milkshake +#. ~ Description for {'str': 'fast food milkshake', 'str_pl': 'fast food milkshakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A milkshake made by freezing a premade mix. Tastes better due to how much " @@ -29662,11 +29669,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "deluxe milkshake" -msgid_plural "deluxe milkshakes" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for deluxe milkshake +#. ~ Description for {'str': 'deluxe milkshake'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This milkshake has been enhanced with added sweeteners, and even has a " @@ -29679,7 +29684,7 @@ msgid_plural "ice cream scoops" msgstr[0] "" msgstr[1] "" -#. ~ Description for ice cream +#. ~ Description for {'str': 'ice cream', 'str_pl': 'ice cream scoops'} #: lang/json/COMESTIBLE_from_json.py msgid "A sweet, frozen food made of milk with liberal amounts of sugar." msgstr "" @@ -29694,8 +29699,8 @@ msgstr[1] "" #: lang/json/COMESTIBLE_from_json.py msgid "" "Government regulations dictate that since this isn't *technically* ice " -"cream, it be called a dairy dessert instead. It still tastes good, but your " -"body won't like you." +"cream, it can be called a dairy dessert instead. It still tastes good, but " +"your body won't like you." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -29715,7 +29720,7 @@ msgid_plural "fruity ice cream scoops" msgstr[0] "" msgstr[1] "" -#. ~ Description for fruity ice cream +#. ~ Description for {'str': 'fruity ice cream', 'str_pl': 'fruity ice cream scoops'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Small bits of sweet fruit have been tossed into this ice cream, making it " @@ -29728,7 +29733,7 @@ msgid_plural "frozen custard scoops" msgstr[0] "" msgstr[1] "" -#. ~ Description for frozen custard +#. ~ Description for {'str': 'frozen custard', 'str_pl': 'frozen custard scoops'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Similar to ice cream, this treat made famous in Coney Island is made like " @@ -29742,7 +29747,7 @@ msgid_plural "frozen yogurt" msgstr[0] "" msgstr[1] "" -#. ~ Description for frozen yogurt +#. ~ Description for {'str': 'frozen yogurt', 'str_pl': 'frozen yogurt'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Tarter than ice cream, this is made with yogurt and other dairy products, " @@ -29755,7 +29760,7 @@ msgid_plural "sorbet scoops" msgstr[0] "" msgstr[1] "" -#. ~ Description for sorbet +#. ~ Description for {'str': 'sorbet', 'str_pl': 'sorbet scoops'} #: lang/json/COMESTIBLE_from_json.py msgid "A simple frozen dessert food made from water and fruit juice." msgstr "" @@ -29766,7 +29771,7 @@ msgid_plural "gelato scoops" msgstr[0] "" msgstr[1] "" -#. ~ Description for gelato +#. ~ Description for {'str': 'gelato', 'str_pl': 'gelato scoops'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Italian-style ice cream. Less airy, and more dense, giving it a richer " @@ -29861,7 +29866,7 @@ msgid_plural "dehydrated fruit" msgstr[0] "" msgstr[1] "" -#. ~ Description for dehydrated fruit +#. ~ Description for {'str': 'dehydrated fruit', 'str_pl': 'dehydrated fruit'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dehydrated fruit flakes. With proper storage, this dried food will remain " @@ -29911,7 +29916,7 @@ msgid_plural "irradiated rose hips" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated rose hips +#. ~ Description for {'str': 'irradiated rose hips', 'str_pl': 'irradiated rose hips'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated rose hips will remain edible nearly forever. Sterilized using " @@ -29924,7 +29929,7 @@ msgid_plural "irradiated elderberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated elderberry +#. ~ Description for {'str': 'irradiated elderberry', 'str_pl': 'irradiated elderberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated elderberry will remain edible nearly forever. Sterilized " @@ -29937,7 +29942,7 @@ msgid_plural "irradiated mulberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated mulberry +#. ~ Description for {'str': 'irradiated mulberry', 'str_pl': 'irradiated mulberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated mulberry will remain edible nearly forever. Sterilized using " @@ -29950,7 +29955,7 @@ msgid_plural "irradiated huckleberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated huckleberry +#. ~ Description for {'str': 'irradiated huckleberry', 'str_pl': 'irradiated huckleberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated huckleberry will remain edible nearly forever. Sterilized " @@ -29963,7 +29968,7 @@ msgid_plural "irradiated raspberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated raspberry +#. ~ Description for {'str': 'irradiated raspberry', 'str_pl': 'irradiated raspberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated raspberry will remain edible nearly forever. Sterilized using " @@ -29976,7 +29981,7 @@ msgid_plural "irradiated cranberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated cranberry +#. ~ Description for {'str': 'irradiated cranberry', 'str_pl': 'irradiated cranberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated cranberry will remain edible nearly forever. Sterilized using " @@ -29989,7 +29994,7 @@ msgid_plural "irradiated strawberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated strawberry +#. ~ Description for {'str': 'irradiated strawberry', 'str_pl': 'irradiated strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated strawberry will remain edible nearly forever. Sterilized " @@ -30002,7 +30007,7 @@ msgid_plural "irradiated blueberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated blueberry +#. ~ Description for {'str': 'irradiated blueberry', 'str_pl': 'irradiated blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated blueberry will remain edible nearly forever. Sterilized using " @@ -30081,7 +30086,7 @@ msgid_plural "irradiated cherries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated cherry +#. ~ Description for {'str': 'irradiated cherry', 'str_pl': 'irradiated cherries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated cherry will remain edible nearly forever. Sterilized using " @@ -30101,11 +30106,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "irradiated grape" -msgid_plural "irradiated grapes" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for irradiated grape +#. ~ Description for {'str': 'irradiated grape'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated grape will remain edible nearly forever. Sterilized using " @@ -30129,7 +30132,7 @@ msgid_plural "irradiated peaches" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated peach +#. ~ Description for {'str': 'irradiated peach', 'str_pl': 'irradiated peaches'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated peach will remain edible nearly forever. Sterilized using " @@ -30164,7 +30167,7 @@ msgid_plural "irradiated blackberries" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated blackberry +#. ~ Description for {'str': 'irradiated blackberry', 'str_pl': 'irradiated blackberries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated blackberry will remain edible nearly forever. Sterilized " @@ -30254,7 +30257,7 @@ msgid_plural "irradiated tomatoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated tomato +#. ~ Description for {'str': 'irradiated tomato', 'str_pl': 'irradiated tomatoes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated tomato will remain edible nearly forever. Sterilized using " @@ -30267,7 +30270,7 @@ msgid_plural "irradiated broccoli" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated broccoli +#. ~ Description for {'str': 'irradiated broccoli', 'str_pl': 'irradiated broccoli'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated cluster of broccoli will remain edible nearly forever. " @@ -30313,7 +30316,7 @@ msgid_plural "irradiated corn" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated corn +#. ~ Description for {'str': 'irradiated corn', 'str_pl': 'irradiated corn'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated ear of corn will remain edible nearly forever. Sterilized " @@ -30337,7 +30340,7 @@ msgid_plural "irradiated potatoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for irradiated potato +#. ~ Description for {'str': 'irradiated potato', 'str_pl': 'irradiated potatoes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An irradiated potato will remain edible nearly forever. Sterilized using " @@ -30408,7 +30411,7 @@ msgid_plural "toaster pastries (uncooked)" msgstr[0] "" msgstr[1] "" -#. ~ Description for toaster pastry (uncooked) +#. ~ Description for {'str': 'toaster pastry (uncooked)', 'str_pl': 'toaster pastries (uncooked)'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A delicious fruit-filled pastry that you can cook in your toaster. It even " @@ -30421,7 +30424,7 @@ msgid_plural "toaster pastries" msgstr[0] "" msgstr[1] "" -#. ~ Description for toaster pastry +#. ~ Description for {'str': 'toaster pastry', 'str_pl': 'toaster pastries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A delicious fruit-filled pastry that you've cooked. It even comes with " @@ -30434,12 +30437,12 @@ msgid_plural "potato chips" msgstr[0] "" msgstr[1] "" -#. ~ Description for potato chips +#. ~ Description for {'str': 'potato chips', 'str_pl': 'potato chips'} #: lang/json/COMESTIBLE_from_json.py msgid "Some plain, salted potato chips." msgstr "" -#. ~ Description for potato chips +#. ~ Description for {'str': 'potato chips', 'str_pl': 'potato chips'} #: lang/json/COMESTIBLE_from_json.py msgid "Oh man, you love these chips! Score!" msgstr "" @@ -30450,7 +30453,7 @@ msgid_plural "popcorn kernels" msgstr[0] "" msgstr[1] "" -#. ~ Description for popcorn kernels +#. ~ Description for {'str': 'popcorn kernels', 'str_pl': 'popcorn kernels'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dried kernels from a particular type of corn. Practically inedible raw, " @@ -30463,7 +30466,7 @@ msgid_plural "popcorn" msgstr[0] "" msgstr[1] "" -#. ~ Description for popcorn +#. ~ Description for {'str': 'popcorn', 'str_pl': 'popcorn'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Plain and unseasoned popcorn. Not as tasty as other kinds, but healthier as " @@ -30476,7 +30479,7 @@ msgid_plural "salted popcorn" msgstr[0] "" msgstr[1] "" -#. ~ Description for salted popcorn +#. ~ Description for {'str': 'salted popcorn', 'str_pl': 'salted popcorn'} #: lang/json/COMESTIBLE_from_json.py msgid "Popcorn with salt added for extra flavor." msgstr "" @@ -30498,7 +30501,7 @@ msgid_plural "pretzels" msgstr[0] "" msgstr[1] "" -#. ~ Description for pretzels +#. ~ Description for {'str': 'pretzels', 'str_pl': 'pretzels'} #: lang/json/COMESTIBLE_from_json.py msgid "A salty treat of a snack." msgstr "" @@ -30527,7 +30530,7 @@ msgid_plural "marshmallows" msgstr[0] "" msgstr[1] "" -#. ~ Description for marshmallows +#. ~ Description for {'str': 'marshmallows', 'str_pl': 'marshmallows'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of squishy, fluffy, puffy, delicious marshmallows." msgstr "" @@ -30538,7 +30541,7 @@ msgid_plural "s'mores" msgstr[0] "" msgstr[1] "" -#. ~ Description for s'mores +#. ~ Description for {'str': "s'mores", 'str_pl': "s'mores"} #: lang/json/COMESTIBLE_from_json.py msgid "" "A pair of graham crackers with some chocolate and a marshmallow between them." @@ -30550,7 +30553,7 @@ msgid_plural "peanut butter candies" msgstr[0] "" msgstr[1] "" -#. ~ Description for peanut butter candy +#. ~ Description for {'str': 'peanut butter candy', 'str_pl': 'peanut butter candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of peanut butter cups… your favorite!" msgstr "" @@ -30583,7 +30586,7 @@ msgid_plural "powder candy sticks" msgstr[0] "" msgstr[1] "" -#. ~ Description for powder candy sticks +#. ~ Description for {'str': 'powder candy sticks', 'str_pl': 'powder candy sticks'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Thin paper tubes of sweet & sour candy powder. Who thinks of this stuff?" @@ -30595,7 +30598,7 @@ msgid_plural "maple syrup candies" msgstr[0] "" msgstr[1] "" -#. ~ Description for maple syrup candy +#. ~ Description for {'str': 'maple syrup candy', 'str_pl': 'maple syrup candies'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This golden, translucent leaf candy is made with pure maple syrup and melt " @@ -30690,7 +30693,7 @@ msgid_plural "fast-food French fries" msgstr[0] "" msgstr[1] "" -#. ~ Description for fast-food French fries +#. ~ Description for {'str': 'fast-food French fries', 'str_pl': 'fast-food French fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fast-food fried potatoes. Somehow, they're still edible." msgstr "" @@ -30703,7 +30706,7 @@ msgstr[1] "" #. ~ Description for {'str': 'French fries', 'str_pl': 'French fries'} #: lang/json/COMESTIBLE_from_json.py -msgid "Deep fried potatoes with a touch of salt. Crunchy and delicious." +msgid "Deep-fried potatoes with a touch of salt. Crunchy and delicious." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -30712,7 +30715,7 @@ msgid_plural "peppermint patties" msgstr[0] "" msgstr[1] "" -#. ~ Description for peppermint patty +#. ~ Description for {'str': 'peppermint patty', 'str_pl': 'peppermint patties'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of soft chocolate-covered peppermint patties… yum!" msgstr "" @@ -30752,7 +30755,7 @@ msgstr[1] "" msgid "Some caramel. Still bad for your health." msgstr "" -#. ~ Description for potato chips +#. ~ Description for {'str': 'potato chips', 'str_pl': 'potato chips'} #: lang/json/COMESTIBLE_from_json.py msgid "Betcha can't eat just one." msgstr "" @@ -30783,7 +30786,7 @@ msgid_plural "tortilla chips" msgstr[0] "" msgstr[1] "" -#. ~ Description for tortilla chips +#. ~ Description for {'str': 'tortilla chips', 'str_pl': 'tortilla chips'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, could really use some cheese, maybe " @@ -30809,21 +30812,21 @@ msgid_plural "meat nachos" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat nachos when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'meat nachos', 'str_pl': 'meat nachos'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos" msgid_plural "niño nachos" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat nachos when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'meat nachos', 'str_pl': 'meat nachos'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "nachos con chupacabra" msgid_plural "nachos con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for meat nachos +#. ~ Description for {'str': 'meat nachos', 'str_pl': 'meat nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with meat. Could probably use " @@ -30836,21 +30839,21 @@ msgid_plural "meat nachos with cheese" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat nachos with cheese when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'meat nachos with cheese', 'str_pl': 'meat nachos with cheese'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "niño nachos with cheese" msgid_plural "niño nachos with cheese" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat nachos with cheese when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'meat nachos with cheese', 'str_pl': 'meat nachos with cheese'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "cheese and chupacabra nachos" msgid_plural "cheese and chupacabra nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for meat nachos with cheese +#. ~ Description for {'str': 'meat nachos with cheese', 'str_pl': 'meat nachos with cheese'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas with ground meat and smothered in " @@ -30925,10 +30928,10 @@ msgid_plural "uncooked corn dogs" msgstr[0] "" msgstr[1] "" -#. ~ Description for uncooked corn dogs +#. ~ Description for {'str': 'uncooked corn dogs', 'str_pl': 'uncooked corn dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "" -"A heavily processed sausage, dipped in batter and deep fried. It would " +"A heavily processed sausage, dipped in batter and deep-fried. It would " "taste much better prepared." msgstr "" @@ -30939,7 +30942,7 @@ msgstr "" #. ~ Description for cooked corn dog #: lang/json/COMESTIBLE_from_json.py msgid "" -"A heavily processed sausage, dipped in batter and deep fried. Cooked, this " +"A heavily processed sausage, dipped in batter and deep-fried. Cooked, this " "corn dog now tastes much better, but will spoil." msgstr "" @@ -30998,11 +31001,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "uncooked hot dog" -msgid_plural "uncooked hot dogs" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for uncooked hot dog +#. ~ Description for {'str': 'uncooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A heavily processed sausage, commonplace at baseball games before the " @@ -31056,7 +31057,7 @@ msgstr[1] "" #. ~ Conditional name for raw sausage when COMPONENT_ID matches mutant #. ~ Conditional name for sausage when COMPONENT_ID matches mutant #. ~ Conditional name for cooked sausage when COMPONENT_ID matches mutant -#. ~ Conditional name for sweet sausage when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'sweet sausage', 'str_pl': 'sweet sausages'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py #, python-format msgid "sinister %s" @@ -31107,7 +31108,7 @@ msgid_plural "sweet sausages" msgstr[0] "" msgstr[1] "" -#. ~ Description for sweet sausage +#. ~ Description for {'str': 'sweet sausage', 'str_pl': 'sweet sausages'} #: lang/json/COMESTIBLE_from_json.py msgid "A sweet and delicious sausage. Better eat it fresh." msgstr "" @@ -31189,7 +31190,7 @@ msgid_plural "cracklins" msgstr[0] "" msgstr[1] "" -#. ~ Description for cracklins +#. ~ Description for {'str': 'cracklins', 'str_pl': 'cracklins'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Also known as pork rinds or chicharrones, these are bits of edible fat and " @@ -31276,7 +31277,7 @@ msgid_plural "dehydrated fish" msgstr[0] "" msgstr[1] "" -#. ~ Description for dehydrated fish +#. ~ Description for {'str': 'dehydrated fish', 'str_pl': 'dehydrated fish'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dehydrated fish flakes. With proper storage, this dried food will remain " @@ -31289,7 +31290,7 @@ msgid_plural "rehydrated fish" msgstr[0] "" msgstr[1] "" -#. ~ Description for rehydrated fish +#. ~ Description for {'str': 'rehydrated fish', 'str_pl': 'rehydrated fish'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Reconstituted fish flakes, which are much more enjoyable to eat now that " @@ -31302,7 +31303,7 @@ msgid_plural "pickled fish" msgstr[0] "" msgstr[1] "" -#. ~ Description for pickled fish +#. ~ Description for {'str': 'pickled fish', 'str_pl': 'pickled fish'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a serving of crisply brined and canned fish. Tasty and nutritious." @@ -31433,14 +31434,14 @@ msgid_plural "sausage gravies" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for sausage gravy when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'sausage gravy', 'str_pl': 'sausage gravies'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "Mannwurst gravy" msgid_plural "Mannwurst gravies" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for sausage gravy when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'sausage gravy', 'str_pl': 'sausage gravies'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py #, python-format msgid "ghastly %s" @@ -31448,7 +31449,7 @@ msgid_plural "ghastly %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for sausage gravy +#. ~ Description for {'str': 'sausage gravy', 'str_pl': 'sausage gravies'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Biscuits, meat, and delicious mushroom soup all crammed together into a " @@ -31549,7 +31550,7 @@ msgid_plural "pork and beans" msgstr[0] "" msgstr[1] "" -#. ~ Description for pork and beans +#. ~ Description for {'str': 'pork and beans', 'str_pl': 'pork and beans'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Greasy Prospector improved pork and beans with hickory smoked pig fat chunks." @@ -31655,14 +31656,14 @@ msgid_plural "meat fried rice" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat fried rice when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'meat fried rice', 'str_pl': 'meat fried rice'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "mutant fried rice" msgid_plural "mutant fried rice" msgstr[0] "" msgstr[1] "" -#. ~ Description for meat fried rice +#. ~ Description for {'str': 'meat fried rice', 'str_pl': 'meat fried rice'} #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with meat. Tasty and very filling." msgstr "" @@ -31673,14 +31674,14 @@ msgid_plural "deluxe beans and rice" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for deluxe beans and rice when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'deluxe beans and rice', 'str_pl': 'deluxe beans and rice'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "\"deluxe\" beans and rice" msgid_plural "\"deluxe\" beans and rice" msgstr[0] "" msgstr[1] "" -#. ~ Description for deluxe beans and rice +#. ~ Description for {'str': 'deluxe beans and rice', 'str_pl': 'deluxe beans and rice'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Slow-cooked beans and rice with meat and seasonings. Tasty and very filling." @@ -31732,7 +31733,7 @@ msgstr[1] "" #. ~ Description for meat pizza #: lang/json/COMESTIBLE_from_json.py msgid "" -"A meat pizza, for all the carnivores out there. Chock full of minced meat " +"A meat pizza, for all the carnivores out there. Chock-full of minced meat " "and heavily seasoned." msgstr "" @@ -31751,14 +31752,14 @@ msgid_plural "deluxe scrambled eggs" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for deluxe scrambled eggs when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'deluxe scrambled eggs', 'str_pl': 'deluxe scrambled eggs'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "\"deluxe\" scrambled eggs" msgid_plural "\"deluxe\" scrambled eggs" msgstr[0] "" msgstr[1] "" -#. ~ Description for deluxe scrambled eggs +#. ~ Description for {'str': 'deluxe scrambled eggs', 'str_pl': 'deluxe scrambled eggs'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious scrambled eggs made more delicious with the addition of " @@ -31805,14 +31806,14 @@ msgid_plural "spaghetti bolognese" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for spaghetti bolognese when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'spaghetti bolognese', 'str_pl': 'spaghetti bolognese'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "scoundrel spaghetti" msgid_plural "scoundrel spaghettis" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for spaghetti bolognese when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'spaghetti bolognese', 'str_pl': 'spaghetti bolognese'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py #, python-format msgid "gnarly %s" @@ -31820,7 +31821,7 @@ msgid_plural "gnarly %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for spaghetti bolognese +#. ~ Description for {'str': 'spaghetti bolognese', 'str_pl': 'spaghetti bolognese'} #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti covered with a thick meat sauce. Yum!" msgstr "" @@ -32017,11 +32018,11 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "haggis" -msgid_plural "haggii" +msgid_plural "haggises" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for haggis when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'haggis', 'str_pl': 'haggises'} when FLAG matches CANNIBALISM #. ~ Conditional name for bone broth when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py #, python-format @@ -32030,7 +32031,7 @@ msgid_plural "human %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for haggis +#. ~ Description for {'str': 'haggis', 'str_pl': 'haggises'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This traditional Scottish savory pudding is made of meat and offal mixed " @@ -32045,7 +32046,7 @@ msgid_plural "fish makizushi" msgstr[0] "" msgstr[1] "" -#. ~ Description for fish makizushi +#. ~ Description for {'str': 'fish makizushi', 'str_pl': 'fish makizushi'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Delicious slivers of thinly sliced raw fish wrapped in tasty sushi rice and " @@ -32058,7 +32059,7 @@ msgid_plural "meat temaki" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat temaki when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'meat temaki', 'str_pl': 'meat temaki'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py #, python-format msgid "troubling %s" @@ -32066,7 +32067,7 @@ msgid_plural "troubling %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for meat temaki +#. ~ Description for {'str': 'meat temaki', 'str_pl': 'meat temaki'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Delicious slivers of raw meat wrapped in tasty sushi rice and rolled up in a " @@ -32079,7 +32080,7 @@ msgid_plural "sashimi" msgstr[0] "" msgstr[1] "" -#. ~ Description for sashimi +#. ~ Description for {'str': 'sashimi', 'str_pl': 'sashimi'} #: lang/json/COMESTIBLE_from_json.py msgid "Delicious slivers of thinly sliced raw fish and tasty vegetables." msgstr "" @@ -32320,7 +32321,7 @@ msgid_plural "hydrogen peroxide" msgstr[0] "" msgstr[1] "" -#. ~ Description for hydrogen peroxide +#. ~ Description for {'str': 'hydrogen peroxide', 'str_pl': 'hydrogen peroxide'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dilute hydrogen peroxide, for use as an antiseptic and for bleaching hair or " @@ -32415,7 +32416,7 @@ msgid_plural "pairs of contact lenses" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of contact lenses +#. ~ Description for {'str': 'pair of contact lenses', 'str_pl': 'pairs of contact lenses'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A pair of extended wear contacts with soft lenses designed to be discarded " @@ -32429,7 +32430,7 @@ msgid_plural "cotton balls" msgstr[0] "" msgstr[1] "" -#. ~ Description for cotton balls +#. ~ Description for {'str': 'cotton balls', 'str_pl': 'cotton balls'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy balls of clean white cotton. Can serve as makeshift bandages in an " @@ -32442,12 +32443,12 @@ msgid_plural "crack" msgstr[0] "" msgstr[1] "" -#. ~ Use action activation_message for crack. +#. ~ Use action activation_message for {'str': 'crack', 'str_pl': 'crack'}. #: lang/json/COMESTIBLE_from_json.py msgid "You smoke your crack rocks. Mother would be proud." msgstr "" -#. ~ Description for crack +#. ~ Description for {'str': 'crack', 'str_pl': 'crack'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Deprotonated cocaine crystals, incredibly addictive and deleterious to brain " @@ -32460,7 +32461,7 @@ msgid_plural "non-drowsy cough syrup" msgstr[0] "" msgstr[1] "" -#. ~ Description for non-drowsy cough syrup +#. ~ Description for {'str': 'non-drowsy cough syrup', 'str_pl': 'non-drowsy cough syrup'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Daytime cold and flu medication. Non-drowsy formula. Will suppress " @@ -32514,11 +32515,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "saline eye drop" -msgid_plural "saline eye drops" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for saline eye drop +#. ~ Description for {'str': 'saline eye drop'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Sterile saline eye drops. Can be used to treat dry eyes, or to wash out " @@ -32565,13 +32564,13 @@ msgid_plural "heroin" msgstr[0] "" msgstr[1] "" -#. ~ Use action activation_message for heroin. +#. ~ Use action activation_message for {'str': 'heroin', 'str_pl': 'heroin'}. #. ~ Use action activation_message for morphine. #: lang/json/COMESTIBLE_from_json.py msgid "You shoot up." msgstr "" -#. ~ Description for heroin +#. ~ Description for {'str': 'heroin', 'str_pl': 'heroin'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An extremely strong opioid narcotic derived from morphine. Incredibly " @@ -32641,7 +32640,7 @@ msgid_plural "low-grade methamphetamine" msgstr[0] "" msgstr[1] "" -#. ~ Description for low-grade methamphetamine +#. ~ Description for {'str': 'low-grade methamphetamine', 'str_pl': 'low-grade methamphetamine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A profoundly addictive and powerful stimulant. While extremely effective at " @@ -32794,7 +32793,7 @@ msgid_plural "hemostatic powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for hemostatic powder +#. ~ Description for {'str': 'hemostatic powder', 'str_pl': 'hemostatic powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A powdered antihemorrhagic compound that reacts with blood to immediately " @@ -32984,12 +32983,12 @@ msgid_plural "marijuana" msgstr[0] "" msgstr[1] "" -#. ~ Use action activation_message for marijuana. +#. ~ Use action activation_message for {'str': 'marijuana', 'str_pl': 'marijuana'}. #: lang/json/COMESTIBLE_from_json.py msgid "You smoke some weed. Good stuff, man!" msgstr "" -#. ~ Description for marijuana +#. ~ Description for {'str': 'marijuana', 'str_pl': 'marijuana'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The dried flower buds and leaves harvested from a psychoactive variety of " @@ -33376,9 +33375,8 @@ msgstr "" #. ~ Description for southwest beef & beans entree #: lang/json/COMESTIBLE_from_json.py msgid "" -"The southwest beef & beans entree entree from an MRE. Sterilized using " -"radiation, so it's safe to eat. Exposed to the atmosphere, it has started " -"to go bad." +"The southwest beef & beans entree from an MRE. Sterilized using radiation, " +"so it's safe to eat. Exposed to the atmosphere, it has started to go bad." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -33851,7 +33849,7 @@ msgid_plural "misshapen fetuses" msgstr[0] "" msgstr[1] "" -#. ~ Description for misshapen fetus +#. ~ Description for {'str': 'misshapen fetus', 'str_pl': 'misshapen fetuses'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A deformed human fetus. Eating this would be the most vile thing you can " @@ -33946,7 +33944,7 @@ msgstr[1] "" #. ~ 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." +msgid "A handful of roasted nuts from a pistachio tree." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34210,7 +34208,7 @@ msgid_plural "foie gras" msgstr[0] "" msgstr[1] "" -#. ~ Description for foie gras +#. ~ Description for {'str': 'foie gras', 'str_pl': 'foie gras'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Thought it's not technically foie gras, you don't have to think about that." @@ -34222,7 +34220,7 @@ msgid_plural "liver & onions" msgstr[0] "" msgstr[1] "" -#. ~ Description for liver & onions +#. ~ Description for {'str': 'liver & onions', 'str_pl': 'liver & onions'} #: lang/json/COMESTIBLE_from_json.py msgid "A classic way to serve liver." msgstr "" @@ -34232,7 +34230,7 @@ msgid "fried liver" msgstr "" #. ~ Description for fried liver -#. ~ Description for deep fried tripe +#. ~ Description for deep-fried tripe #: lang/json/COMESTIBLE_from_json.py msgid "Nothing tastier than something that's deep-fried!" msgstr "" @@ -34260,7 +34258,7 @@ msgid "" msgstr "" #: lang/json/COMESTIBLE_from_json.py -msgid "deep fried tripe" +msgid "deep-fried tripe" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34269,7 +34267,7 @@ msgid_plural "leverpostej" msgstr[0] "" msgstr[1] "" -#. ~ Description for leverpostej +#. ~ Description for {'str': 'leverpostej', 'str_pl': 'leverpostej'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A traditional Danish pate. Probably better if you spread it on some bread." @@ -34281,7 +34279,7 @@ msgstr "" #. ~ Description for fried brain #: lang/json/COMESTIBLE_from_json.py -msgid "I don't know what you were expecting. It's deep fried." +msgid "I don't know what you were expecting. It's deep-fried." msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34308,7 +34306,7 @@ msgstr "" #. ~ Description for canned liver #: lang/json/COMESTIBLE_from_json.py -msgid "Livers preserved in a can. Chock full of B vitamins!" +msgid "Livers preserved in a can. Chock-full of B vitamins!" msgstr "" #: lang/json/COMESTIBLE_from_json.py @@ -34388,7 +34386,7 @@ msgid_plural "royal jellies" msgstr[0] "" msgstr[1] "" -#. ~ Description for royal jelly +#. ~ Description for {'str': 'royal jelly', 'str_pl': 'royal jellies'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A translucent hexagonal chunk of wax, filled with dense, milky jelly. " @@ -34402,7 +34400,7 @@ msgid_plural "marloss berries" msgstr[0] "" msgstr[1] "" -#. ~ Description for marloss berry +#. ~ Description for {'str': 'marloss berry', 'str_pl': 'marloss berries'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This looks like a blueberry the size of your fist, but pinkish in color. It " @@ -34426,11 +34424,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "mycus fruit" -msgid_plural "mycus fruits" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for mycus fruit +#. ~ Description for {'str': 'mycus fruit'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Humans might call this a Gray Delicious apple: large, gray, and smells even " @@ -34520,7 +34516,7 @@ msgid_plural "dried beans" msgstr[0] "" msgstr[1] "" -#. ~ Description for dried beans +#. ~ Description for {'str': 'dried beans', 'str_pl': 'dried beans'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dehydrated great northern beans. Tasty and nutritious when cooked, " @@ -34544,8 +34540,8 @@ msgid_plural "tofu" msgstr[0] "" msgstr[1] "" -#. ~ Description for tofu -#. ~ Description for fried tofu +#. ~ Description for {'str': 'tofu', 'str_pl': 'tofu'} +#. ~ Description for {'str': 'fried tofu', 'str_pl': 'fried tofu'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Tofu, a soy protein crucial to East Asian cuisine. It absorbs flavors very " @@ -34575,7 +34571,7 @@ msgid_plural "soybeans" msgstr[0] "" msgstr[1] "" -#. ~ Description for soybeans +#. ~ Description for {'str': 'soybeans', 'str_pl': 'soybeans'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Light brown beans, they have many uses, mildly toxic and not recommended, " @@ -34599,7 +34595,7 @@ msgid_plural "dried lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for dried lentils +#. ~ Description for {'str': 'dried lentils', 'str_pl': 'dried lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A humble but nutrient-rich legume. Should be cooked prior to consumption." @@ -34673,7 +34669,7 @@ msgid_plural "embalmed human brains" msgstr[0] "" msgstr[1] "" -#. ~ Description for embalmed human brain +#. ~ Description for {'str': 'embalmed human brain', 'str_pl': 'embalmed human brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a human brain soaked in a solution of highly toxic formaldehyde. " @@ -34712,7 +34708,7 @@ msgid_plural "dog food" msgstr[0] "" msgstr[1] "" -#. ~ Description for dog food +#. ~ Description for {'str': 'dog food', 'str_pl': 'dog food'} #: lang/json/COMESTIBLE_from_json.py msgid "This is food for dogs. It smells strange, but dogs seem to love it." msgstr "" @@ -34734,7 +34730,7 @@ msgid_plural "grasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for grass +#. ~ Description for {'str': 'grass', 'str_pl': 'grasses'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Some grass, edible by grazers and ruminants only. Seeing this item is a bug." @@ -34747,18 +34743,16 @@ msgid_plural "underbrushes" msgstr[0] "" msgstr[1] "" -#. ~ Description for underbrush +#. ~ Description for {'str': 'underbrush', 'str_pl': 'underbrushes'} #: lang/json/COMESTIBLE_from_json.py msgid "Some underbrush, edible by ruminants only. Seeing this item is a bug." msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "nectar" -msgid_plural "nectars" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for nectar +#. ~ Description for {'str': 'nectar'} #: lang/json/COMESTIBLE_from_json.py msgid "Some nectar. Seeing this item is a bug." msgstr "" @@ -35076,7 +35070,7 @@ msgid_plural "peaches" msgstr[0] "" msgstr[1] "" -#. ~ Description for peach +#. ~ Description for {'str': 'peach', 'str_pl': 'peaches'} #: lang/json/COMESTIBLE_from_json.py msgid "This fruit's large pit is surrounded by its tasty flesh." msgstr "" @@ -35238,7 +35232,7 @@ msgid_plural "spinach" msgstr[0] "" msgstr[1] "" -#. ~ Description for spinach +#. ~ Description for {'str': 'spinach', 'str_pl': 'spinach'} #: lang/json/COMESTIBLE_from_json.py msgid "A bunch of spinach leaves." msgstr "" @@ -35290,7 +35284,7 @@ msgid_plural "corn" msgstr[0] "" msgstr[1] "" -#. ~ Description for corn +#. ~ Description for {'str': 'corn', 'str_pl': 'corn'} #: lang/json/COMESTIBLE_from_json.py msgid "Delicious golden kernels." msgstr "" @@ -35364,11 +35358,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "wild root" -msgid_plural "wild roots" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for wild root +#. ~ Description for {'str': 'wild root'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A weed with a cluster of tiny white flowers. These are often wild carrots, " @@ -35401,7 +35393,7 @@ msgid_plural "hops flowers" msgstr[0] "" msgstr[1] "" -#. ~ Description for hops flower +#. ~ Description for {'str': 'hops flower', 'str_pl': 'hops flowers'} #: lang/json/COMESTIBLE_from_json.py msgid "A cluster of small cone-like flowers, indispensable for brewing beer." msgstr "" @@ -35452,7 +35444,7 @@ msgid_plural "raw potatoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw potato +#. ~ Description for {'str': 'raw potato', 'str_pl': 'raw potatoes'} #: lang/json/COMESTIBLE_from_json.py msgid "Mildly toxic and not very tasty raw. When cooked, it is delicious." msgstr "" @@ -35507,7 +35499,7 @@ msgid_plural "tea leaves" msgstr[0] "" msgstr[1] "" -#. ~ Description for tea leaf +#. ~ Description for {'str': 'tea leaf', 'str_pl': 'tea leaves'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dried leaves of a tropical plant. You can boil them into tea, or you can " @@ -35520,7 +35512,7 @@ msgid_plural "tomatoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for tomato +#. ~ Description for {'str': 'tomato', 'str_pl': 'tomatoes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Juicy red tomato. It gained popularity in Italy after being brought back " @@ -35553,7 +35545,7 @@ msgid_plural "wild vegetables" msgstr[0] "" msgstr[1] "" -#. ~ Description for wild vegetables +#. ~ Description for {'str': 'wild vegetables', 'str_pl': 'wild vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "" "An assortment of edible-looking wild plants. Most are quite bitter-" @@ -35584,7 +35576,7 @@ msgid_plural "raw beans" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw beans +#. ~ Description for {'str': 'raw beans', 'str_pl': 'raw beans'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Raw, uncooked beans. They are mildly toxic in this form, but you could cook " @@ -35597,7 +35589,7 @@ msgid_plural "raw lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw lentils +#. ~ Description for {'str': 'raw lentils', 'str_pl': 'raw lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Raw, uncooked lentils. They could be cooked." msgstr "" @@ -35621,7 +35613,7 @@ msgid_plural "grilled cheese sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Description for grilled cheese sandwich +#. ~ Description for {'str': 'grilled cheese sandwich', 'str_pl': 'grilled cheese sandwiches'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A delicious grilled cheese sandwich, because everything is better with " @@ -35634,14 +35626,14 @@ msgid_plural "deluxe sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for deluxe sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'deluxe sandwich', 'str_pl': 'deluxe sandwiches'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "\"deluxe\" sandwich" msgid_plural "\"deluxe\" sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Description for deluxe sandwich +#. ~ Description for {'str': 'deluxe sandwich', 'str_pl': 'deluxe sandwiches'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A sandwich of meat, vegetables, and cheese with condiments. Tasty and " @@ -35654,7 +35646,7 @@ msgid_plural "cucumber sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Description for cucumber sandwich +#. ~ Description for {'str': 'cucumber sandwich', 'str_pl': 'cucumber sandwiches'} #: lang/json/COMESTIBLE_from_json.py msgid "A refreshing cucumber sandwich. Not very filling, but quite tasty." msgstr "" @@ -35725,7 +35717,7 @@ msgid_plural "vegetable sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Description for vegetable sandwich +#. ~ Description for {'str': 'vegetable sandwich', 'str_pl': 'vegetable sandwiches'} #: lang/json/COMESTIBLE_from_json.py msgid "Bread and vegetables, that's it." msgstr "" @@ -35736,14 +35728,14 @@ msgid_plural "meat sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat sandwich when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'meat sandwich', 'str_pl': 'meat sandwiches'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "slob sandwich" msgid_plural "slob sandwiches" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for meat sandwich when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'meat sandwich', 'str_pl': 'meat sandwiches'} when COMPONENT_ID matches mutant #. ~ Conditional name for meat soup when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py #, python-format @@ -35752,7 +35744,7 @@ msgid_plural "mutant %s" msgstr[0] "" msgstr[1] "" -#. ~ Description for meat sandwich +#. ~ Description for {'str': 'meat sandwich', 'str_pl': 'meat sandwiches'} #: lang/json/COMESTIBLE_from_json.py msgid "Bread and meat, that's it." msgstr "" @@ -35865,7 +35857,7 @@ msgid_plural "hop rhizomes" msgstr[0] "" msgstr[1] "" -#. ~ Description for hop rhizomes +#. ~ Description for {'str': 'hop rhizomes', 'str_pl': 'hop rhizomes'} #: lang/json/COMESTIBLE_from_json.py msgid "Roots of a hop plant, for growing your own." msgstr "" @@ -35910,7 +35902,7 @@ msgid_plural "cranberry seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for cranberry seeds +#. ~ Description for {'str': 'cranberry seeds', 'str_pl': 'cranberry seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some cranberry seeds." msgstr "" @@ -35925,7 +35917,7 @@ msgid_plural "huckleberry seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for huckleberry seeds +#. ~ Description for {'str': 'huckleberry seeds', 'str_pl': 'huckleberry seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some huckleberry seeds." msgstr "" @@ -35940,7 +35932,7 @@ msgid_plural "mulberry seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for mulberry seeds +#. ~ Description for {'str': 'mulberry seeds', 'str_pl': 'mulberry seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some mulberry seeds." msgstr "" @@ -35955,7 +35947,7 @@ msgid_plural "elderberry seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for elderberry seeds +#. ~ Description for {'str': 'elderberry seeds', 'str_pl': 'elderberry seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some elderberry seeds." msgstr "" @@ -35970,7 +35962,7 @@ msgid_plural "raspberry seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for raspberry seeds +#. ~ Description for {'str': 'raspberry seeds', 'str_pl': 'raspberry seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some raspberry seeds." msgstr "" @@ -35985,7 +35977,7 @@ msgid_plural "strawberry seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for strawberry seeds +#. ~ Description for {'str': 'strawberry seeds', 'str_pl': 'strawberry seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some strawberry seeds." msgstr "" @@ -36000,7 +35992,7 @@ msgid_plural "grape seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for grape seeds +#. ~ Description for {'str': 'grape seeds', 'str_pl': 'grape seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some grape seeds." msgstr "" @@ -36015,7 +36007,7 @@ msgid_plural "rose seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for rose seeds +#. ~ Description for {'str': 'rose seeds', 'str_pl': 'rose seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some rose seeds." msgstr "" @@ -36032,7 +36024,7 @@ msgid_plural "tobacco seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for tobacco seeds +#. ~ Description for {'str': 'tobacco seeds', 'str_pl': 'tobacco seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some tobacco seeds." msgstr "" @@ -36058,7 +36050,7 @@ msgid_plural "sugar beet seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for sugar beet seeds +#. ~ Description for {'str': 'sugar beet seeds', 'str_pl': 'sugar beet seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some sugar beet seeds." msgstr "" @@ -36069,7 +36061,7 @@ msgid_plural "lettuce seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for lettuce seeds +#. ~ Description for {'str': 'lettuce seeds', 'str_pl': 'lettuce seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some lettuce seeds." msgstr "" @@ -36091,7 +36083,7 @@ msgid_plural "tomato seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for tomato seeds +#. ~ Description for {'str': 'tomato seeds', 'str_pl': 'tomato seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some tomato seeds." msgstr "" @@ -36102,7 +36094,7 @@ msgid_plural "cotton seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for cotton seeds +#. ~ Description for {'str': 'cotton seeds', 'str_pl': 'cotton seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some cotton seeds. Can be processed to produce an edible oil." msgstr "" @@ -36128,7 +36120,7 @@ msgid_plural "zucchini seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for zucchini seeds +#. ~ Description for {'str': 'zucchini seeds', 'str_pl': 'zucchini seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some zucchini seeds." msgstr "" @@ -36139,7 +36131,7 @@ msgid_plural "onion seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for onion seeds +#. ~ Description for {'str': 'onion seeds', 'str_pl': 'onion seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some onion seeds." msgstr "" @@ -36150,7 +36142,7 @@ msgid_plural "garlic seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for garlic seeds +#. ~ Description for {'str': 'garlic seeds', 'str_pl': 'garlic seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some garlic seeds." msgstr "" @@ -36180,7 +36172,7 @@ msgid_plural "dahlia seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for dahlia seeds +#. ~ Description for {'str': 'dahlia seeds', 'str_pl': 'dahlia seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some dahlia seeds." msgstr "" @@ -36198,7 +36190,7 @@ msgid_plural "salsify seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for salsify seeds +#. ~ Description for {'str': 'salsify seeds', 'str_pl': 'salsify seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some salsify seeds." msgstr "" @@ -36220,7 +36212,7 @@ msgid_plural "wild root seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for wild root seeds +#. ~ Description for {'str': 'wild root seeds', 'str_pl': 'wild root seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some seeds from a white flower." msgstr "" @@ -36231,7 +36223,7 @@ msgid_plural "decorative plant seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for decorative plant seeds +#. ~ Description for {'str': 'decorative plant seeds', 'str_pl': 'decorative plant seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Some small decorative plant seeds, likely grass or flower. Don't expect " @@ -36283,7 +36275,7 @@ msgid_plural "corn seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for corn seeds +#. ~ Description for {'str': 'corn seeds', 'str_pl': 'corn seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some corn seeds." msgstr "" @@ -36305,7 +36297,7 @@ msgid_plural "cucumber seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for cucumber seeds +#. ~ Description for {'str': 'cucumber seeds', 'str_pl': 'cucumber seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some cucumber seeds." msgstr "" @@ -36316,7 +36308,7 @@ msgid_plural "seed potatoes" msgstr[0] "" msgstr[1] "" -#. ~ Description for seed potato +#. ~ Description for {'str': 'seed potato', 'str_pl': 'seed potatoes'} #: lang/json/COMESTIBLE_from_json.py msgid "A raw potato, cut into pieces, separating each bud for planting." msgstr "" @@ -36375,7 +36367,7 @@ msgid_plural "soybean seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for soybean seeds +#. ~ Description for {'str': 'soybean seeds', 'str_pl': 'soybean seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some soybean seeds." msgstr "" @@ -36384,7 +36376,7 @@ msgstr "" msgid "soybean" msgstr "" -#. ~ Description for raw lentils +#. ~ Description for {'str': 'raw lentils', 'str_pl': 'raw lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Raw, uncooked lentils, ready for planting." msgstr "" @@ -36399,7 +36391,7 @@ msgid_plural "thyme seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for thyme seeds +#. ~ Description for {'str': 'thyme seeds', 'str_pl': 'thyme seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some thyme seeds." msgstr "" @@ -36425,7 +36417,7 @@ msgid_plural "pumpkin seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for pumpkin seeds +#. ~ Description for {'str': 'pumpkin seeds', 'str_pl': 'pumpkin seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some raw pumpkin seeds. Could be fried and eaten." msgstr "" @@ -36436,7 +36428,7 @@ msgid_plural "sunflower seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for sunflower seeds +#. ~ Description for {'str': 'sunflower seeds', 'str_pl': 'sunflower seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some raw sunflower seeds. Could be pressed into oil." msgstr "" @@ -36454,7 +36446,7 @@ msgid_plural "dogbane seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for dogbane seeds +#. ~ Description for {'str': 'dogbane seeds', 'str_pl': 'dogbane seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some dogbane seeds." msgstr "" @@ -36476,7 +36468,7 @@ msgid_plural "mugwort seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for mugwort seeds +#. ~ Description for {'str': 'mugwort seeds', 'str_pl': 'mugwort seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some mugwort seeds." msgstr "" @@ -36498,7 +36490,7 @@ msgid_plural "wild herb seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for wild herb seeds +#. ~ Description for {'str': 'wild herb seeds', 'str_pl': 'wild herb seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some seeds harvested from wild herbs." msgstr "" @@ -36513,7 +36505,7 @@ msgid_plural "wild vegetable stems" msgstr[0] "" msgstr[1] "" -#. ~ Description for wild vegetable stems +#. ~ Description for {'str': 'wild vegetable stems', 'str_pl': 'wild vegetable stems'} #: lang/json/COMESTIBLE_from_json.py msgid "Some wild vegetable stems." msgstr "" @@ -36528,7 +36520,7 @@ msgid_plural "dandelion seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for dandelion seeds +#. ~ Description for {'str': 'dandelion seeds', 'str_pl': 'dandelion seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some dandelion seeds." msgstr "" @@ -36543,7 +36535,7 @@ msgid_plural "rhubarb stems" msgstr[0] "" msgstr[1] "" -#. ~ Description for rhubarb stems +#. ~ Description for {'str': 'rhubarb stems', 'str_pl': 'rhubarb stems'} #: lang/json/COMESTIBLE_from_json.py msgid "Some rhubarb stems." msgstr "" @@ -36554,7 +36546,7 @@ msgid_plural "morel mushroom spores" msgstr[0] "" msgstr[1] "" -#. ~ Description for morel mushroom spores +#. ~ Description for {'str': 'morel mushroom spores', 'str_pl': 'morel mushroom spores'} #: lang/json/COMESTIBLE_from_json.py msgid "Some morel mushroom spores." msgstr "" @@ -36565,7 +36557,7 @@ msgid_plural "datura seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for datura seeds +#. ~ Description for {'str': 'datura seeds', 'str_pl': 'datura seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Small, dark seeds from the spiny pods of a datura plant. Full of powerful " @@ -36594,7 +36586,7 @@ msgid_plural "oat seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for oat seeds +#. ~ Description for {'str': 'oat seeds', 'str_pl': 'oat seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some oat seeds." msgstr "" @@ -36611,7 +36603,7 @@ msgid_plural "wheat seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for wheat seeds +#. ~ Description for {'str': 'wheat seeds', 'str_pl': 'wheat seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some wheat seeds." msgstr "" @@ -36628,7 +36620,7 @@ msgid_plural "fried seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for fried seeds +#. ~ Description for {'str': 'fried seeds', 'str_pl': 'fried seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Some fried seeds of a sunflower, pumpkin or other plant. Quite nutritious " @@ -36665,7 +36657,7 @@ msgid_plural "roasted coffee beans" msgstr[0] "" msgstr[1] "" -#. ~ Description for roasted coffee beans +#. ~ Description for {'str': 'roasted coffee beans', 'str_pl': 'roasted coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some roasted coffee beans, can be ground into powder." msgstr "" @@ -36923,7 +36915,7 @@ msgid_plural "sugar" msgstr[0] "" msgstr[1] "" -#. ~ Description for sugar +#. ~ Description for {'str': 'sugar', 'str_pl': 'sugar'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Sweet, sweet sugar. Bad for your teeth and surprisingly not very tasty on " @@ -36936,7 +36928,7 @@ msgid_plural "sprinkles" msgstr[0] "" msgstr[1] "" -#. ~ Description for sprinkles +#. ~ Description for {'str': 'sprinkles', 'str_pl': 'sprinkles'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Known as nonpareils, sprinkles, jimmies, sugar strands or 'hundreds-and-" @@ -36951,7 +36943,7 @@ msgid_plural "wild herbs" msgstr[0] "" msgstr[1] "" -#. ~ Description for wild herbs +#. ~ Description for {'str': 'wild herbs', 'str_pl': 'wild herbs'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A tasty collection of wild herbs including violet, sassafras, mint, clover, " @@ -36991,7 +36983,7 @@ msgid_plural "starch" msgstr[0] "" msgstr[1] "" -#. ~ Description for starch +#. ~ Description for {'str': 'starch', 'str_pl': 'starch'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Sticky, gooey carbohydrate paste extracted from plants. Spoils rather " @@ -37015,10 +37007,10 @@ msgid_plural "fried dandelions" msgstr[0] "" msgstr[1] "" -#. ~ Description for fried dandelions +#. ~ Description for {'str': 'fried dandelions', 'str_pl': 'fried dandelions'} #: lang/json/COMESTIBLE_from_json.py msgid "" -"Wild dandelion flowers that have been battered and deep fried. Very tasty " +"Wild dandelion flowers that have been battered and deep-fried. Very tasty " "and nutritious." msgstr "" @@ -37064,7 +37056,7 @@ msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." msgstr "" -#. ~ Description for corn +#. ~ Description for {'str': 'corn', 'str_pl': 'corn'} #: lang/json/COMESTIBLE_from_json.py msgid "Canned corn in water. Eat up!" msgstr "" @@ -37086,7 +37078,7 @@ msgid_plural "vegetarian baked beans" msgstr[0] "" msgstr[1] "" -#. ~ Description for vegetarian baked beans +#. ~ Description for {'str': 'vegetarian baked beans', 'str_pl': 'vegetarian baked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Slow-cooked beans with vegetables. Tasty and very filling." msgstr "" @@ -37097,7 +37089,7 @@ msgid_plural "dried rice" msgstr[0] "" msgstr[1] "" -#. ~ Description for dried rice +#. ~ Description for {'str': 'dried rice', 'str_pl': 'dried rice'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Dehydrated long-grain rice. Tasty and nutritious when cooked, virtually " @@ -37121,7 +37113,7 @@ msgid_plural "fried rice" msgstr[0] "" msgstr[1] "" -#. ~ Description for fried rice +#. ~ Description for {'str': 'fried rice', 'str_pl': 'fried rice'} #: lang/json/COMESTIBLE_from_json.py msgid "Delicious fried rice with vegetables. Tasty and very filling." msgstr "" @@ -37145,7 +37137,7 @@ msgid_plural "tofu fried rice" msgstr[0] "" msgstr[1] "" -#. ~ Description for tofu fried rice +#. ~ Description for {'str': 'tofu fried rice', 'str_pl': 'tofu fried rice'} #: lang/json/COMESTIBLE_from_json.py msgid "Delicious tofu fried rice with vegetables. Tasty and very filling." msgstr "" @@ -37156,7 +37148,7 @@ msgid_plural "tofu stirfry" msgstr[0] "" msgstr[1] "" -#. ~ Description for tofu stirfry +#. ~ Description for {'str': 'tofu stirfry', 'str_pl': 'tofu stirfry'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A tofu stirfry with rice and a sweet bold flavor sure to be on your mind " @@ -37169,7 +37161,7 @@ msgid_plural "deluxe vegetarian beans and rice" msgstr[0] "" msgstr[1] "" -#. ~ Description for deluxe vegetarian beans and rice +#. ~ Description for {'str': 'deluxe vegetarian beans and rice', 'str_pl': 'deluxe vegetarian beans and rice'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Slow-cooked beans and rice with vegetables and seasonings. Tasty and very " @@ -37256,7 +37248,7 @@ msgid_plural "spaghetti al pesto" msgstr[0] "" msgstr[1] "" -#. ~ Description for spaghetti al pesto +#. ~ Description for {'str': 'spaghetti al pesto', 'str_pl': 'spaghetti al pesto'} #: lang/json/COMESTIBLE_from_json.py msgid "Spaghetti, with a generous helping of pesto on top. Yum!" msgstr "" @@ -37277,7 +37269,7 @@ msgid_plural "sauerkraut w/ sautee'd onions" msgstr[0] "" msgstr[1] "" -#. ~ Description for sauerkraut w/ sautee'd onions +#. ~ Description for {'str': "sauerkraut w/ sautee'd onions", 'str_pl': "sauerkraut w/ sautee'd onions"} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a delicious sautee of lovely diced onions and sauerkraut. The smell " @@ -37290,7 +37282,7 @@ msgid_plural "pickled veggies" msgstr[0] "" msgstr[1] "" -#. ~ Description for pickled veggy +#. ~ Description for {'str': 'pickled veggy', 'str_pl': 'pickled veggies'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is a serving of crisply brined and canned vegetable matter. Tasty and " @@ -37458,7 +37450,7 @@ msgid_plural "sauteed fiddleheads" msgstr[0] "" msgstr[1] "" -#. ~ Description for sauteed fiddleheads +#. ~ Description for {'str': 'sauteed fiddleheads', 'str_pl': 'sauteed fiddleheads'} #: lang/json/COMESTIBLE_from_json.py msgid "Fiddleheads sauteed in fat. Tender and delicious." msgstr "" @@ -37474,7 +37466,7 @@ msgid "" "your heart." msgstr "" -#. ~ Description for wheat +#. ~ Description for {'str': 'wheat', 'str_pl': 'wheat'} #: lang/json/COMESTIBLE_from_json.py msgid "Raw wheat, not very tasty." msgstr "" @@ -37485,7 +37477,7 @@ msgid_plural "raw spaghetti pasta" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw spaghetti pasta +#. ~ Description for {'str': 'raw spaghetti pasta', 'str_pl': 'raw spaghetti pasta'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A type of pasta usually used when preparing spaghetti. It could be eaten " @@ -37498,7 +37490,7 @@ msgid_plural "raw lasagne pasta" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw lasagne pasta +#. ~ Description for {'str': 'raw lasagne pasta', 'str_pl': '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 " @@ -37522,7 +37514,7 @@ msgid_plural "raw macaroni" msgstr[0] "" msgstr[1] "" -#. ~ Description for raw macaroni +#. ~ Description for {'str': 'raw macaroni', 'str_pl': 'raw macaroni'} #: lang/json/COMESTIBLE_from_json.py msgid "It could be eaten raw if you're desperate, but is much better cooked." msgstr "" @@ -37533,7 +37525,7 @@ msgid_plural "mac & cheese" msgstr[0] "" msgstr[1] "" -#. ~ Description for mac & cheese +#. ~ Description for {'str': 'mac & cheese', 'str_pl': 'mac & cheese'} #: lang/json/COMESTIBLE_from_json.py msgid "When the cheese starts flowing, Kraft gets your noodle going." msgstr "" @@ -37544,7 +37536,7 @@ msgid_plural "flour" msgstr[0] "" msgstr[1] "" -#. ~ Description for flour +#. ~ Description for {'str': 'flour', 'str_pl': 'flour'} #: lang/json/COMESTIBLE_from_json.py msgid "This enriched white flour is useful for baking." msgstr "" @@ -37562,7 +37554,7 @@ msgid "" "doubles as food for horses while dry." msgstr "" -#. ~ Description for oats +#. ~ Description for {'str': 'oats', 'str_pl': 'oats'} #: lang/json/COMESTIBLE_from_json.py msgid "Raw oats." msgstr "" @@ -37586,7 +37578,7 @@ msgid_plural "deluxe cooked oatmeal" msgstr[0] "" msgstr[1] "" -#. ~ Description for deluxe cooked oatmeal +#. ~ Description for {'str': 'deluxe cooked oatmeal', 'str_pl': 'deluxe cooked oatmeal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A filling and nutritious New England classic that has been improved with the " @@ -37595,22 +37587,18 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "pancake" -msgid_plural "pancakes" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for pancake +#. ~ Description for {'str': 'pancake'} #: lang/json/COMESTIBLE_from_json.py msgid "Fluffy and delicious pancakes with real maple syrup." msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "fruit pancake" -msgid_plural "fruit pancakes" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for fruit pancake +#. ~ Description for {'str': 'fruit pancake'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, made sweeter and " @@ -37707,7 +37695,7 @@ msgid_plural "fast noodles" msgstr[0] "" msgstr[1] "" -#. ~ Description for fast noodles +#. ~ Description for {'str': 'fast noodles', 'str_pl': 'fast noodles'} #: lang/json/COMESTIBLE_from_json.py msgid "So-called ramen noodles. Can be eaten raw." msgstr "" @@ -39722,12 +39710,12 @@ msgid "" msgstr "" #: lang/json/CONTAINER_from_json.py -msgid "opened large tin can" -msgid_plural "opened large tin cans" +msgid "large opened tin can" +msgid_plural "large opened tin cans" msgstr[0] "" msgstr[1] "" -#. ~ Description for opened large tin can +#. ~ Description for large opened tin can #: lang/json/CONTAINER_from_json.py msgid "" "A large tin can, like what beans come in. This one is opened and can't be " @@ -40125,7 +40113,7 @@ msgstr[1] "" #. ~ Description for medium steam engine #: lang/json/ENGINE_from_json.py msgid "" -"A medium sized steam engine. An integrated boiler burns coal to heat water " +"A medium-sized steam engine. An integrated boiler burns coal to heat water " "into steam, driving a reciprocating shaft. A condenser recaptures the " "water, making this a closed cycle system." msgstr "" @@ -40368,7 +40356,7 @@ msgstr[1] "" #. ~ 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." +msgid "A handful of hard nuts from an almond tree, still in their shell." msgstr "" #: lang/json/GENERIC_from_json.py @@ -40765,7 +40753,7 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "Glue made from boiling animal bones. The adhesive isn't strong enough for " -"heavy duty usages, but it can be used as a varnish or holding together small " +"heavy-duty usages, but it can be used as a varnish or holding together small " "items." msgstr "" @@ -41799,15 +41787,15 @@ msgid "" msgstr "" #: lang/json/GENERIC_from_json.py -msgid "fish bowl" -msgid_plural "fish bowls" +msgid "fishbowl" +msgid_plural "fishbowls" msgstr[0] "" msgstr[1] "" -#. ~ Description for {'str': 'fish bowl'} +#. ~ Description for {'str': 'fishbowl'} #: lang/json/GENERIC_from_json.py msgid "" -"A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " +"A filled fishbowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " "fish appears to have tiny antlers." msgstr "" @@ -42493,7 +42481,7 @@ msgstr "" #. ~ Description for teddy bear #: lang/json/GENERIC_from_json.py msgid "" -"A mass produced plush teddy bear. It is wearing a little red tshirt but no " +"A mass-produced plush teddy bear. It is wearing a little red tshirt but no " "pants." msgstr "" @@ -42512,8 +42500,8 @@ msgstr "" #. ~ Use action menu_text for cigarette. #. ~ Use action menu_text for joint. #. ~ Use action menu_text for {'str': "spooky jack o'lantern", 'str_pl': "jack o'lanterns"}. -#. ~ Use action menu_text for hobo stove (lit). -#. ~ Use action menu_text for Louisville Slaughterer. +#. ~ Use action menu_text for {'str': 'hobo stove (lit)', 'str_pl': 'hobo stoves (lit)'}. +#. ~ Use action menu_text for {'str': 'Louisville Slaughterer'}. #. ~ Use action menu_text for {'str': 'refillable lighter', 'str_pl': 'refillable lighters'}. #. ~ Use action menu_text for {'str': 'ember carrier (lit)', 'str_pl': 'ember carriers (lit)'}. #. ~ Use action menu_text for {'str': 'candle', 'str_pl': 'candles'}. @@ -43435,6 +43423,7 @@ msgid_plural "tripod chassis" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'tripod chassis', 'str_pl': 'tripod chassis'} #. ~ Description for tripod chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -43448,6 +43437,7 @@ msgid_plural "chicken walker chassis" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'chicken walker chassis', 'str_pl': 'chicken walker chassis'} #. ~ Description for chicken walker chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -43461,6 +43451,7 @@ msgid_plural "Beagle chassis" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'Beagle chassis', 'str_pl': 'Beagle chassis'} #. ~ Description for Beagle chassis #: lang/json/GENERIC_from_json.py msgid "" @@ -43474,6 +43465,7 @@ msgid_plural "sets of spidery legs" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'set of spidery legs', 'str_pl': 'sets of spidery legs'} #. ~ Description for set of spidery legs #: lang/json/GENERIC_from_json.py msgid "A set of big pointy legs, like the ones found under a tripod." @@ -43524,7 +43516,7 @@ msgstr[1] "" #. ~ Description for targeting module #: lang/json/GENERIC_from_json.py msgid "" -"This module integrate visual and proprioceptive information from peripheric " +"This module integrates visual and proprioceptive information from peripheric " "sensors and outputs information necessary for accurate aiming." msgstr "" @@ -43587,7 +43579,7 @@ msgstr[1] "" #. ~ Description for {'str': 'self monitoring sensors', 'str_pl': 'self monitoring sensors'} #: lang/json/GENERIC_from_json.py msgid "" -"A array of sensors and diagnostic modules allowing the robot to perceive " +"An array of sensors and diagnostic modules allowing the robot to perceive " "itself." msgstr "" @@ -43600,7 +43592,7 @@ msgstr[1] "" #. ~ Description for {'str': 'AI core'} #: lang/json/GENERIC_from_json.py msgid "" -"This module is responsible for decision making, it basically runs the AI of " +"This module is responsible for decision-making, it basically runs the AI of " "the robot." msgstr "" @@ -45300,6 +45292,17 @@ msgstr[1] "" msgid "An empty casing from a .22 LR round. These can't be hand-reloaded." msgstr "" +#: lang/json/GENERIC_from_json.py +msgid "unused .22 casing" +msgid_plural "unused .22 casings" +msgstr[0] "" +msgstr[1] "" + +#. ~ Description for {'str': 'unused .22 casing'} +#: lang/json/GENERIC_from_json.py +msgid "An unfired, like-new .22 round casing, with the primer still intact." +msgstr "" + #: lang/json/GENERIC_from_json.py msgid ".30-06 casing" msgid_plural ".30-06 casings" @@ -46137,7 +46140,7 @@ 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 "" @@ -46767,7 +46770,7 @@ msgstr[1] "" #. ~ Description for high-pressure pump #: lang/json/GENERIC_from_json.py msgid "" -"An complex mechanical pump capable of achieving high pressures. Far beyond " +"A complex mechanical pump capable of achieving high pressures. Far beyond " "anything you could reasonably improvise." msgstr "" @@ -46780,7 +46783,7 @@ msgstr[1] "" #. ~ Description for mechanical pump #: lang/json/GENERIC_from_json.py msgid "" -"An simple cast iron mechanical impeller pump. It's not good for much of " +"A simple cast iron mechanical impeller pump. It's not good for much of " "anything on its own." msgstr "" @@ -47166,7 +47169,7 @@ msgstr "" #. ~ Description for bokken #: lang/json/GENERIC_from_json.py msgid "" -"This is a solid wood 'training' katana, but it looks to be mass produced, " +"This is a solid wood 'training' katana, but it looks to be mass-produced, " "and not quite as effective as the real deal." msgstr "" @@ -47369,7 +47372,7 @@ msgstr[1] "" #. ~ Description for lucerne hammer #: lang/json/GENERIC_from_json.py msgid "" -"This is a versatile polearm with an spiked hammer head, a spike, and a hook " +"This is a versatile polearm with a spiked hammer head, a spike, and a hook " "attached to a long stick." msgstr "" @@ -48258,7 +48261,7 @@ msgstr[1] "" #. ~ Description for sword cane #: lang/json/GENERIC_from_json.py -msgid "A sword with a thin blade designed to be hidden inside an hollow cane." +msgid "A sword with a thin blade designed to be hidden inside a hollow cane." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/TOOL_from_json.py @@ -48472,7 +48475,7 @@ msgstr[1] "" #. ~ Description for punch dagger #: lang/json/GENERIC_from_json.py msgid "" -"A short and sharp double edged dagger made to be gripped in the palm, with " +"A short and sharp double-edged dagger made to be gripped in the palm, with " "the blade protruding between the fingers." msgstr "" @@ -48735,7 +48738,7 @@ msgstr[1] "" #. ~ Description for fungal fighter sting #: lang/json/GENERIC_from_json.py -msgid "A short dart from a fungal fighter. Makes an poor melee weapon." +msgid "A short dart from a fungal fighter. Makes a poor melee weapon." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -48814,7 +48817,7 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "" "A collapsible buttstock designed for the M320 grenade launcher. When " -"combined with this stock, the M320 can be used as a stand alone weapon" +"combined with this stock, the M320 can be used as a standalone weapon" msgstr "" #: lang/json/GENERIC_from_json.py @@ -49723,7 +49726,7 @@ msgstr[1] "" #. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" -"A RC car, with radio-control and batteries included! Disassemble to unpack " +"An RC car, with radio-control and batteries included! Disassemble to unpack " "and enjoy." msgstr "" @@ -49941,7 +49944,7 @@ msgstr[1] "" #. ~ Description for razor blade #: lang/json/GENERIC_from_json.py -msgid "A double edged razor blade." +msgid "A double-edged razor blade." msgstr "" #: lang/json/GENERIC_from_json.py @@ -57328,7 +57331,7 @@ msgstr "" msgid "MUTAGENS" msgstr "" -#: lang/json/ITEM_CATEGORY_from_json.py src/player_display.cpp +#: lang/json/ITEM_CATEGORY_from_json.py src/cata_string_consts.h msgid "BIONICS" msgstr "" @@ -57933,7 +57936,7 @@ msgid_plural "H&K G80 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for H&K G80 magazine +#. ~ Description for {'str': 'H&K G80 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A magazine for H&K G80 railgun which can hold up to 20 ferromagnetic " @@ -57981,7 +57984,7 @@ msgid_plural ".22 8-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .22 8-round speedloader +#. ~ Description for {'str': '.22 8-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 8 rounds of .22 and quickly reload a compatible " @@ -58016,7 +58019,7 @@ msgid_plural "A-180 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for A-180 magazine +#. ~ Description for {'str': 'A-180 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "An unusually shaped pan magazine for the American-180." msgstr "" @@ -58027,7 +58030,7 @@ msgid_plural ".22 19-round tube loaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .22 19-round tube loader +#. ~ Description for {'str': '.22 19-round tube loader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This is a tube which holds 19 rounds of .22, designed for quick reloading of " @@ -58086,7 +58089,7 @@ msgid_plural "Jennings J-22 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Jennings J-22 magazine +#. ~ Description for {'str': 'Jennings J-22 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A cheap 6-round steel box magazine for the Jennings J-22." msgstr "" @@ -58108,7 +58111,7 @@ msgid_plural "LW-5 speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for LW-5 speedloader +#. ~ Description for {'str': 'LW-5 speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader, made by Leadworks for use with L2037 Backup revolver, can " @@ -58127,7 +58130,7 @@ msgid_plural "LW-56 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for LW-56 magazine +#. ~ Description for {'str': 'LW-56 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 56-round polymer magazine for Leadworks LLC 223 firearms. It's compact " @@ -58141,7 +58144,7 @@ msgid_plural "LW-32 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for LW-32 magazine +#. ~ Description for {'str': 'LW-32 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 32-round polymer magazine for Leadworks LLC 223 firearms. Lightweight and " @@ -58250,9 +58253,9 @@ msgid_plural ".30-06 clips" msgstr[0] "" msgstr[1] "" -#. ~ Description for .30-06 clip -#. ~ Description for 7.62x39mm clip -#. ~ Description for 7.62x54mmR clip +#. ~ Description for {'str': '.30-06 clip'} +#. ~ Description for {'str': '7.62x39mm clip'} +#. ~ Description for {'str': '7.62x54mmR clip'} #: lang/json/MAGAZINE_from_json.py msgid "" "A tiny piece of grooved metal designed to allow a shooter to quickly load a " @@ -58265,7 +58268,7 @@ msgid_plural "Browning BLR magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Browning BLR magazine +#. ~ Description for {'str': 'Browning BLR magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A compact 4-round box magazine for the Browning BLR." msgstr "" @@ -58276,7 +58279,7 @@ msgid_plural "M1 Garand clips" msgstr[0] "" msgstr[1] "" -#. ~ Description for M1 Garand clip +#. ~ Description for {'str': 'M1 Garand clip'} #: lang/json/MAGAZINE_from_json.py msgid "" "A light-weight en-bloc clip for use with the M1 Garand that will be ejected " @@ -58289,7 +58292,7 @@ msgid_plural "BAR extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for BAR extended magazine +#. ~ Description for {'str': 'BAR extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An aftermarket magazine for use with the Browning Automatic Rifle, holds 30 " @@ -58302,7 +58305,7 @@ msgid_plural "BAR magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for BAR magazine +#. ~ Description for {'str': 'BAR magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A standard capacity magazine for use with the Browning Automatic Rifle, " @@ -58321,7 +58324,7 @@ msgid_plural "FN FAL extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN FAL extended magazine +#. ~ Description for {'str': 'FN FAL extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "An extended 30-round steel box magazine for the FN FAL rifle." msgstr "" @@ -58332,7 +58335,7 @@ msgid_plural "FN FAL magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN FAL magazine +#. ~ Description for {'str': 'FN FAL magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A military issue 20-round steel box magazine for the FN FAL rifle." msgstr "" @@ -58343,7 +58346,7 @@ msgid_plural "FN FAL makeshift magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN FAL makeshift magazine +#. ~ Description for {'str': 'FN FAL makeshift magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An improvised 5-round straight single-stack box magazine consisting of " @@ -58357,7 +58360,7 @@ msgid_plural "H&K G3 drum magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for H&K G3 drum magazine +#. ~ Description for {'str': 'H&K G3 drum magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 50-round drum magazine for the H&K G3 rifle." msgstr "" @@ -58368,7 +58371,7 @@ msgid_plural "H&K G3 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for H&K G3 magazine +#. ~ Description for {'str': 'H&K G3 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A lightweight aluminum box magazine for the H&K G3 rifle." msgstr "" @@ -58379,7 +58382,7 @@ msgid_plural "H&K G3 makeshift magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for H&K G3 makeshift magazine +#. ~ Description for {'str': 'H&K G3 makeshift magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An improvised 5-round straight single-stack box magazine consisting of " @@ -58393,7 +58396,7 @@ msgid_plural "M14 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for M14 magazine +#. ~ Description for {'str': 'M14 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A military issue 20-round steel box magazine compatible with M14 pattern " @@ -58406,12 +58409,12 @@ msgid_plural "M14 compact magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for M14 compact magazine +#. ~ Description for {'str': 'M14 compact magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" -"An compact aftermarket 5-round steel box magazine compatible with M14 " -"pattern rifles. Although it has a low capacity it is easy to store and " -"quick to reload." +"A compact aftermarket 5-round steel box magazine compatible with M14 pattern " +"rifles. Although it has a low capacity it is easy to store and quick to " +"reload." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -58420,7 +58423,7 @@ msgid_plural "M14 makeshift magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for M14 makeshift magazine +#. ~ Description for {'str': 'M14 makeshift magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An improvised 5-round straight single-stack box magazine consisting of " @@ -58434,7 +58437,7 @@ msgid_plural "FN SCAR-H drum magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN SCAR-H drum magazine +#. ~ Description for {'str': 'FN SCAR-H drum magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 50-round drum magazine for the FN SCAR-H rifle." msgstr "" @@ -58445,7 +58448,7 @@ msgid_plural "FN SCAR-H 30-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN SCAR-H 30-round magazine +#. ~ Description for {'str': 'FN SCAR-H 30-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 30-round steel box magazine for the FN SCAR-H rifle. This one actually " @@ -58458,7 +58461,7 @@ msgid_plural "FN SCAR-H magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN SCAR-H magazine +#. ~ Description for {'str': 'FN SCAR-H magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A military issue 20-round steel box magazine for the FN SCAR-H rifle." msgstr "" @@ -58469,7 +58472,7 @@ msgid_plural "FN SCAR-H makeshift magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN SCAR-H makeshift magazine +#. ~ Description for {'str': 'FN SCAR-H makeshift magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An improvised 5-round straight single-stack box magazine consisting of " @@ -58483,7 +58486,7 @@ msgid_plural "HK417 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for HK417 magazine +#. ~ Description for {'str': 'HK417 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 20 round double stack box magazine for the HK417 rifle." msgstr "" @@ -58494,7 +58497,7 @@ msgid_plural "HK417 compact magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for HK417 compact magazine +#. ~ Description for {'str': 'HK417 compact magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 10 round double stack box magazine for the HK417 rifle." msgstr "" @@ -58505,7 +58508,7 @@ msgid_plural "HK417 makeshift magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for HK417 makeshift magazine +#. ~ Description for {'str': 'HK417 makeshift magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An improvised 5-round straight single-stack box magazine consisting of " @@ -58519,7 +58522,7 @@ msgid_plural "AR-10 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AR-10 magazine +#. ~ Description for {'str': 'AR-10 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 20 round double stack box magazine for the AR-10 rifle." msgstr "" @@ -58530,7 +58533,7 @@ msgid_plural "AR-10 makeshift magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AR-10 makeshift magazine +#. ~ Description for {'str': 'AR-10 makeshift magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An improvised 5-round straight single-stack box magazine consisting of " @@ -58577,7 +58580,7 @@ msgid_plural "Kel-Tec P32 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Kel-Tec P32 magazine +#. ~ Description for {'str': 'Kel-Tec P32 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A standard 7-round steel box magazine for the Kel-Tec P32." msgstr "" @@ -58612,7 +58615,7 @@ msgid_plural ".38/.357 7-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .38/.357 7-round speedloader +#. ~ Description for {'str': '.38/.357 7-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 7 rounds of .357 Magnum or .38 Special and quickly " @@ -58625,7 +58628,7 @@ msgid_plural ".38/.357 5-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .38/.357 5-round speedloader +#. ~ Description for {'str': '.38/.357 5-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 5 rounds of .357 Magnum or .38 Special and quickly " @@ -58638,7 +58641,7 @@ msgid_plural ".38/.357 6-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .38/.357 6-round speedloader +#. ~ Description for {'str': '.38/.357 6-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 6 rounds of .357 Magnum or .38 Special and quickly " @@ -58651,7 +58654,7 @@ msgid_plural "Kel-Tec P3AT magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Kel-Tec P3AT magazine +#. ~ Description for {'str': 'Kel-Tec P3AT magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A standard 6-round steel box magazine for the Kel-Tec P3AT." msgstr "" @@ -58662,7 +58665,7 @@ msgid_plural "FN 1910 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN 1910 magazine +#. ~ Description for {'str': 'FN 1910 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A standard 6-round steel box magazine for the FN 1910. It looks a bit old." @@ -58696,7 +58699,7 @@ msgid_plural "CF-380 8-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for CF-380 8-round magazine +#. ~ Description for {'str': 'CF-380 8-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "An 8-round steel box magazine for use with the Hi-Point CF-380." msgstr "" @@ -58707,7 +58710,7 @@ msgid_plural "CF-380 10-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for CF-380 10-round magazine +#. ~ Description for {'str': 'CF-380 10-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 10-round steel box magazine for use with the Hi-Point CF-380." msgstr "" @@ -58729,7 +58732,7 @@ msgid_plural "AF2011A1 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AF2011A1 magazine +#. ~ Description for {'str': 'AF2011A1 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "Two .38 Super 8-round box magazines attached to a single base plate, holding " @@ -58742,7 +58745,7 @@ msgid_plural "M1911 .38 Super magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for M1911 .38 Super magazine +#. ~ Description for {'str': 'M1911 .38 Super magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A compact single stack box magazine for the M1911." msgstr "" @@ -58753,7 +58756,7 @@ msgid_plural ".40 6-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .40 6-round speedloader +#. ~ Description for {'str': '.40 6-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 6 rounds of .40 S&W or 10mm Auto and quickly " @@ -58766,7 +58769,7 @@ msgid_plural "Glock 22 extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock 22 extended magazine +#. ~ Description for {'str': 'Glock 22 extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An extended 22-round magazine for use with Glock pistols chambered for .40 " @@ -58779,7 +58782,7 @@ msgid_plural "Glock 22 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock 22 magazine +#. ~ Description for {'str': 'Glock 22 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A compact light-weight polymer magazine for use with Glock pistols chambered " @@ -58817,7 +58820,7 @@ msgid_plural "Hi-Power .40 S&W magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Hi-Power .40 S&W magazine +#. ~ Description for {'str': 'Hi-Power .40 S&W magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 10 round steel box magazine for the Browning Hi-Power .40 S&W." msgstr "" @@ -58911,7 +58914,7 @@ msgid_plural ".44 6-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .44 6-round speedloader +#. ~ Description for {'str': '.44 6-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 6 rounds of .44 and quickly reload a compatible " @@ -58924,7 +58927,7 @@ msgid_plural "Desert Eagle magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Desert Eagle magazine +#. ~ Description for {'str': 'Desert Eagle magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A standard 7-round steel box magazine for use with the IMI Desert Eagle." @@ -58936,7 +58939,7 @@ msgid_plural "M1911 extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for M1911 extended magazine +#. ~ Description for {'str': 'M1911 extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "An extended 10-round magazine for use with the M1911 handgun." msgstr "" @@ -58947,7 +58950,7 @@ msgid_plural "M1911 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for M1911 magazine +#. ~ Description for {'str': 'M1911 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A military issue 7-round magazine for use with the M1911 handgun." msgstr "" @@ -59102,7 +59105,7 @@ msgid_plural ".454 5-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .454 5-round speedloader +#. ~ Description for {'str': '.454 5-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 5 rounds of .454, .45 Colt or .410 bore and " @@ -59115,7 +59118,7 @@ msgid_plural "H&K 4.6mm extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for H&K 4.6mm extended magazine +#. ~ Description for {'str': 'H&K 4.6mm extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An extended 40-round magazine for use with H&K's proprietary 4.6x30mm round." @@ -59127,7 +59130,7 @@ msgid_plural "H&K 4.6mm magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for H&K 4.6mm magazine +#. ~ Description for {'str': 'H&K 4.6mm magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A standard capacity 20-round magazine for use with H&K's proprietary " @@ -59140,7 +59143,7 @@ msgid_plural ".460 6-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .460 6-round speedloader +#. ~ Description for {'str': '.460 6-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader, made by Leadworks for use with L2031 Enforcer revolver, " @@ -59153,7 +59156,7 @@ msgid_plural "LW-12 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for LW-12 magazine +#. ~ Description for {'str': 'LW-12 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 12-round polymer magazine for use with the Leadworks LLC L39-460 and " @@ -59172,7 +59175,7 @@ msgid_plural "Barrett magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Barrett magazine +#. ~ Description for {'str': 'Barrett magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "Standard 10-round box magazine for a Barrett M107A1 anti-materiel rifle." @@ -59184,7 +59187,7 @@ msgid_plural "AS50 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AS50 magazine +#. ~ Description for {'str': 'AS50 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "10-round box magazine for Accuracy International AS50." msgstr "" @@ -59206,7 +59209,7 @@ msgid_plural ".500 5-round speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for .500 5-round speedloader +#. ~ Description for {'str': '.500 5-round speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader can hold 5 rounds of .500 and quickly reload a compatible " @@ -59219,7 +59222,7 @@ msgid_plural "AK-74M magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AK-74M magazine +#. ~ Description for {'str': 'AK-74M magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A standard magazine made for the AK-74M rifle, made of steel-reinforced " @@ -59232,7 +59235,7 @@ msgid_plural "AK-74M extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AK-74M extended magazine +#. ~ Description for {'str': 'AK-74M extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 45-round magazine compatible with the AK-74M rifle, though originally " @@ -59245,7 +59248,7 @@ msgid_plural "FN-57 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN-57 magazine +#. ~ Description for {'str': 'FN-57 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A standard capacity magazine for use with the FN Five-Seven." msgstr "" @@ -59256,7 +59259,7 @@ msgid_plural "FN-P90 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for FN-P90 magazine +#. ~ Description for {'str': 'FN-P90 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A factory issue translucent polymer box magazine that fits with the frame of " @@ -59309,7 +59312,7 @@ msgid_plural "AKM extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AKM extended magazine +#. ~ Description for {'str': 'AKM extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 40-round, 7.62x39mm magazine initially designed for the RPK but compatible " @@ -59322,7 +59325,7 @@ msgid_plural "AKM magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for AKM magazine +#. ~ Description for {'str': 'AKM magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A standard 30-round magazine made for the AKM rifle, made of stamped sheet " @@ -59457,7 +59460,7 @@ msgid_plural "LW-7 speedloaders" msgstr[0] "" msgstr[1] "" -#. ~ Description for LW-7 speedloader +#. ~ Description for {'str': 'LW-7 speedloader'} #: lang/json/MAGAZINE_from_json.py msgid "" "This speedloader, made by Leadworks for use with L2032 Lookout revolver, can " @@ -59470,7 +59473,7 @@ msgid_plural "Calico magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Calico magazine +#. ~ Description for {'str': 'Calico magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A surprisingly compact 50-round helical magazine for use with the Calico " @@ -59483,7 +59486,7 @@ msgid_plural "Glock extended magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock extended magazine +#. ~ Description for {'str': 'Glock extended magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "An extended 30-round polymer magazine for use with Glock compatible firearms." @@ -59495,7 +59498,7 @@ msgid_plural "Glock magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock magazine +#. ~ Description for {'str': 'Glock magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A compact light-weight polymer magazine for use with Glock compatible " @@ -59508,7 +59511,7 @@ msgid_plural "Glock 17 17-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock 17 17-round magazine +#. ~ Description for {'str': 'Glock 17 17-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "Made for the Glock 17, this magazine holds 17 rounds." msgstr "" @@ -59519,7 +59522,7 @@ msgid_plural "Glock 17 22-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock 17 22-round magazine +#. ~ Description for {'str': 'Glock 17 22-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "Made for the Glock 17, this magazine holds 22 rounds." msgstr "" @@ -59530,7 +59533,7 @@ msgid_plural "Glock 50-round drum magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock 50-round drum magazine +#. ~ Description for {'str': 'Glock 50-round drum magazine'} #: lang/json/MAGAZINE_from_json.py msgid "Made to fit most Glock pistols. This drum magazine holds 50 rounds." msgstr "" @@ -59541,7 +59544,7 @@ msgid_plural "Glock 100-round drum magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Glock 100-round drum magazine +#. ~ Description for {'str': 'Glock 100-round drum magazine'} #: lang/json/MAGAZINE_from_json.py msgid "Made to fit most Glock pistols. This drum magazine holds 100 rounds." msgstr "" @@ -59552,7 +59555,7 @@ msgid_plural "LW-21 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for LW-21 magazine +#. ~ Description for {'str': 'LW-21 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "" "A 21-round polymer magazine for Leadworks LLC 9x19mm firearms. Lightweight " @@ -59568,8 +59571,8 @@ msgstr[1] "" #. ~ Description for M9 extended magazine #: lang/json/MAGAZINE_from_json.py msgid "" -"A 30-round extended magazine compatible with both the M9 handgun as well as " -"some modern carbines." +"A 30-round extended magazine compatible with both the M9 handgun and some " +"modern carbines." msgstr "" #: lang/json/MAGAZINE_from_json.py @@ -59594,7 +59597,7 @@ msgstr[1] "" #. ~ Description for MP5 extended magazine #: lang/json/MAGAZINE_from_json.py msgid "" -"An drum magazine for use with the H&K MP5 SMG. Much greater capacity but " +"A drum magazine for use with the H&K MP5 SMG. Much greater capacity but " "less reliable the factory specification magazine." msgstr "" @@ -59678,7 +59681,7 @@ msgid_plural "Kel-Tec PF-9 magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Kel-Tec PF-9 magazine +#. ~ Description for {'str': 'Kel-Tec PF-9 magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A standard 7-round steel box magazine for the Kel-Tec PF-9." msgstr "" @@ -59700,7 +59703,7 @@ msgid_plural "Hi-Power 9x19mm 13-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Hi-Power 9x19mm 13-round magazine +#. ~ Description for {'str': 'Hi-Power 9x19mm 13-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 13 round steel box magazine for the Browning Hi-Power 9x19mm." msgstr "" @@ -59711,7 +59714,7 @@ msgid_plural "Hi-Power 9x19mm 15-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for Hi-Power 9x19mm 15-round magazine +#. ~ Description for {'str': 'Hi-Power 9x19mm 15-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 15 round steel box magazine for the Browning Hi-Power 9x19mm." msgstr "" @@ -59766,7 +59769,7 @@ msgid_plural "C-9 8-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for C-9 8-round magazine +#. ~ Description for {'str': 'C-9 8-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "An 8-round steel box magazine for use with the Hi-Point C-9." msgstr "" @@ -59777,7 +59780,7 @@ msgid_plural "C-9 10-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for C-9 10-round magazine +#. ~ Description for {'str': 'C-9 10-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 10-round steel box magazine for use with the Hi-Point C-9." msgstr "" @@ -59788,7 +59791,7 @@ msgid_plural "C-9 15-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for C-9 15-round magazine +#. ~ Description for {'str': 'C-9 15-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 15-round steel box magazine for use with the Hi-Point C-9." msgstr "" @@ -59799,7 +59802,7 @@ msgid_plural "CZ 75 12-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for CZ 75 12-round magazine +#. ~ Description for {'str': 'CZ 75 12-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 12-round steel box magazine for use with the CZ 75." msgstr "" @@ -59810,7 +59813,7 @@ msgid_plural "CZ 75 20-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for CZ 75 20-round magazine +#. ~ Description for {'str': 'CZ 75 20-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 20-round steel box magazine for use with the CZ 75." msgstr "" @@ -59821,7 +59824,7 @@ msgid_plural "CZ 75 26-round magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for CZ 75 26-round magazine +#. ~ Description for {'str': 'CZ 75 26-round magazine'} #: lang/json/MAGAZINE_from_json.py msgid "A 26-round steel box magazine for use with the CZ 75." msgstr "" @@ -59832,7 +59835,7 @@ msgid_plural "CCP magazines" msgstr[0] "" msgstr[1] "" -#. ~ Description for CCP magazine +#. ~ Description for {'str': 'CCP magazine'} #: lang/json/MAGAZINE_from_json.py msgid "An 8-round steel box magazine for use with the Walther CCP." msgstr "" @@ -60095,7 +60098,7 @@ msgstr[1] "" #. ~ Description for {'str': 'large storage battery', 'str_pl': 'large storage batteries'} #: lang/json/MAGAZINE_from_json.py msgid "" -"A huge storage battery containing many lithium ion cells. Holds a " +"A huge storage battery containing many lithium-ion cells. Holds a " "tremendous amount of energy. Could be installed into a storage battery case " "for easy removal from a vehicle, or just welded straight in." msgstr "" @@ -60108,7 +60111,7 @@ msgstr[1] "" #. ~ Description for {'str': 'medium storage battery', 'str_pl': 'medium storage batteries'} #: lang/json/MAGAZINE_from_json.py -msgid "A medium storage battery containing multiple lithium ion cells." +msgid "A medium storage battery containing multiple lithium-ion cells." msgstr "" #: lang/json/MAGAZINE_from_json.py lang/json/vehicle_part_from_json.py @@ -60120,7 +60123,7 @@ msgstr[1] "" #. ~ Description for {'str': 'small storage battery', 'str_pl': 'small storage batteries'} #: lang/json/MAGAZINE_from_json.py msgid "" -"A small storage battery created with pre-Cataclysm lithium ion technology. " +"A small storage battery created with pre-Cataclysm lithium-ion technology. " "Useful for crafting." msgstr "" @@ -60133,7 +60136,7 @@ msgstr[1] "" #. ~ Description for {'str': 'storage battery', 'str_pl': 'storage batteries'} #: lang/json/MAGAZINE_from_json.py msgid "" -"A large storage battery containing many lithium ion cells. Could be " +"A large storage battery containing many lithium-ion cells. Could be " "installed into a storage battery case for easy removal from a vehicle, or " "just welded straight in." msgstr "" @@ -65160,7 +65163,7 @@ msgstr[1] "" #. ~ Description for sewer gator #: lang/json/MONSTER_from_json.py msgid "" -"In the late 20th century there was an urban legend about pet alligators " +"In the late 20th century, there was an urban legend about pet alligators " "getting flushed down the toilet and growing to adulthood in sewers. This " "large specimen doesn't look like it sees humans as anything other than a " "meal." @@ -71786,7 +71789,7 @@ msgstr "" #. ~ Description for mining helmet #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is a mining helmet with a heavy duty LED flashlight. Using this will " +"This is a mining helmet with a heavy-duty LED flashlight. Using this will " "turn the flashlight on and provide light, assuming it is charged with " "batteries." msgstr "" @@ -71852,7 +71855,7 @@ msgstr "" #. ~ Description for {'str': 'mining helmet (on)', 'str_pl': 'mining helmets (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is a mining helmet with a heavy duty LED flashlight. The flashlight is " +"This is a mining helmet with a heavy-duty LED flashlight. The flashlight is " "turned on, and continually draining its batteries. Use it to turn it off." msgstr "" @@ -71879,7 +71882,7 @@ msgstr[1] "" #: lang/json/TOOL_ARMOR_from_json.py msgid "" "A cloak woven with metallic fibers and covered with hexagonal sheets of " -"reflective carbide. When activated, it will create an holographic decoy of " +"reflective carbide. When activated, it will create a holographic decoy of " "its wearer." msgstr "" @@ -72136,7 +72139,7 @@ msgstr "" #. ~ Description for survivor headlamp #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is a custom made LED headlamp reinforced to be more durable, brighter, " +"This is a custom-made LED headlamp reinforced to be more durable, brighter, " "and with a larger and more efficient battery pack. The adjustable strap " "allows it to be comfortably worn on your head or attached to your helmet. " "Use it to turn it on." @@ -72151,7 +72154,7 @@ msgstr[1] "" #. ~ Description for {'str': 'survivor headlamp (on)', 'str_pl': 'survivor headlamps (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is a custom made LED headlamp reinforced to be more durable, brighter, " +"This is a custom-made LED headlamp reinforced to be more durable, brighter, " "and with a larger and more efficient battery pack. The adjustable strap " "allows it to be comfortably worn on your head or attached to your helmet. " "It is turned on, and continually draining batteries. Use it to turn it off." @@ -72171,7 +72174,7 @@ 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 " +"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." @@ -72191,7 +72194,7 @@ msgstr "" #. ~ Description for {'str': 'atomic headlamp (covered)', 'str_pl': 'atomic headlamps (covered)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" -"This is a custom made reinforced headlamp powered by the magic of nuclear " +"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." @@ -73384,7 +73387,7 @@ msgstr[1] "" #: lang/json/TOOL_ARMOR_from_json.py msgid "" "This is a high-pressure 232 bar diving tank that can contain up to 12L of " -"compressed mixture of oxygen and nitrogen. It is equipped with a on-demand " +"compressed mixture of oxygen and nitrogen. It is equipped with an on-demand " "regulator and a mouthpiece designed mostly for underwater use." msgstr "" @@ -73405,7 +73408,7 @@ msgstr[1] "" #: lang/json/TOOL_ARMOR_from_json.py msgid "" "This is a small high-pressure 200 bar backup diving tank, that can contain " -"4L of compressed mixture of oxygen and nitrogen. It is equipped with a on-" +"4L of compressed mixture of oxygen and nitrogen. It is equipped with an on-" "demand regulator and a mouthpiece designed mostly for underwater use." msgstr "" @@ -73781,7 +73784,7 @@ msgstr "" msgid "" "C.R.I.T standard-issue helmet. Protects the noggin and has a stretch of " "insulated steel mesh for neck warmth and protection. A tactically dim " -"flashlight is attatched to the side. This light is currently on and drawing " +"flashlight is attached to the side. This light is currently on and drawing " "power." msgstr "" @@ -74674,7 +74677,7 @@ msgid_plural "match head bombs (lit)" msgstr[0] "" msgstr[1] "" -#. ~ Use action no_deactivate_msg for match head bomb (lit). +#. ~ Use action no_deactivate_msg for {'str': 'match head bomb (lit)', 'str_pl': 'match head bombs (lit)'}. #. ~ Use action no_deactivate_msg for {'str': 'dynamite (lit)', 'str_pl': 'dynamites (lit)'}. #. ~ Use action no_deactivate_msg for {'str': 'dynamite bomb (lit)', 'str_pl': 'dynamite bombs (lit)'}. #. ~ Use action no_deactivate_msg for {'str': 'fertilizer bomb (lit)', 'str_pl': 'fertilizer bombs (lit)'}. @@ -74685,7 +74688,7 @@ msgstr[1] "" msgid "You've already lit the %s, try throwing it instead." msgstr "" -#. ~ Use action sound_msg for match head bomb (lit). +#. ~ Use action sound_msg for {'str': 'match head bomb (lit)', 'str_pl': 'match head bombs (lit)'}. #. ~ Use action sound_msg for active can bomb. #. ~ Use action sound_msg for {'str': 'dynamite (lit)', 'str_pl': 'dynamites (lit)'}. #. ~ Use action sound_msg for {'str': 'dynamite bomb (lit)', 'str_pl': 'dynamite bombs (lit)'}. @@ -74697,7 +74700,7 @@ msgstr "" msgid "ssss..." msgstr "" -#. ~ Description for match head bomb (lit) +#. ~ Description for {'str': 'match head bomb (lit)', 'str_pl': 'match head bombs (lit)'} #: lang/json/TOOL_from_json.py msgid "" "This is a bottle filled with match heads and equipped with a fuse. This one " @@ -74736,13 +74739,13 @@ msgid_plural "hobo stoves (lit)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for hobo stove (lit). +#. ~ Use action msg for {'str': 'hobo stove (lit)', 'str_pl': 'hobo stoves (lit)'}. #. ~ Use action msg for {'str': 'ember carrier (lit)', 'str_pl': 'ember carriers (lit)'}. #: lang/json/TOOL_from_json.py msgid "The ember is extinguished." msgstr "" -#. ~ Description for hobo stove (lit) +#. ~ Description for {'str': 'hobo stove (lit)', 'str_pl': 'hobo stoves (lit)'} #. ~ Description for hobo stove #: lang/json/TOOL_from_json.py msgid "" @@ -74845,22 +74848,22 @@ msgid_plural "shishkebabs (off)" msgstr[0] "" msgstr[1] "" -#. ~ Use action failure_message for shishkebab (off). +#. ~ Use action failure_message for {'str': 'shishkebab (off)', 'str_pl': 'shishkebabs (off)'}. #: lang/json/TOOL_from_json.py msgid "Aw, dangit. It fails to start!" msgstr "" -#. ~ Use action lacks_fuel_message for shishkebab (off). +#. ~ Use action lacks_fuel_message for {'str': 'shishkebab (off)', 'str_pl': 'shishkebabs (off)'}. #: lang/json/TOOL_from_json.py msgid "This thing needs some fuel!" msgstr "" -#. ~ Use action success_message for shishkebab (off). +#. ~ Use action success_message for {'str': 'shishkebab (off)', 'str_pl': 'shishkebabs (off)'}. #: lang/json/TOOL_from_json.py msgid "Let's dance, Zeds!" msgstr "" -#. ~ Description for shishkebab (off) +#. ~ Description for {'str': 'shishkebab (off)', 'str_pl': 'shishkebabs (off)'} #: lang/json/TOOL_from_json.py msgid "" "This is a large blade with a fuel pipe on the side, and a small tank and " @@ -74875,32 +74878,32 @@ msgid_plural "shishkebabs (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action auto_extinguish_message for shishkebab (on). +#. ~ Use action auto_extinguish_message for {'str': 'shishkebab (on)', 'str_pl': 'shishkebabs (on)'}. #: lang/json/TOOL_from_json.py msgid "Bummer, man! Your shishkebab's flame flickers and dies out." msgstr "" -#. ~ Use action charges_extinguish_message for shishkebab (on). +#. ~ Use action charges_extinguish_message for {'str': 'shishkebab (on)', 'str_pl': 'shishkebabs (on)'}. #: lang/json/TOOL_from_json.py msgid "Uncool, outta gas! Your shishkebab's flame goes out." msgstr "" -#. ~ Use action noise_message for shishkebab (on). +#. ~ Use action noise_message for {'str': 'shishkebab (on)', 'str_pl': 'shishkebabs (on)'}. #: lang/json/TOOL_from_json.py msgid "Your shishkebab crackles!" msgstr "" -#. ~ Use action voluntary_extinguish_message for shishkebab (on). +#. ~ Use action voluntary_extinguish_message for {'str': 'shishkebab (on)', 'str_pl': 'shishkebabs (on)'}. #: lang/json/TOOL_from_json.py msgid "Peace out. Your shishkebab's flame dies." msgstr "" -#. ~ Use action water_extinguish_message for shishkebab (on). +#. ~ Use action water_extinguish_message for {'str': 'shishkebab (on)', 'str_pl': 'shishkebabs (on)'}. #: lang/json/TOOL_from_json.py msgid "Your shishkebab hisses in the water and goes out." msgstr "" -#. ~ Description for shishkebab (on) +#. ~ Description for {'str': 'shishkebab (on)', 'str_pl': 'shishkebabs (on)'} #: lang/json/TOOL_from_json.py msgid "" "This is a large blade with a fuel pipe on the side, and a small tank and " @@ -74914,19 +74917,19 @@ msgid_plural "No. 9's" msgstr[0] "" msgstr[1] "" -#. ~ Use action failure_message for No. 9. -#. ~ Use action lacks_fuel_message for No. 9. +#. ~ Use action failure_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. +#. ~ Use action lacks_fuel_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py #: src/iuse.cpp src/mattack_actors.cpp msgid "Click." msgstr "" -#. ~ Use action success_message for No. 9. +#. ~ Use action success_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py msgid "Your No. 9 glows!" msgstr "" -#. ~ Description for No. 9 +#. ~ Description for {'str': 'No. 9', 'str_pl': "No. 9's"} #: lang/json/TOOL_from_json.py msgid "" "This huge steel knife has been modified with a fuel tank, insulated " @@ -74934,32 +74937,32 @@ msgid "" "torches heats the blade, burning your target." msgstr "" -#. ~ Use action auto_extinguish_message for No. 9. +#. ~ Use action auto_extinguish_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py msgid "Your No. 9 cuts out!" msgstr "" -#. ~ Use action charges_extinguish_message for No. 9. +#. ~ Use action charges_extinguish_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py msgid "Out of ammo!" msgstr "" -#. ~ Use action noise_message for No. 9. +#. ~ Use action noise_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py msgid "Your No. 9 hisses." msgstr "" -#. ~ Use action voluntary_extinguish_message for No. 9. +#. ~ Use action voluntary_extinguish_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py msgid "Your No. 9 goes dark." msgstr "" -#. ~ Use action water_extinguish_message for No. 9. +#. ~ Use action water_extinguish_message for {'str': 'No. 9', 'str_pl': "No. 9's"}. #: lang/json/TOOL_from_json.py msgid "Your No. 9 hisses in the water and goes out." msgstr "" -#. ~ Description for No. 9 +#. ~ Description for {'str': 'No. 9', 'str_pl': "No. 9's"} #: lang/json/TOOL_from_json.py msgid "" "This huge steel knife has been modified with a fuel tank, insulated " @@ -74973,16 +74976,19 @@ msgid_plural "Rising Suns" msgstr[0] "" msgstr[1] "" +#. ~ Use action lacks_fuel_message for {'str': 'Rising Sun'}. #. ~ Use action lacks_fuel_message for Rising Sun. #: lang/json/TOOL_from_json.py msgid "Time stands still." msgstr "" +#. ~ Use action success_message for {'str': 'Rising Sun'}. #. ~ Use action success_message for Rising Sun. #: lang/json/TOOL_from_json.py msgid "The Sun rises." msgstr "" +#. ~ Description for {'str': 'Rising Sun'} #. ~ Description for Rising Sun #: lang/json/TOOL_from_json.py msgid "" @@ -74992,28 +74998,32 @@ msgid "" "foes. Use to ignite." msgstr "" +#. ~ Use action charges_extinguish_message for {'str': 'Rising Sun'}. #. ~ Use action charges_extinguish_message for Rising Sun. #: lang/json/TOOL_from_json.py msgid "The Light Fades." msgstr "" +#. ~ Use action noise_message for {'str': 'Rising Sun'}. #. ~ Use action noise_message for Rising Sun. #: lang/json/TOOL_from_json.py msgid "The Sun shines brightly." msgstr "" +#. ~ Use action voluntary_extinguish_message for {'str': 'Rising Sun'}. #. ~ Use action voluntary_extinguish_message for Rising Sun. #: lang/json/TOOL_from_json.py msgid "The Sun sets." msgstr "" -#. ~ Use action water_extinguish_message for Rising Sun. -#. ~ Use action water_extinguish_message for firebrand (on). +#. ~ Use action water_extinguish_message for {'str': 'Rising Sun'}. +#. ~ Use action water_extinguish_message for {'str': 'firebrand (on)', 'str_pl': 'firebrands (on)'}. #. ~ Use action water_extinguish_message for Rising Sun. #: lang/json/TOOL_from_json.py msgid "Your sword hisses in the water and goes out." msgstr "" +#. ~ Description for {'str': 'Rising Sun'} #. ~ Description for Rising Sun #: lang/json/TOOL_from_json.py msgid "" @@ -75028,17 +75038,17 @@ msgid_plural "firebrands (off)" msgstr[0] "" msgstr[1] "" -#. ~ Use action lacks_fuel_message for firebrand (off). +#. ~ Use action lacks_fuel_message for {'str': 'firebrand (off)', 'str_pl': 'firebrands (off)'}. #: lang/json/TOOL_from_json.py msgid "No strength to fight!" msgstr "" -#. ~ Use action success_message for firebrand (off). +#. ~ Use action success_message for {'str': 'firebrand (off)', 'str_pl': 'firebrands (off)'}. #: lang/json/TOOL_from_json.py msgid "Charge!" msgstr "" -#. ~ Description for firebrand (off) +#. ~ Description for {'str': 'firebrand (off)', 'str_pl': 'firebrands (off)'} #: lang/json/TOOL_from_json.py msgid "" "This is a combination of two Dark Age conflict-resolution classics, the " @@ -75052,22 +75062,22 @@ msgid_plural "firebrands (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action charges_extinguish_message for firebrand (on). +#. ~ Use action charges_extinguish_message for {'str': 'firebrand (on)', 'str_pl': 'firebrands (on)'}. #: lang/json/TOOL_from_json.py msgid "Thy strength fades!" msgstr "" -#. ~ Use action noise_message for firebrand (on). +#. ~ Use action noise_message for {'str': 'firebrand (on)', 'str_pl': 'firebrands (on)'}. #: lang/json/TOOL_from_json.py msgid "Your blade burns for combat!" msgstr "" -#. ~ Use action voluntary_extinguish_message for firebrand (on). +#. ~ Use action voluntary_extinguish_message for {'str': 'firebrand (on)', 'str_pl': 'firebrands (on)'}. #: lang/json/TOOL_from_json.py msgid "Run away!" msgstr "" -#. ~ Description for firebrand (on) +#. ~ Description for {'str': 'firebrand (on)', 'str_pl': 'firebrands (on)'} #: lang/json/TOOL_from_json.py msgid "" "This is a combination of two Dark Age conflict-resolution classics, the " @@ -75081,18 +75091,20 @@ msgid_plural "flammenschwerter (aus)" msgstr[0] "" msgstr[1] "" +#. ~ Use action lacks_fuel_message for {'str': 'flammenschwert (aus)', 'str_pl': 'flammenschwerter (aus)'}. #. ~ Use action lacks_fuel_message for flammenschwert (aus). #: lang/json/TOOL_from_json.py msgid "Dein Flammenschwert hat keinen Brennstoff mehr." msgstr "" +#. ~ Use action success_message for {'str': 'flammenschwert (aus)', 'str_pl': 'flammenschwerter (aus)'}. #. ~ Use action success_message for flammenschwert (aus). #: lang/json/TOOL_from_json.py msgid "Die Klinge deines Schwertes brennt!" msgstr "" -#. ~ Description for flammenschwert (aus) -#. ~ Description for flammenschwert +#. ~ Description for {'str': 'flammenschwert (aus)', 'str_pl': 'flammenschwerter (aus)'} +#. ~ Description for {'str': 'flammenschwert', 'str_pl': 'flammenschwerter'} #. ~ Description for flammenschwert (aus) #. ~ Description for flammenschwert #: lang/json/TOOL_from_json.py @@ -75108,21 +75120,25 @@ msgid_plural "flammenschwerter" msgstr[0] "" msgstr[1] "" +#. ~ Use action charges_extinguish_message for {'str': 'flammenschwert', 'str_pl': 'flammenschwerter'}. #. ~ Use action charges_extinguish_message for flammenschwert. #: lang/json/TOOL_from_json.py msgid "Deinem Flammenschwert ist der Brennstoff ausgegangen!" msgstr "" +#. ~ Use action noise_message for {'str': 'flammenschwert', 'str_pl': 'flammenschwerter'}. #. ~ Use action noise_message for flammenschwert. #: lang/json/TOOL_from_json.py msgid "Das Feuer um deine Schwertklinge leuchtet hell!" msgstr "" +#. ~ Use action voluntary_extinguish_message for {'str': 'flammenschwert', 'str_pl': 'flammenschwerter'}. #. ~ Use action voluntary_extinguish_message for flammenschwert. #: lang/json/TOOL_from_json.py msgid "Die Flamme deines Schwertes erlischt." msgstr "" +#. ~ Use action water_extinguish_message for {'str': 'flammenschwert', 'str_pl': 'flammenschwerter'}. #. ~ Use action water_extinguish_message for flammenschwert. #: lang/json/TOOL_from_json.py msgid "Dein Schwert zischt und erlischt." @@ -75147,11 +75163,13 @@ msgid "" "a lighter or matches to light it." msgstr "" +#. ~ Use action msg for {'str': 'Louisville Slaughterer'}. #. ~ Use action msg for Louisville Slaughterer. #: lang/json/TOOL_from_json.py msgid "The Louisville Slaughterer is extinguished." msgstr "" +#. ~ Description for {'str': 'Louisville Slaughterer'} #. ~ Description for Louisville Slaughterer #: lang/json/TOOL_from_json.py msgid "" @@ -75207,7 +75225,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "" "This is an inactive EMP hack. EMP hacks are fist-sized robots that fly " -"through the air. This one contains a EMP grenade and attacks by flying at " +"through the air. This one contains an EMP grenade and attacks by flying at " "its target and detonating. Use this item to reprogram and release the EMP " "hack. Electronics and computer skill determines if the targeting matrix is " "reprogrammed successfully." @@ -76506,7 +76524,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "This ancient bronze weapon features a curved, sickle-like blade sharpened on " -"the outside edge. Associated with the New Kingdom period of ancient Egypt, " +"the outside edge. Associated with the New Kingdom period of Ancient Egypt, " "it was designed mainly to hack through the light armor common to the region." msgstr "" @@ -76602,7 +76620,7 @@ msgstr "" #. ~ Description for kirpan #: lang/json/TOOL_from_json.py msgid "" -"A ceremonial dagger carried by Sikh men. This one is not particularly well " +"A ceremonial dagger carried by Sikh men. This one is not particularly well-" "made." msgstr "" @@ -77520,7 +77538,7 @@ msgstr[1] "" #. ~ Description for camera pro #: lang/json/TOOL_from_json.py msgid "" -"A 35mm digital SLR (single-lens reflex) camera, with optical and digital " +"A 35 mm digital SLR (single-lens reflex) camera, with optical and digital " "viewfinders, zoom lens with auto-focus and stabilizer, and flash. You can " "view your photos on it or transfer them with a memory card; it runs on " "conventional batteries. Before the Cataclysm, you could have taken " @@ -77573,7 +77591,7 @@ msgstr[1] "" #. ~ Description for control laptop #: lang/json/TOOL_from_json.py msgid "" -"A modified laptop, now capable of transmitting in the ultra high frequencies " +"A modified laptop, now capable of transmitting in the ultra-high frequencies " "utilized by robots. Activate it to command robots from afar." msgstr "" @@ -78099,7 +78117,7 @@ msgstr "" #. ~ Description for EMP bomb #: lang/json/TOOL_from_json.py msgid "" -"This substantial device is a bomb that generates a electromagnetic pulse. " +"This substantial device is a bomb that generates an electromagnetic pulse. " "When activated, the plutonium fuel cell is drained into a flux compression " "generator, the detonation of which creates a strong magnetic field. When " "this magnetic field is fed into the antenna, it creates a strong electro-" @@ -78410,7 +78428,7 @@ msgstr "" #. ~ Description for EMP grenade #: lang/json/TOOL_from_json.py msgid "" -"This is a grenade that generates a electromagnetic pulse with a low-" +"This is a grenade that generates an electromagnetic pulse with a low-" "inductance capacitor bank discharged into a single-loop antenna. Use this " "item to pull the pin and light the fuse, turning it into an active EMP " "grenade. You will then have three turns before it detonates, creating an " @@ -78742,7 +78760,7 @@ msgstr "" #. ~ Description for RDX charge #: lang/json/TOOL_from_json.py msgid "" -"This is an metal keg, filled with 50 liters worth of RDX and scrap metal. " +"This is a metal keg, filled with 50 liters worth of RDX and scrap metal. " "Contains a core of primary explosive to ensure that the charge detonates " "completely and delivers its entire destructive power to everything in sight." msgstr "" @@ -78761,7 +78779,7 @@ msgstr "" #. ~ Description for active RDX charge #: lang/json/TOOL_from_json.py msgid "" -"This is an metal keg, filled with 50 liters worth of RDX and scrap metal. " +"This is a metal keg, filled with 50 liters worth of RDX and scrap metal. " "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 "" @@ -79143,7 +79161,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "This is a collection of items improvised for field reloading of shotshells. " -"A plank with a hole cut in the center, a medium sized nail, and a whittled " +"A plank with a hole cut in the center, a medium-sized nail, and a whittled " "dowel are used to seat wads, decap primers, and reprime (carefully!) hulls. " "Powder and shot are measured with a cut down fired shotshell. The opposite " "side of the plank has been shaped to allow for roll crimping of the plastic " @@ -80419,7 +80437,7 @@ msgstr[1] "" #. ~ Description for {'str': 'pocket watch', 'str_pl': 'pocket watches'} #: lang/json/TOOL_from_json.py msgid "" -"An old fashioned pocket watch. This one tells you the time and looks good " +"An old-fashioned pocket watch. This one tells you the time and looks good " "doing it. Can also be disassembled into some useful parts." msgstr "" @@ -81533,7 +81551,7 @@ msgstr[1] "" #. ~ Description for {'str': 'pair of scissors', 'str_pl': 'pairs of scissors'} #: lang/json/TOOL_from_json.py msgid "" -"These are a long pair of heavy duty scissors. Use scissors to cut items " +"These are a long pair of heavy-duty scissors. Use scissors to cut items " "made from cotton (like clothing) into rags." msgstr "" @@ -81881,7 +81899,7 @@ msgstr "" #: lang/json/TOOL_from_json.py msgid "" "This is a crude explosive device triggered by a piece of string. Use it to " -"setup and watch some poor bastard trigger it." +"set up and watch some poor bastard trigger it." msgstr "" #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py @@ -81984,7 +82002,7 @@ msgstr "" #. ~ Description for land mine #: lang/json/TOOL_from_json.py msgid "" -"This is an military anti-personnel mine that is triggered when stepped upon." +"This is a military anti-personnel mine that is triggered when stepped upon." msgstr "" #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py @@ -82881,7 +82899,7 @@ msgstr[1] "" #: lang/json/TOOL_from_json.py msgid "" "This is a black box, seemingly pulled from some sort of military vehicle " -"wreckage. If you can find a system to analyze this you may find something " +"wreckage. If you can find a system to analyze this, you may find something " "of interest." msgstr "" @@ -85741,7 +85759,7 @@ msgstr[1] "" #: 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." +"like amusement parks. Mostly for hobby purposes rather than transportation." msgstr "" #: lang/json/WHEEL_from_json.py lang/json/vehicle_part_from_json.py @@ -86766,7 +86784,7 @@ msgstr "" msgid "Adrenaline Pump" msgstr "" -#. ~ Description for Adrenaline Pump +#. ~ Description for {'str': 'Adrenaline Pump'} #: lang/json/bionic_from_json.py msgid "" "A stimulator system has been surgically implanted alongside your adrenal " @@ -86778,7 +86796,7 @@ msgstr "" msgid "Active Defense System" msgstr "" -#. ~ Description for Active Defense System +#. ~ Description for {'str': 'Active Defense System'} #: lang/json/bionic_from_json.py msgid "" "A thin forcefield surrounds your body, continually draining power. Anything " @@ -86792,7 +86810,7 @@ msgstr "" msgid "Alarm System" msgstr "" -#. ~ Description for Alarm System +#. ~ Description for {'str': 'Alarm System'} #: lang/json/bionic_from_json.py msgid "" "A motion-detecting alarm system will notice almost all movement within a " @@ -86811,7 +86829,7 @@ msgstr "" msgid "Alloy Plating - Arms" msgstr "" -#. ~ Description for Alloy Plating - Arms +#. ~ Description for {'str': 'Alloy Plating - Arms'} #: lang/json/bionic_from_json.py msgid "" "The flesh on your arms has been surgically replaced by alloy plating. " @@ -86835,7 +86853,7 @@ msgstr "" msgid "Alloy Plating - Head" msgstr "" -#. ~ Description for Alloy Plating - Head +#. ~ Description for {'str': 'Alloy Plating - Head'} #: lang/json/bionic_from_json.py msgid "" "The flesh on your head has been surgically replaced by alloy plating, " @@ -86846,7 +86864,7 @@ msgstr "" msgid "Alloy Plating - Legs" msgstr "" -#. ~ Description for Alloy Plating - Legs +#. ~ Description for {'str': 'Alloy Plating - Legs'} #: lang/json/bionic_from_json.py msgid "" "The flesh on your legs has been surgically replaced by alloy plating. " @@ -86858,7 +86876,7 @@ msgstr "" msgid "Alloy Plating - Torso" msgstr "" -#. ~ Description for Alloy Plating - Torso +#. ~ Description for {'str': 'Alloy Plating - Torso'} #: lang/json/bionic_from_json.py msgid "" "The flesh on your torso has been surgically replaced by alloy plating, " @@ -86869,7 +86887,7 @@ msgstr "" msgid "Battery System" msgstr "" -#. ~ Description for Battery System +#. ~ Description for {'str': 'Battery System'} #: lang/json/bionic_from_json.py msgid "" "You have a battery draining attachment, and thus can make use of the energy " @@ -86916,7 +86934,7 @@ msgstr "" msgid "Blood Analysis" msgstr "" -#. ~ Description for Blood Analysis +#. ~ Description for {'str': 'Blood Analysis'} #: lang/json/bionic_from_json.py msgid "" "Small sensors have been surgically implanted in your heart, allowing you to " @@ -86928,7 +86946,7 @@ msgstr "" msgid "Blood Filter" msgstr "" -#. ~ Description for Blood Filter +#. ~ Description for {'str': 'Blood Filter'} #: lang/json/bionic_from_json.py msgid "" "A filtration system in your heart allows you to actively filter out chemical " @@ -86940,7 +86958,7 @@ msgstr "" msgid "Cable Charger System" msgstr "" -#. ~ Description for Cable Charger System +#. ~ Description for {'str': 'Cable Charger System'} #: lang/json/bionic_from_json.py msgid "" "You have a complex port surgically mounted above your hip. While active, it " @@ -86964,7 +86982,7 @@ msgid_plural "Chain Lightnings" msgstr[0] "" msgstr[1] "" -#. ~ Description for Chain Lightning +#. ~ Description for {'str': 'Chain Lightning'} #: lang/json/bionic_from_json.py msgid "" "Your body is equipped with a chain lightning generator, allowing you to emit " @@ -86976,7 +86994,7 @@ msgstr "" msgid "Bionic Claws" msgstr "" -#. ~ Description for Bionic Claws +#. ~ Description for {'str': 'Bionic Claws'} #: lang/json/bionic_from_json.py msgid "" "Vicious claws have been surgically installed inside your fingers, allowing " @@ -87000,7 +87018,7 @@ msgstr "" msgid "Cloaking System" msgstr "" -#. ~ Description for Cloaking System +#. ~ Description for {'str': 'Cloaking System'} #: lang/json/bionic_from_json.py msgid "" "This high-power system uses a set of cameras and LEDs to make you blend into " @@ -87012,7 +87030,7 @@ msgstr "" msgid "Close Quarters Battle" msgstr "" -#. ~ Description for Close Quarters Battle +#. ~ Description for {'str': 'Close Quarters Battle'} #: lang/json/bionic_from_json.py msgid "" "Bionic processors and databanks, loaded with martial arts combat programs, " @@ -87025,7 +87043,7 @@ msgstr "" msgid "Bionic-Induced Deformity" msgstr "" -#. ~ Description for Bionic-Induced Deformity +#. ~ Description for {'str': 'Bionic-Induced Deformity'} #: lang/json/bionic_from_json.py msgid "" "A combination of poor surgical installation and unpleasant scarring has lead " @@ -87049,7 +87067,7 @@ msgstr "" msgid "Expanded Digestive System" msgstr "" -#. ~ Description for Expanded Digestive System +#. ~ Description for {'str': 'Expanded Digestive System'} #: lang/json/bionic_from_json.py msgid "" "You have been outfitted with three synthetic stomachs and industrial-grade " @@ -87061,7 +87079,7 @@ msgstr "" msgid "Acidic Discharge" msgstr "" -#. ~ Description for Acidic Discharge +#. ~ Description for {'str': 'Acidic Discharge'} #: lang/json/bionic_from_json.py msgid "" "A malfunctioning bionic which occasionally discharges acid into your " @@ -87072,14 +87090,14 @@ msgstr "" msgid "Electrical Discharge" msgstr "" -#. ~ Description for Electrical Discharge +#. ~ Description for {'str': 'Electrical Discharge'} #: lang/json/bionic_from_json.py msgid "" "A malfunctioning bionic which occasionally discharges electricity through " "your body, causing pain and brief paralysis but no damage." msgstr "" -#. ~ Description for Electrical Drain +#. ~ Description for {'str': 'Electrical Drain'} #: lang/json/bionic_from_json.py msgid "" "A malfunctioning bionic. It doesn't perform any useful function, but will " @@ -87102,7 +87120,7 @@ msgstr "" msgid "Enhanced Hearing" msgstr "" -#. ~ Description for Enhanced Hearing +#. ~ Description for {'str': 'Enhanced Hearing'} #: lang/json/bionic_from_json.py msgid "" "When this bionic is active, your hearing will be drastically improved, " @@ -87115,7 +87133,7 @@ msgstr "" msgid "Directional EMP" msgstr "" -#. ~ Description for Directional EMP +#. ~ Description for {'str': 'Directional EMP'} #: lang/json/bionic_from_json.py msgid "" "Surgically mounted in the palm of your hand are small parabolic EMP field " @@ -87129,7 +87147,7 @@ msgid_plural "EMP Projectors" msgstr[0] "" msgstr[1] "" -#. ~ Description for EMP Projector +#. ~ Description for {'str': 'EMP Projector'} #: lang/json/bionic_from_json.py msgid "" "A ranged EMP generator system is implanted on the palm of your right hand " @@ -87142,7 +87160,7 @@ msgstr "" msgid "Ethanol Burner" msgstr "" -#. ~ Description for Ethanol Burner +#. ~ Description for {'str': 'Ethanol Burner'} #: lang/json/bionic_from_json.py msgid "You burn alcohol as fuel in an extremely efficient reaction." msgstr "" @@ -87155,7 +87173,7 @@ msgstr "" msgid "Diamond Cornea" msgstr "" -#. ~ Description for Diamond Cornea +#. ~ Description for {'str': 'Diamond Cornea'} #: lang/json/bionic_from_json.py msgid "Your vision is greatly enhanced, giving you a +2 bonus to perception." msgstr "" @@ -87189,7 +87207,7 @@ msgstr "" msgid "Dielectric Capacitance System" msgstr "" -#. ~ Description for Dielectric Capacitance System +#. ~ Description for {'str': 'Dielectric Capacitance System'} #: lang/json/bionic_from_json.py msgid "" "Throughout your body lies a network of miniature piezoelectric capacitors " @@ -87226,7 +87244,7 @@ msgstr "" msgid "Cranial Flashlight" msgstr "" -#. ~ Description for Cranial Flashlight +#. ~ Description for {'str': 'Cranial Flashlight'} #: lang/json/bionic_from_json.py msgid "" "Surgically mounted between your eyes is a small but powerful LED flashlight." @@ -87337,7 +87355,7 @@ msgstr "" msgid "Cerebral Booster" msgstr "" -#. ~ Description for Cerebral Booster +#. ~ Description for {'str': 'Cerebral Booster'} #: lang/json/bionic_from_json.py msgid "" "Your brain has been enhanced with bionic coprocessors, giving you a +2 bonus " @@ -87411,7 +87429,7 @@ msgstr "" msgid "Electromagnetic Unit" msgstr "" -#. ~ Description for Electromagnetic Unit +#. ~ Description for {'str': 'Electromagnetic Unit'} #: lang/json/bionic_from_json.py msgid "" "Surgically embedded in your right hand is a powerful electromagnet, allowing " @@ -87434,7 +87452,7 @@ msgstr "" msgid "Enhanced Memory Banks" msgstr "" -#. ~ Description for Enhanced Memory Banks +#. ~ Description for {'str': 'Enhanced Memory Banks'} #: lang/json/bionic_from_json.py msgid "" "Your memory has been enhanced with small quantum storage drives. While " @@ -87483,7 +87501,7 @@ msgstr "" msgid "Artificial Night Generator" msgstr "" -#. ~ Description for Artificial Night Generator +#. ~ Description for {'str': 'Artificial Night Generator'} #: lang/json/bionic_from_json.py msgid "" "When active, this bionic eliminates all light within a 2 tile radius through " @@ -87507,7 +87525,7 @@ msgid "" "A malfunctioning bionic. It will occasionally emit a loud burst of noise." msgstr "" -#. ~ Description for Bionic Nostril +#. ~ Description for {'str': 'Bionic Nostril'} #: lang/json/bionic_from_json.py msgid "" "You're really not sure how the CBM ended up in your nose, but no matter how " @@ -87539,7 +87557,7 @@ msgid "" "may cause delayed reaction time and drowsiness." msgstr "" -#. ~ Description for Bionic Visual Impairment +#. ~ Description for {'str': 'Bionic Visual Impairment'} #: lang/json/bionic_from_json.py msgid "" "Due to a badly misplaced dielectric stylette, you are now suffering from " @@ -87615,7 +87633,7 @@ msgstr "" msgid "Air Filtration System" msgstr "" -#. ~ Description for Air Filtration System +#. ~ Description for {'str': 'Air Filtration System'} #: lang/json/bionic_from_json.py msgid "" "Surgically implanted in your trachea is an advanced filtration system. If " @@ -87716,7 +87734,7 @@ msgid "" "darkness." msgstr "" -#. ~ Description for Bionic Short Circuit +#. ~ Description for {'str': 'Bionic Short Circuit'} #: lang/json/bionic_from_json.py msgid "" "A poorly-wired bionic which fails to serve its intended purpose, this " @@ -87741,7 +87759,7 @@ msgstr "" msgid "Electroshock Unit" msgstr "" -#. ~ Description for Electroshock Unit +#. ~ Description for {'str': 'Electroshock Unit'} #: lang/json/bionic_from_json.py msgid "" "While fighting unarmed, or with a weapon that conducts electricity, there is " @@ -87761,7 +87779,7 @@ msgid "" "with impassable terrain, and knockback any creatures they collide with." msgstr "" -#. ~ Description for Endocrine Enervator +#. ~ Description for {'str': 'Endocrine Enervator'} #: lang/json/bionic_from_json.py msgid "" "Through a combination of psychochemical manipulation and old fashioned " @@ -87813,7 +87831,7 @@ msgstr "" msgid "Autonomous Surgical Scalpels" msgstr "" -#. ~ Description for Autonomous Surgical Scalpels +#. ~ Description for {'str': 'Autonomous Surgical Scalpels'} #: lang/json/bionic_from_json.py msgid "" "A system of surgical grade scalpels is implanted on your fingers. They " @@ -87825,7 +87843,7 @@ msgstr "" msgid "Anti-Glare Compensators" msgstr "" -#. ~ Description for Anti-Glare Compensators +#. ~ Description for {'str': 'Anti-Glare Compensators'} #: lang/json/bionic_from_json.py msgid "" "Your eyes have quick-reacting transition lenses surgically installed over " @@ -92927,16 +92945,16 @@ msgid "Your energy fades." msgstr "" #: lang/json/effects_from_json.py -msgid "Enviromental Protection" +msgid "Environmental Protection" msgstr "" -#. ~ Description of effect 'Enviromental Protection'. -#. ~ Apply message for effect(s) 'Enviromental Protection'. +#. ~ Description of effect 'Environmental Protection'. +#. ~ Apply message for effect(s) 'Environmental Protection'. #: lang/json/effects_from_json.py msgid "You are protected by an energy field." msgstr "" -#. ~ Remove message for effect(s) 'Enviromental Protection'. +#. ~ Remove message for effect(s) 'Environmental Protection'. #: lang/json/effects_from_json.py msgid "Your energy field fades." msgstr "" @@ -98012,7 +98030,7 @@ msgstr[1] "" msgid "" "This ubiquitous rifle is the forefather of M16 rifle series. It is " "lightweight and accurate, but will malfunction if not properly maintained. " -"This one is a semi automatic civilian version." +"This one is a semi-automatic civilian version." msgstr "" #: lang/json/gun_from_json.py @@ -98705,7 +98723,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The P320 is a semi automatic, short recoil operated pistol. This one is " +"The P320 is a semi-automatic, short recoil operated pistol. This one is " "chambered for .357 SIG." msgstr "" @@ -98842,7 +98860,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"One of the best selling modern day 'pocket pistol's, the LCP is an " +"One of the best-selling modern day 'pocket pistol's, the LCP is an " "affordable, polymer framed pistol chambered in .380 ACP. Despite the " "round's relatively low power, the pistol's low weight and short sight radius " "make for a moderately poor handling pistol." @@ -98856,7 +98874,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Hi-Point CF-380 is a blowback operated semi automatic pistol designed by " +"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 " "with a zinc pot-metal which is relatively fragile compared to steel slides." @@ -99006,7 +99024,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Hi-Point Model JCP is a blowback operated semi automatic pistol designed " +"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 " @@ -99026,8 +99044,8 @@ msgid "" msgstr "" #: lang/json/gun_from_json.py -msgid "M320 stand alone launcher" -msgid_plural "M320 stand alone launchers" +msgid "M320 standalone launcher" +msgid_plural "M320 standalone launchers" msgstr[0] "" msgstr[1] "" @@ -99035,7 +99053,7 @@ msgstr[1] "" msgid "" "Heckler & Koch's M320 grenade launcher offers the functionality of larger " "launchers in a very small package at the cost of decreased accuracy. This " -"one is combined with a buttstock for stand alone operation." +"one is combined with a buttstock for standalone operation." msgstr "" #: lang/json/gun_from_json.py @@ -99047,7 +99065,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A widely-used grenade launcher that first saw use by American forces in the " -"Vietnam war. Though mostly replaced by more modern launchers, the M79 still " +"Vietnam War. Though mostly replaced by more modern launchers, the M79 still " "sees use with many units worldwide." msgstr "" @@ -99114,7 +99132,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A heavy, tripod-mounted belt-fed grenade launcher used by the US Military " -"since the start of the cold war all the way to the cataclysm, and if you can " +"since the start of the Cold War all the way to the cataclysm, and if you can " "find some 40mm grenades, maybe even beyond." msgstr "" @@ -99390,7 +99408,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Hi-Point Model JHP is a blowback operated semi automatic pistol designed " +"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 " @@ -99515,7 +99533,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"Designed as a personal defense weapon, the MP7 fires the high powered " +"Designed as a personal defense weapon, the MP7 fires the high-powered " "4.6x30mm round while being lightweight, compact in size, and practically " "recoil free." msgstr "" @@ -100144,7 +100162,7 @@ msgid "" "The Heckler & Koch MP5 is one of the most widely-used submachine guns in the " "world, and has been adopted by special police forces and militaries alike. " "Its high degree of accuracy and low recoil are universally praised. The " -"MP5K-PDW model features a shorter barrel, a built in foregrip, and a side " +"MP5K-PDW model features a shorter barrel, a built-in foregrip, and a side " "folding stock for vehicle or aircraft crew use." msgstr "" @@ -100364,7 +100382,7 @@ msgstr[1] "" msgid "" "The Kel-Tec PF-9 remains one of the most popular backup pistols due to its " "history of reliability, affordability, and concealability. Chambered in " -"9x19mm, recoil is best described as unpleasant, and follow up shots are " +"9x19mm, recoil is best described as unpleasant, and follow-up shots are " "difficult to place quickly." msgstr "" @@ -100376,7 +100394,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The M17 is a semi automatic, short recoil operated pistol derived from the " +"The M17 is a semi-automatic, short recoil operated pistol derived from the " "SIG Sauer P320." msgstr "" @@ -100431,7 +100449,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"The Hi-Point C-9 is a blowback operated semi automatic pistol designed by Hi-" +"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 " "with a zinc pot-metal which is relatively fragile compared to steel slides." @@ -100633,7 +100651,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A beautifully decorated flintlock pistol. If using this doesn't makes you " +"A beautifully decorated flintlock pistol. If using this doesn't make you " "feel a pirate, nothing will." msgstr "" @@ -100722,7 +100740,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" "A tool used to drive nails into wood or other material. It could also be " -"used as a ad-hoc weapon." +"used as an ad-hoc weapon." msgstr "" #: lang/json/gun_from_json.py @@ -100947,7 +100965,7 @@ msgid "" "This semi-automatic shotgun features a self compensating gas system that " "will feed a wide array of shells while also reducing recoil. Introduced in " "1963, it is favored by law enforcement, hunters and competition shooters, " -"and has been the best selling autoloading shotgun in U.S. history. This is " +"and has been the best-selling autoloading shotgun in U.S. history. This is " "the nickel finished, teflon coated competition model, with a full length " "magazine tube and 30 inch barrel." msgstr "" @@ -101168,7 +101186,7 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "" -"A state of the art laser rifle developed by the R&D outfit \"Aerial Labs\". " +"A state-of-the-art laser rifle developed by the R&D outfit \"Aerial Labs\". " "Initial performance rivaled Rivtech's finest, with rumors flying about " "corporate skulduggery. Though the Cataclysm put that on the ash heap of " "history, this weapon can still do the same to your foes." @@ -104015,7 +104033,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A Leadworks built in shortened barrel results in reduced weapon range, and a " +"A Leadworks built-in shortened barrel results in reduced weapon range, and a " "minor increase in noise, but also greatly improves the ease with which the " "weapon can be carried and wielded." msgstr "" @@ -104028,7 +104046,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A Leadworks built in heavy duty barrel especially designed for prolonged " +"A Leadworks built-in heavy-duty barrel especially designed for prolonged " "shooting. Increases damage output and weapon range." msgstr "" @@ -104677,7 +104695,7 @@ msgstr[0] "" msgstr[1] "" #: lang/json/gunmod_from_json.py -msgid "An advanced Leadworks built in gyroscopic stabilizer." +msgid "An advanced Leadworks built-in gyroscopic stabilizer." msgstr "" #: lang/json/gunmod_from_json.py @@ -104885,7 +104903,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"An Leadworks built in Advanced Combat Optical Gunsight, a milspec medium " +"A Leadworks built-in Advanced Combat Optical Gunsight, a milspec medium " "magnification scope. Improves accuracy significantly." msgstr "" @@ -104896,7 +104914,7 @@ msgstr[0] "" msgstr[1] "" #: lang/json/gunmod_from_json.py -msgid "Leadworks built in holographic sight." +msgid "Leadworks built-in holographic sight." msgstr "" #: lang/json/gunmod_from_json.py @@ -104961,7 +104979,7 @@ msgstr[0] "" msgstr[1] "" #: lang/json/gunmod_from_json.py -msgid "An add on stock for handguns considerably improving control of recoil." +msgid "An add-on stock for handguns considerably improving control of recoil." msgstr "" #: lang/json/gunmod_from_json.py @@ -105188,7 +105206,7 @@ msgstr[1] "" 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 " +"be either attached to a rifle or combined with a buttstock for standalone " "use." msgstr "" @@ -105202,7 +105220,7 @@ msgstr[1] "" 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 " +"be either attached to a rifle or combined with a buttstock for standalone " "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 "" @@ -105331,7 +105349,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A Leadworks built in visible-light laser that mounts under a firearm's " +"A Leadworks built-in visible-light laser that mounts under a firearm's " "barrel to enhance ease and speed of target acquisition." msgstr "" @@ -105343,7 +105361,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A Leadworks built in grip placed forward on the barrel allows for greater " +"A Leadworks built-in grip placed forward on the barrel allows for greater " "control." msgstr "" @@ -105355,9 +105373,9 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"Leadworks built in bipod designed to provide a forward rest and reduce " -"motion. Although it greatly improve handling of recoil it is usable only on " -"certain surfaces and are slow to equip." +"Leadworks built-in bipod designed to provide a forward rest and reduce " +"motion. Although it greatly improves handling of recoil it is usable only " +"on certain surfaces and are slow to equip." msgstr "" #: lang/json/gunmod_from_json.py @@ -105368,7 +105386,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"Leadworks built in minimalist pump action shotgun module. It allows 4 " +"Leadworks built-in minimalist pump action shotgun module. It allows 4 " "shotgun shells to be loaded and fired." msgstr "" @@ -105380,7 +105398,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"The Leadworks built in Grenade Launcher Module offers the functionality of " +"The Leadworks built-in Grenade Launcher Module offers the functionality of " "larger launchers in a very small package." msgstr "" @@ -105517,7 +105535,7 @@ msgstr[1] "" #: lang/json/gunmod_from_json.py msgid "" -"A compact flashlight which is attatched to the side of your weapon, not " +"A compact flashlight which is attached to the side of your weapon, not " "powerful, but good enough for tight hallways." msgstr "" @@ -111337,7 +111355,7 @@ msgstr "" #. ~ Computer option #: lang/json/mapgen_from_json.py -#: lang/json/mission_def_from_json.py +#: lang/json/mapgen_from_json.py lang/json/mission_def_from_json.py msgid "Disable External Power" msgstr "" @@ -142600,22 +142618,22 @@ msgstr "" #: lang/json/scenario_from_json.py msgctxt "scen_desc_male" msgid "" -"Despite all the soldiers, guns and minefields, your base got overrun by the " -"dead. Your last order was to retreat to the armory, but during all the " -"chaos you got separated from your squad and you are now stuck in the " -"warehouse all alone. You are not sure if anyone made it to the armory, or " -"you are the last man alive." +"Despite all the soldiers, guns and minefields, the base you were on got " +"overrun by the dead. Everyone was ordered to fall back to the armory, but " +"during all the chaos you got lost and you are now stuck in the warehouse all " +"alone. You are not sure if anyone made it to the armory, or if you are the " +"last man alive." msgstr "" #. ~ Description for scenario 'Overrun' for a female character. #: lang/json/scenario_from_json.py msgctxt "scen_desc_female" msgid "" -"Despite all the soldiers, guns and minefields, your base got overrun by the " -"dead. Your last order was to retreat to the armory, but during all the " -"chaos you got separated from your squad and you are now stuck in the " -"warehouse all alone. You are not sure if anyone made it to the armory, or " -"you are the last man alive." +"Despite all the soldiers, guns and minefields, the base you were on got " +"overrun by the dead. Everyone was ordered to fall back to the armory, but " +"during all the chaos you got lost and you are now stuck in the warehouse all " +"alone. You are not sure if anyone made it to the armory, or if you are the " +"last man alive." msgstr "" #. ~ Starting location for scenario 'Overrun'. @@ -159039,7 +159057,7 @@ msgid "Clothing Store" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159047,7 +159065,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159195,7 +159213,9 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 @@ -159203,13 +159223,11 @@ msgid "That is all for now." 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 "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "There are bones to etch, songs to sing. Wish to join me?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159217,11 +159235,11 @@ msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159230,7 +159248,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159302,16 +159320,16 @@ msgstr "" msgid "I see. Very well then." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You bear my mark, meaning I believe you have potential to learn to truly " "listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I am glad to hear it. Let's go then." msgstr "" @@ -159588,14 +159606,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159868,13 +159886,13 @@ msgid "Thanks. I have some things for you to do." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " -"anymore..." +msgid "Hi there, ." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there, ." +msgid "" +"STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " +"anymore..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159947,11 +159965,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" +msgid "No, just no..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." +msgid "Just let me sleep, !" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159959,11 +159977,11 @@ msgid "Make it quick, I want to go back to sleep." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" +msgid "Just few minutes more..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." +msgid "Anything to do before I go to sleep?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159990,11 +160008,11 @@ msgid "no, 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 @@ -160078,15 +160096,15 @@ msgid "Let's go." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160094,19 +160112,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " " +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160114,7 +160128,7 @@ msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " " msgstr "" #: lang/json/talk_topic_from_json.py @@ -160122,7 +160136,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160130,19 +160144,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160150,7 +160164,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160158,13 +160172,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -160282,12 +160300,13 @@ msgid "Attack anything you want." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160297,12 +160316,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160341,12 +160359,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160356,12 +160374,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160397,19 +160415,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160453,7 +160471,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160461,11 +160479,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160473,7 +160487,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160481,7 +160495,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160489,7 +160503,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160497,7 +160511,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160505,7 +160519,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160513,7 +160527,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160521,13 +160535,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "" @@ -160629,11 +160647,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 ." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm currently ." +msgid "I'm not doing much currently." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160697,11 +160715,11 @@ msgid "Sure thing, I'll make my way there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160715,12 +160733,12 @@ msgid "OK, maybe it'll stop me from freezing in this weather, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man it's dark out isn't it? what's up?" +msgid "" +"Well, it's the time of day for a quick break surely! How are you holding up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's the time of day for a quick break surely! How are you holding up?" +msgid "Man it's dark out isn't it? what's up?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -160729,14 +160747,14 @@ 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, ? " +"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 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, ? " msgstr "" #: lang/json/talk_topic_from_json.py @@ -160812,11 +160830,11 @@ msgid "Keep your distance!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "This is my territory, ." +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "This is my territory, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160871,16 +160889,12 @@ msgstr "" msgid "I don't care." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "I don't have any jobs for you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have more jobs for you. Want to hear about them?" +msgid "I don't have any more jobs for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160888,13 +160902,17 @@ 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 msgid "I have another job for you. Want to hear about it?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I just have one job for you. Want to hear about it?" +msgstr "" + #: lang/json/talk_topic_from_json.py #: lang/json/talk_topic_from_json.py src/npctalk.cpp msgid "Oh, okay." @@ -160905,7 +160923,7 @@ msgid "Never mind, I'm not interested." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Which job?" +msgid "You're not working on anything for me now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160913,7 +160931,7 @@ msgid "What about it?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." +msgid "Which job?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161125,31 +161143,31 @@ msgid "Thanks!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I must focus on the road!" +msgid "Focus on the road, mate!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." +msgid "I must focus on the road!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgid "I'm too thirsty, give me something to drink." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too tired, let me rest first." +msgid "I'm too hungry, give me something to eat." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." +msgid "I'm too tired, let me rest first." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too thirsty, give me something to drink." +msgid "Nothing comes to my mind now. Ask me later perhaps?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" +msgid "I have some reason for not telling you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161157,7 +161175,7 @@ msgid "Ah, okay." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" +msgid "Not until I get some antibiotics..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161165,7 +161183,7 @@ msgid "You asked me recently; ask again later." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." +msgid "Why should I travel with you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161257,11 +161275,11 @@ msgid "On second thought, never mind." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while I'm operating a vehicle!" +msgid "I can't train you properly while you're operating a vehicle!" 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 @@ -161269,7 +161287,7 @@ msgid "Give it some time, I'll show you something new later..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" +msgid "I have some reason for denying you training." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161309,11 +161327,11 @@ msgid "I understand…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Why should I share my equipment with you?" +msgid "You just asked me for stuff; ask later." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." +msgid "Why should I share my equipment with you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161459,13 +161477,13 @@ msgid "You might be seeing more of me…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " -"I've seen in a long time." +msgid "Hey again. *kzzz*" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" +msgid "" +"I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " +"I've seen in a long time." msgstr "" #: lang/json/talk_topic_from_json.py @@ -162587,15 +162605,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -162603,11 +162621,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -163944,6 +163962,10 @@ msgid "" "although honestly I'm just busy not dying." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a " @@ -163952,8 +163974,7 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was " "a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163964,11 +163985,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was " "a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164304,13 +164322,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" @@ -164369,7 +164387,8 @@ msgid "I'm sorry you lost someone." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -164379,8 +164398,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164404,35 +164422,35 @@ msgid "Oh, . This doesn't have anything to do with you, or with us." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost her." +msgid "All right, fine. I had someone. I lost him." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." +msgid "All right, fine. I had someone. I lost her." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell. " +"He was at home when the bombs started dropping and the world went to hell. " "I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people " "and cars. Soldiers trying to stop them, but hitting people in the crossfire " "as much as anything. And then the collateral damage would get right back up " -"and join the enemy. If it hadn't been for my wife, I would have just left, " -"but I did what I could and I slipped through. I actually made it " -"alive." +"and join the enemy. If it hadn't been for my husband, I would have just " +"left, but I did what I could and I slipped through. I actually made " +"it alive." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " +"She was at home when the bombs started dropping and the world went to hell. " "I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people " "and cars. Soldiers trying to stop them, but hitting people in the crossfire " "as much as anything. And then the collateral damage would get right back up " -"and join the enemy. If it hadn't been for my husband, I would have just " -"left, but I did what I could and I slipped through. I actually made " -"it alive." +"and join the enemy. If it hadn't been for my wife, I would have just left, " +"but I did what I could and I slipped through. I actually made it " +"alive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164483,11 +164501,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -164495,11 +164513,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -165131,16 +165149,6 @@ msgid "" "Hell on Earth. I wish I'd paid more attention in Sunday School." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -165152,6 +165160,16 @@ msgid "" "channel." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -165227,14 +165245,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " -"interested in getting attached. You didn't pay me to be your friend." +"Like I said, you want me to tell you a story, you gotta pony up the whisky. " +"A full bottle, mind you." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky. " -"A full bottle, mind you." +"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " +"interested in getting attached. You didn't pay me to be your friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165539,18 +165557,18 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm " "just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " "just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" @@ -165559,10 +165577,6 @@ msgstr "" msgid "What were you saying before that?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "" @@ -165583,6 +165597,10 @@ msgstr "" msgid "How's the weather?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "" @@ -165669,16 +165687,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165725,15 +165743,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165766,15 +165784,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like " -"to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like " +"to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165817,14 +165835,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165893,11 +165911,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165953,11 +165971,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165969,19 +165987,19 @@ msgid "You're disgusting." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166007,7 +166025,9 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166015,9 +166035,7 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166091,16 +166109,16 @@ msgstr "" msgid "Where can I find Chris?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I see that badge. You need to leave our land, my relatives have no fondness " "for Marshals." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi, what's up?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " @@ -166192,7 +166210,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166200,7 +166218,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166497,11 +166515,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166699,9 +166717,7 @@ msgid "Tell me about your dad." 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 " -"you'll get out while you can." +msgid "Marshal, I hope you're here to assist us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166711,7 +166727,9 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." +msgid "" +"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 @@ -166773,7 +166791,7 @@ msgid "Whatever they did it must have worked since we are still alive…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." +msgid "Marshal, I'm rather surprised to see you here." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166781,7 +166799,7 @@ msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm rather surprised to see you here." +msgid "Ma'am you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166819,47 +166837,47 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, citizen… I'm not sure you belong here." +msgid "Hello, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You should mind your own business, nothing to see here." +msgid "Marshal, I'm afraid I can't talk now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "If you need something you'll need to talk to someone else." +msgid "I'm not in charge here, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am" +msgid "I'm supposed to direct all questions to my leadership, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgid "Hey, citizen… I'm not sure you belong here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sir." +msgid "You should mind your own business, nothing to see here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Dude, if you can hold your own you should look into enlisting." +msgid "If you need something you'll need to talk to someone else." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." +msgid "Sir." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." +msgid "Dude, if you can hold your own you should look into enlisting." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." +msgid "Ma'am" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." +msgid "Hey miss, don't you think it would be safer if you stuck with me?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166917,12 +166935,14 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -166931,13 +166951,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help me?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" +msgid "Please, help me. I need food." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166957,14 +166975,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167062,16 +167080,16 @@ msgid "" "hurry to face that again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "That's quite the offer, but I don't think I'd survive the trip. I don't " "think you realize how useless I am in this world." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I can keep you safe. I'll take you there myself." msgstr "" @@ -167113,12 +167131,12 @@ msgid "All right! Let's get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "We've done it! We've solved the list!" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167154,13 +167172,13 @@ msgid "Do you need something to eat?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Yeah, I'm real hungry and they put drugs in most of the food. I can see " -"you're not like that." +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgid "" +"Yeah, I'm real hungry and they put drugs in most of the food. I can see " +"you're not like that." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167254,15 +167272,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. " -"Thanks. You've helped me a lot. I'm feeling much more myself with all this " -"to keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. " +"Thanks. You've helped me a lot. I'm feeling much more myself with all this " +"to keep me going." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167282,18 +167300,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." +msgid "Fuck off, dickwaddle." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit " -"cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167303,15 +167318,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit " +"cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." +msgid "Don't bother with these assholes." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167596,12 +167614,6 @@ msgid "" "that?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "If you get me a sample, I'll join your crazy camp expedition. Hell, if you " @@ -167610,6 +167622,12 @@ msgid "" "sound, maybe make sure it's not a sporulating body." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "It just so happens I have a chunk of fungal matter on me right now." msgstr "" @@ -167665,11 +167683,11 @@ msgid "I'll see what I can do." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, are you a big fan of survival of the fittest?" +msgid "Thanks again for the grub, my friend." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." +msgid "Hey, are you a big fan of survival of the fittest?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -167690,14 +167708,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " -"Help a poor sickly soul out?" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." +"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " +"Help a poor sickly soul out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -167721,12 +167739,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167994,10 +168012,6 @@ msgstr "" msgid "What's your take on the situation here?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "" @@ -168010,6 +168024,10 @@ msgstr "" msgid "Aw hey, look who's back." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "" @@ -168027,7 +168045,7 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." +msgid "I'm not a kid, okay? I'm sixteen." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168035,7 +168053,7 @@ msgid "I'm not a kid, okay? I'm fifteen." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." +msgid "I'm not a kid, okay? I'm fourteen." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168046,14 +168064,6 @@ msgstr "" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's " -"all so stupid, and nobody can tell me anything." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -168063,6 +168073,14 @@ msgid "" "here. We can hear them at night." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's " +"all so stupid, and nobody can tell me anything." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -168100,8 +168118,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -168111,7 +168128,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168141,33 +168159,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -168196,12 +168214,6 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -168210,8 +168222,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -168221,7 +168233,9 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." +msgid "" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168236,6 +168250,10 @@ msgstr "" msgid "It is good to see you again." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ah, another new face. Hello. I am Boris." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -168304,6 +168322,12 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -168314,12 +168338,6 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -168349,15 +168367,15 @@ msgid "Got any more bread I can trade flour for?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." +msgid "Hello, nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, nice to see you again." +msgid "It's good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "It's good to see you're still around." +msgid "Hi there. I'm Dana, nice to see a new face." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168409,10 +168427,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight " -"cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try " +"to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168423,8 +168439,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try " -"to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight " +"cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168446,12 +168464,6 @@ msgid "" "that's a lot more than most." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -168473,6 +168485,12 @@ msgid "" "now." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something " @@ -168502,6 +168520,10 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here " @@ -168509,10 +168531,6 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -168550,13 +168568,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well now, good to see another new face! Welcome to the center, friend, I'm " -"Draco." +msgid "Always good to see you, friend." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." +msgid "" +"Well now, good to see another new face! Welcome to the center, friend, I'm " +"Draco." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168793,11 +168811,11 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168897,14 +168915,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py @@ -168955,12 +168973,6 @@ msgstr "" msgid "Is there anything I can do to help you out?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "" @@ -168973,6 +168985,12 @@ msgstr "" msgid "Oh, hi." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "" @@ -169066,15 +169084,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169140,17 +169158,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." +msgid "Hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi." +msgid "Hey again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey again." +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169200,12 +169218,12 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." +msgid "Nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." +msgid "" +"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169356,15 +169374,6 @@ msgid "" "this before somebody snaps." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -169377,6 +169386,15 @@ msgid "" "want to know?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "" @@ -169442,14 +169460,6 @@ msgid "" "hope that there's a future to be had." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but " -"I'm not totally sure. He seems nice enough, but he's a man of few words. I " -"can't get a good bead on them. I've learned not to pry too much though." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -169462,10 +169472,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside " -"of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but " +"I'm not totally sure. He seems nice enough, but he's a man of few words. I " +"can't get a good bead on them. I've learned not to pry too much though." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169479,14 +169489,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it " -"yet." +"I really can't get a bead on them. They never really talk to anyone outside " +"of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169503,13 +169509,25 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it " +"yet." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -169562,11 +169580,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169609,15 +169627,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169818,12 +169836,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py @@ -169914,17 +169932,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170037,13 +170055,13 @@ msgid "Hmm, can we change this shave a little please?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, great. Another new mouth to feed? Just what we need. Well, I'm " -"Vanessa." +msgid "Oh, you're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." +msgid "" +"Oh, great. Another new mouth to feed? Just what we need. Well, I'm " +"Vanessa." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170082,14 +170100,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"You want the sarcastic version, or the really sarcastic version? I'm stuck " -"in a dank shitty brick building with two dozen strangers, the world's dead, " -"and there's not enough food to go around. Why don't you fuckin' figure it " -"out?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, I'm stuck in a dank shitty brick building with two dozen strangers, " @@ -170098,6 +170108,14 @@ msgid "" "to keeping my belly full. People like getting a good haircut." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"You want the sarcastic version, or the really sarcastic version? I'm stuck " +"in a dank shitty brick building with two dozen strangers, the world's dead, " +"and there's not enough food to go around. Why don't you fuckin' figure it " +"out?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -170275,15 +170293,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what " -"we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what " +"we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170638,11 +170656,11 @@ msgid "Just on watch, move along." 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 -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 @@ -170674,11 +170692,11 @@ msgid "Well, I'd better be going. Bye." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome..." +msgid "Welcome marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." +msgid "Welcome..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170906,11 +170924,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Citizen..." +msgid "Marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal..." +msgid "Citizen..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -170968,11 +170986,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Heh, you look important." +msgid "That sure is a shiny badge you got there!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" +msgid "Heh, you look important." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171033,16 +171051,16 @@ msgid "" "doesn't want me here when I'm not selling, but… some people get away with it." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " "down on people like us." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "" @@ -171064,19 +171082,19 @@ msgid "Who needs rebar?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Screw You!" +msgid "As if you're one to talk. Screw You." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." +msgid "Screw You!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh, thought I smelled someone new. Can I help you?" +msgid "I thought I smelled a pig. I jest… please don't arrest me." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -171347,16 +171365,6 @@ msgstr "" msgid "Glad to have you aboard." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -171437,6 +171445,16 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -171711,14 +171729,6 @@ msgstr "" msgid "Keep it civil, merc." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Still plenty of outlaws in the roads, perhaps you should tend to your job, " @@ -171734,10 +171744,11 @@ msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +msgid "Here to trade, I hope?" +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171746,6 +171757,13 @@ msgid "" "fair deal?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Keep safe, then." msgstr "" @@ -171958,7 +171976,7 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" +msgid "Can I help you, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -171966,7 +171984,7 @@ msgid "Morning sir, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" +msgid "Morning ma'am, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172072,11 +172090,11 @@ msgid "Not now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can take a look at you or your companions if you are injured." +msgid "Come back later, I need to take care of a few things first." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." +msgid "I can take a look at you or your companions if you are injured." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172431,11 +172449,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172447,11 +172465,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -190220,6 +190238,33 @@ msgstr "" msgid "Year %1$d, %2$s, day %3$d %4$s" msgstr "" +#: src/cata_string_consts.h +msgid "EFFECTS" +msgstr "" + +#: src/cata_string_consts.h +msgid "ENCUMBRANCE AND WARMTH" +msgstr "" + +#: src/cata_string_consts.h src/newcharacter.cpp +#: src/newcharacter.cpp +msgid "SKILLS" +msgstr "" + +#: src/cata_string_consts.h +msgid "SPEED" +msgstr "" + +#: src/cata_string_consts.h src/newcharacter.cpp +#: src/newcharacter.cpp +msgid "STATS" +msgstr "" + +#: src/cata_string_consts.h src/newcharacter.cpp +#: src/newcharacter.cpp +msgid "TRAITS" +msgstr "" + #: src/cata_tiles.cpp msgid "direct3d" msgstr "" @@ -190652,6 +190697,15 @@ msgstr "" msgid "antlers" msgstr "" +#: src/character.cpp +msgid "You don't have any broken limbs this could help." +msgstr "" + +#: src/character.cpp +#, c-format +msgid "%s doesn't have any broken limbs this could help." +msgstr "" + #: src/character.cpp msgid "You don't have enough arms to wear that." msgstr "" @@ -212850,13 +212904,24 @@ msgstr "" #: src/map.cpp #, c-format -msgid "The %s damages several items!" +msgid "The %s destroys several items!" +msgstr "" + +#. ~ %1$s: the cause of destruction, %2$s: destroyed item name +#: src/map.cpp +#, c-format +msgid "The %1$s destroys the %2$s!" +msgstr "" + +#: src/map.cpp +#, c-format +msgid "The %s damages several items." msgstr "" #. ~ %1$s: the cause of damage, %2$s: damaged item name #: src/map.cpp #, c-format -msgid "The %1$s damages the %2$s!" +msgid "The %1$s damages the %2$s." msgstr "" #: src/map.cpp @@ -219442,21 +219507,6 @@ msgstr "" msgid "PROFESSION" msgstr "" -#: src/newcharacter.cpp -#: src/player_display.cpp -msgid "STATS" -msgstr "" - -#: src/newcharacter.cpp -#: src/player_display.cpp -msgid "TRAITS" -msgstr "" - -#: src/newcharacter.cpp -#: src/player_display.cpp -msgid "SKILLS" -msgstr "" - #: src/newcharacter.cpp msgid "DESCRIPTION" msgstr "" @@ -223229,6 +223279,16 @@ msgid "" "games." msgstr "" +#: src/options.cpp +msgid "Trap Back button" +msgstr "" + +#: src/options.cpp +msgid "" +"If true, the back button will NOT back out of the app and will be passed to " +"the application as SDL_SCANCODE_AC_BACK. Requires restart." +msgstr "" + #: src/options.cpp msgid "Auto-manage virtual keyboard" msgstr "" @@ -224015,6 +224075,11 @@ msgstr "" msgid "[ESCAPE/Q] Cancel" msgstr "" +#: src/overmap_ui.cpp +msgid "" +"You are overburdened, are you sure you want to travel (it may be painful)?" +msgstr "" + #: src/overmap_ui.cpp msgid "Travel to this point?" msgstr "" @@ -225553,18 +225618,6 @@ msgstr "" msgid "You pause for a moment to catch your breath." msgstr "" -#: src/player_display.cpp -msgid "ENCUMBRANCE AND WARMTH" -msgstr "" - -#: src/player_display.cpp -msgid "EFFECTS" -msgstr "" - -#: src/player_display.cpp -msgid "SPEED" -msgstr "" - #: src/player_display.cpp #, c-format msgid "Swimming movement point cost: %+d\n" diff --git a/lang/po/de.po b/lang/po/de.po index 151f59abc51bb..18a7fd14ae32b 100644 --- a/lang/po/de.po +++ b/lang/po/de.po @@ -21,14 +21,15 @@ # MinerMax555 , 2020 # Wuzzy , 2020 # K R, 2020 +# a b , 2020 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" -"Last-Translator: K R, 2020\n" +"Last-Translator: a b , 2020\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" @@ -374,7 +375,7 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "mixed smokeless gunpowder" -msgstr "" +msgstr "gemischtes rauchloses Schießpulver" #. ~ Description for mixed smokeless gunpowder #: lang/json/AMMO_from_json.py @@ -383,28 +384,35 @@ 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 "" +"Schießpulver in Schusswaffenqualität, gemischt ohne Sorge um " +"Zusammensetzung, Abbrennrate oder Form. Es wurde leicht gemahlen, um seine " +"Eigenschaften gleichmäßiger zu machen. Nur der wahrlich Verzweifelte würde " +"versuchen, damit nachzuladen." #: lang/json/AMMO_from_json.py msgid "smokeless shotgun powder" -msgstr "" +msgstr "gemischtes rauchloses Schießpulver für Schrotflinten" #. ~ Description for smokeless shotgun powder #: lang/json/AMMO_from_json.py msgid "Firearm-quality gunpowder, intended for use in shotgun shells." msgstr "" +"Schießpulver in Schusswaffenqualität für den Gebrauch von Hülsen für " +"Schrotflinten." #: lang/json/AMMO_from_json.py msgid "smokeless pistol powder" -msgstr "" +msgstr "rauchfreies Pistolenpulver" #. ~ Description for smokeless pistol powder #: lang/json/AMMO_from_json.py msgid "Firearm-quality gunpowder, intended for use in pistol ammunition." msgstr "" +"Schiesspulver in Schusswaffenqualität für den Gebrauch in Pistolenmunition. " #: lang/json/AMMO_from_json.py msgid "smokeless magnum powder" -msgstr "" +msgstr "rauchschwaches Pulver für Magnum" #. ~ Description for smokeless magnum powder #: lang/json/AMMO_from_json.py @@ -414,25 +422,28 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "smokeless rifle powder" -msgstr "" +msgstr "rauchschwaches Pulver für Gewehre" #. ~ Description for smokeless rifle powder #: lang/json/AMMO_from_json.py msgid "Firearm-quality gunpowder intended for use in rifle ammunition." msgstr "" +"Schießpulver in Schusswaffenqualität für den Gebrauch in Gewehrmunition. " #: lang/json/AMMO_from_json.py msgid "smokeless overbore rifle powder" -msgstr "" +msgstr "rauchschwaches Pulver für Überbohr-Gewehre" #. ~ Description for smokeless overbore rifle powder #: lang/json/AMMO_from_json.py msgid "Firearm-quality gunpowder intended for use in large rifle ammunition." msgstr "" +"Schiesspulver in Schusswaffenqualität für den Gebrauch in " +"Grossgewehrmunition. " #: lang/json/AMMO_from_json.py msgid "artillery propellant" -msgstr "" +msgstr "Artillerie-Treibsatz" #. ~ Description for artillery propellant #: lang/json/AMMO_from_json.py @@ -740,7 +751,7 @@ msgid_plural "oxygen" msgstr[0] "" msgstr[1] "" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Ein Behälter mit Sauerstoff." @@ -820,7 +831,7 @@ msgid_plural "nitrox" msgstr[0] "Nitrox" msgstr[1] "Nitrox" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "" @@ -833,7 +844,7 @@ msgid_plural "tinder" msgstr[0] "Zunder" msgstr[1] "Zunder" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "" @@ -856,7 +867,7 @@ msgid_plural "metal RPG dice" msgstr[0] "Metallener Rollenspiel Würfel" msgstr[1] "Metallene Rollenspiel Würfel" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "" @@ -893,7 +904,7 @@ msgid_plural "sulfur" msgstr[0] "Schwefel" msgstr[1] "Schwefel" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -936,7 +947,7 @@ msgid_plural "limestone" msgstr[0] "Kalkstein" msgstr[1] "Kalkstein" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -953,7 +964,7 @@ msgid_plural "quicklime" msgstr[0] "Branntkalk" msgstr[1] "Branntkalk" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -973,7 +984,7 @@ msgid_plural "sand" msgstr[0] "Sand" msgstr[1] "Sand" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -989,7 +1000,7 @@ msgid_plural "soil" msgstr[0] "Erde" msgstr[1] "Erde" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1025,7 +1036,7 @@ msgid_plural "zinc powder" msgstr[0] "Zinkpulver" msgstr[1] "Zinkpulver" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1040,37 +1051,44 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "zinc oxide" msgid_plural "zinc oxide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Zinkoxid" +msgstr[1] "Zinkoxid" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': '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 "" +"Eine Handvoll Zinkoxid. Es kann in Zink reduziert oder für andere Reaktionen" +" benutzt werden." #: lang/json/AMMO_from_json.py msgid "manganese dioxide" msgid_plural "manganese dioxide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Mangandioxid" +msgstr[1] "Mangandioxid" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "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 "" +"Eine Handvoll Mangandioxidpulver. Natürlich vorkommend in dem Mineral " +"Pyrolusit, wird es kommerziell verwendet in der Produktion von Alkali- und " +"Zink-Carbon-Batterien." #: lang/json/AMMO_from_json.py msgid "potassium chloride" msgid_plural "potassium chloride" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Kaliumchlorid" +msgstr[1] "Kaliumchlorid" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1078,14 +1096,19 @@ msgid "" "saltpeter and hydrochloric acid. It can be used for making fertilizer, or " "potassium hydroxide by way of electrolysis." msgstr "" +"Eine Handvoll Kaliumchlorid. Obwohl es in dem Mineral Sylvin vorkommt, kann " +"es als Nebenprodukt bei der Reaktion von Salpeter und Salzsäure hergestellt " +"werden. Es kann durch Elektrolyse zur Herstellung von Dünger oder " +"Kaliumchlorid verwendet werden" #: lang/json/AMMO_from_json.py msgid "potassium hydroxide" msgid_plural "potassium hydroxide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Kaliumhydroxid" +msgstr[1] "Kaliumhydroxide" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1099,7 +1122,7 @@ msgid_plural "sulfuric acid" msgstr[0] "Schwefelsäure" msgstr[1] "Schwefelsäure" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1151,7 +1174,7 @@ msgid_plural "nitric acid" msgstr[0] "Salpetersäure" msgstr[1] "Salpetersäure" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1267,7 +1290,7 @@ msgid_plural "saltpeter" msgstr[0] "Salpeter" msgstr[1] "Salpeter" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1284,7 +1307,7 @@ msgid_plural "niter" msgstr[0] "Nitrokalit" msgstr[1] "Nitrokalit" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1361,7 +1384,7 @@ msgid_plural "thermite" msgstr[0] "Thermit" msgstr[1] "Thermit" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1420,7 +1443,8 @@ msgid_plural "match head powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1498,7 +1522,7 @@ msgid_plural "soap flakes" msgstr[0] "Seifenflocken" msgstr[1] "Seifenflocken" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "" @@ -1526,7 +1550,7 @@ msgid_plural "wood ashes" msgstr[0] "Holzasche" msgstr[1] "Holzaschen" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1654,7 +1678,7 @@ msgid_plural "lamp oil" msgstr[0] "Lampenöl" msgstr[1] "Lampenöl" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Ein dünnes und leicht entflammbares Öl zur Verwendung in Öllampen." @@ -1665,7 +1689,7 @@ msgid_plural "motor oil" msgstr[0] "Motoröl" msgstr[1] "Motoröl" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "Ein Öl, gemacht zur Verwendung in Fahrzeugmotoren." @@ -1676,7 +1700,7 @@ msgid_plural "napalm" msgstr[0] "Napalm" msgstr[1] "Napalm" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -5119,7 +5143,7 @@ msgid_plural "red paint" msgstr[0] "rote Farbe" msgstr[1] "rote Farbe" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Ein Farbeimer mit roter Farbe." @@ -5141,7 +5165,7 @@ msgid_plural "white paint" msgstr[0] "weiße Farbe" msgstr[1] "weiße Farbe" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Ein Farbeimer mit weißer Farbe." @@ -5163,7 +5187,7 @@ msgid_plural "purple paint" msgstr[0] "violette Farbe" msgstr[1] "violette Farbe" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Ein Farbeimer mit violetter Farbe." @@ -5174,7 +5198,7 @@ msgid_plural "yellow paint" msgstr[0] "gelbe Farbe" msgstr[1] "gelbe Farbe" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Ein Farbeimer mit gelber Farbe." @@ -5246,7 +5270,7 @@ msgstr[0] "Gold" msgstr[1] "Gold" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5267,7 +5291,7 @@ msgid_plural "zinc" msgstr[0] "" msgstr[1] "" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5282,7 +5306,7 @@ msgid_plural "lead" msgstr[0] "Blei" msgstr[1] "Blei" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5298,7 +5322,7 @@ msgid_plural "magnesium powder" msgstr[0] "Magnesiumpulver" msgstr[1] "Magnesiumpulver" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5314,7 +5338,7 @@ msgid_plural "silver" msgstr[0] "Silber" msgstr[1] "Silber" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5501,7 +5525,7 @@ msgid_plural "leather scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5514,7 +5538,7 @@ msgid_plural "lycra scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5527,7 +5551,7 @@ msgid_plural "neoprene scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5540,7 +5564,8 @@ msgid_plural "synthetic fabric scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5577,7 +5602,8 @@ msgid_plural "patchwork cotton clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5600,7 +5626,8 @@ msgid_plural "patchwork faux fur clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5623,7 +5650,8 @@ msgid_plural "patchwork felt clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5659,7 +5687,8 @@ msgid_plural "patchwork lycra clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5686,7 +5715,8 @@ msgid_plural "patchwork neoprene clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5712,7 +5742,8 @@ msgid_plural "patchwork Nomex clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5735,7 +5766,8 @@ msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -7723,12 +7755,14 @@ msgstr[0] "Munitionsumhängetasche" msgstr[1] "Munitionsumhängetaschen" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -7743,7 +7777,8 @@ msgstr[1] "Munitionsumhängetaschen" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -7752,11 +7787,14 @@ msgid "You stash your %s." msgstr "Du lagerst ein: %s." #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -7791,7 +7829,8 @@ msgid_plural "chest ammo pouches" msgstr[0] "Munitionsbauchtasche" msgstr[1] "Munitionsbauchtaschen" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -7806,7 +7845,7 @@ msgid_plural "chest rig" msgstr[0] "" msgstr[1] "" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -7821,12 +7860,13 @@ msgid_plural "javelin bags" msgstr[0] "Wurfspeertasche" msgstr[1] "Wurfspeertaschen" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "Wurfspeere einlagern" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -7856,7 +7896,7 @@ msgid_plural "leg ammo pouches" msgstr[0] "Munitionsbeintasche" msgstr[1] "Munitionsbeintaschen" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -8073,7 +8113,8 @@ msgid_plural "pairs of 2-by-arm guards" msgstr[0] "Paar Brettarmschienen" msgstr[1] "Paar Brettarmschienen" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -8391,7 +8432,7 @@ msgid_plural "grenade pouches" msgstr[0] "Granatenumhängetasche" msgstr[1] "Granatenumhängetaschen" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -8419,12 +8460,14 @@ msgid_plural "large grenade pouches" msgstr[0] "große Granatenumhängetasche" msgstr[1] "große Granatenumhängetaschen" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "Granaten einlagern" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "Eine Tasche für bis zu vier vollwertige Granaten verschiedener Typen." @@ -8883,6 +8926,8 @@ msgid_plural "pairs of armored boots" msgstr[0] "Paar Panzerstiefel" msgstr[1] "Paar Panzerstiefel" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -8991,6 +9036,8 @@ msgid_plural "pairs of XL survivor boots" msgstr[0] "Paar große Überlebendenstiefel" msgstr[1] "Paar große Überlebendenstiefel" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -9467,7 +9514,8 @@ msgid_plural "pairs of ankle socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -10921,7 +10969,8 @@ msgid_plural "pairs of armored fingerless gloves" msgstr[0] "Paar verstärkte Halbfingerhandschuhe" msgstr[1] "Paar verstärkte Halbfingerhandschuhe" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -11258,7 +11307,8 @@ msgid_plural "pairs of XL survivor gloves" msgstr[0] "Paar große Überlebendenhandschuhe" msgstr[1] "Paar große Überlebendenhandschuhe" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -11645,7 +11695,7 @@ msgid_plural "kippahs" msgstr[0] "Kippah" msgstr[1] "Kippahs" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "" @@ -11658,7 +11708,7 @@ msgid_plural "kufi caps" msgstr[0] "Kufimütze" msgstr[1] "Kufimützen" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Eine randlose kurze und gerundete Mütze." @@ -11996,7 +12046,7 @@ msgid_plural "galeae" msgstr[0] "Galea" msgstr[1] "Galeae" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -12731,7 +12781,7 @@ msgid_plural "diver's watches" msgstr[0] "Taucheruhr" msgstr[1] "Taucheruhren" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -16688,7 +16738,8 @@ msgid_plural "pairs of 2-by-shin guards" msgstr[0] "Paar Brettschienbeinschoner" msgstr[1] "Paar Brettschienbeinschoner" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -16721,7 +16772,8 @@ msgid_plural "pairs of chainmail leggings" msgstr[0] "Paar Kettenpanzerbeinlinge" msgstr[1] "Paar Kettenpanzerbeinlinge" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -16734,7 +16786,7 @@ msgid_plural "leather chaps" msgstr[0] "Leder-Chaps" msgstr[1] "Leder-Chaps" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -16749,7 +16801,7 @@ msgid_plural "fencing pants" msgstr[0] "Fechthose" msgstr[1] "Fechthosen" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" @@ -16849,7 +16901,8 @@ msgid_plural "light survivor cargo pants" msgstr[0] "leichte Überlebendencargohose" msgstr[1] "leichte Überlebendencargohosen" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -16864,7 +16917,8 @@ msgid_plural "pairs of motorcycle pants" msgstr[0] "Motorradfahrerhose" msgstr[1] "Motorradfahrerhosen" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "Eine Hose, die für Geländeradfahrer und Motorradfahrer gemacht ist." @@ -16903,7 +16957,7 @@ msgid_plural "breeches" msgstr[0] "Breeches" msgstr[1] "Breeches" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -16931,7 +16985,7 @@ msgid_plural "hot pants" msgstr[0] "Hotpants" msgstr[1] "Hotpants" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "Einfache kurze Shorts." @@ -16942,7 +16996,7 @@ msgid_plural "fur hot pants" msgstr[0] "Pelz-Hotpants" msgstr[1] "Pelz-Hotpants" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "Einfache pelzige kurze Shorts." @@ -16953,7 +17007,8 @@ msgid_plural "leather hot pants" msgstr[0] "Leder-Hotpants" msgstr[1] "Leder-Hotpants" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "Einfache lederne kurze Shorts." @@ -16964,7 +17019,7 @@ msgid_plural "jeans" msgstr[0] "Jeans" msgstr[1] "Jeans" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "Eine Bluejeans mit zwei tiefen Taschen." @@ -17006,7 +17061,7 @@ msgid_plural "leggings" msgstr[0] "Leggings" msgstr[1] "Leggings" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -17138,7 +17193,7 @@ msgid_plural "fur pants" msgstr[0] "Pelzhose" msgstr[1] "Pelzhosen" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Eine starke pelzgefütterte Hose." @@ -17160,7 +17215,7 @@ msgid_plural "leather pants" msgstr[0] "Lederhose" msgstr[1] "Lederhosen" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -17186,7 +17241,8 @@ msgid_plural "mail carrier shorts" msgstr[0] "Briefträgershorts" msgstr[1] "Briefträgershorts" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "Eine dunkelblaue Shorts, so wie sie von Briefträgern benutzt wird." @@ -17208,7 +17264,7 @@ msgid_plural "cargo shorts" msgstr[0] "Cargoshorts" msgstr[1] "Cargoshorts" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "Shorts mit Taschen, die akzeptablen Lagerplatz bieten." @@ -17219,7 +17275,7 @@ msgid_plural "denim shorts" msgstr[0] "kurze Jeanshose" msgstr[1] "kurze Jeanshosen" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -17371,17 +17427,20 @@ msgid_plural "bondage masks (zipped)" msgstr[0] "Bondage-Maske (geschlossen)" msgstr[1] "Bondage-Masken (geschlossen)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Aufziehen" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "Du öffnest die Augen und den Mund der Bondage-Maske." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -18352,7 +18411,7 @@ msgid_plural "leather pouches" msgstr[0] "Lederbeutel" msgstr[1] "Lederbeutel" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -19588,7 +19647,8 @@ msgid_plural "lorica segmentata" msgstr[0] "Lorica Segmentata" msgstr[1] "Lorica Segmentata" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -19642,7 +19702,7 @@ msgid_plural "cuirasses" msgstr[0] "Kürass" msgstr[1] "Kürasse" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -20379,7 +20439,8 @@ msgid_plural "pairs of arm warmers" msgstr[0] "Paar Armwärmer" msgstr[1] "Paar Armwärmer" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "Enge, weiche Stoffärmel zum Warmhalten deiner Arme." @@ -20472,7 +20533,7 @@ msgid_plural "boy shorts" msgstr[0] "Boyshorts" msgstr[1] "Boyshorts" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -20500,7 +20561,7 @@ msgid_plural "briefs" msgstr[0] "Unterhose" msgstr[1] "Unterhosen" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "" @@ -20632,7 +20693,8 @@ msgid_plural "pairs of XL leg warmers" msgstr[0] "Paar große Beinwärmer" msgstr[1] "Paar große Beinwärmer" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -20766,7 +20828,8 @@ msgid_plural "compression shorts" msgstr[0] "Kompressionsshorts" msgstr[1] "Kompressionsshorts" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -22105,7 +22168,7 @@ msgid_plural "test batteries" msgstr[0] "" msgstr[1] "" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -22987,7 +23050,8 @@ msgid_plural "Power Storage CBM Mk. II" msgstr[0] "" msgstr[1] "" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -24959,19 +25023,19 @@ msgstr[1] "" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -28239,8 +28303,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Modern Rifleman" msgid_plural "issues of Modern Rifleman" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Moderner Schütze " +msgstr[1] "Ausgaben von Moderner Schütze " #. ~ Description for {'str': 'Modern Rifleman', 'str_pl': 'issues of Modern #. Rifleman'} @@ -28271,8 +28335,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Trap and Field" msgid_plural "issues of Trap and Field" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Falle und Flur" +msgstr[1] "Ausgaben von Falle und Flur" #. ~ Description for {'str': 'Trap and Field', 'str_pl': 'issues of Trap and #. Field'} @@ -28287,8 +28351,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Shotguns: The Art and Science" msgid_plural "copies of Shotguns: The Art and Science" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Flinten: Die Kunst und Wissenschaft" +msgstr[1] "Exemplare von Flinten: Die Kunst und Wissenschaft" #. ~ Description for {'str': 'Shotguns: The Art and Science', 'str_pl': #. 'copies of Shotguns: The Art and Science'} @@ -28304,8 +28368,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Submachine Gun Enthusiast" msgid_plural "issues of Submachine Gun Enthusiast" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Maschinenpistolen-Enthusiast" +msgstr[1] "Ausgaben von Maschinenpistolen-Enthusiast" #. ~ Description for {'str': 'Submachine Gun Enthusiast', 'str_pl': 'issues of #. Submachine Gun Enthusiast'} @@ -28320,8 +28384,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "The Submachine Gun Handbook" msgid_plural "copies of The Submachine Gun Handbook" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Das Maschinenpistolen-Handbuch" +msgstr[1] "Exemplare von Das Maschinenpistolen-Handbuch" #. ~ Description for {'str': 'The Submachine Gun Handbook', 'str_pl': 'copies #. of The Submachine Gun Handbook'} @@ -28331,6 +28395,10 @@ msgid "" "machine pistols and submachine guns currently used by regular armed and " "reserve forces, as well as several obsolete weapons." msgstr "" +"Dieser knappe Führer beschreibt ausführlich die richtige Instandhaltung und " +"Benutzung der meisten Arten von Maschinenpistolen, welche momentan von " +"normalen Streitkräften und Reservestreitkräften benutzt werden, sowie " +"diverse obsolete Waffen." #: lang/json/BOOK_from_json.py msgid "US Weekly" @@ -28361,8 +28429,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Principles of Effective Communication" msgid_plural "copies of Principles of Effective Communication" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Prinzipien der effektiven Kommunikation" +msgstr[1] "Exemplare von Prinzipien der effektiven Kommunikation" #. ~ Description for {'str': 'Principles of Effective Communication', #. 'str_pl': 'copies of Principles of Effective Communication'} @@ -28375,8 +28443,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Dungeon Master's Guide: 6th Edition" msgid_plural "copies of Dungeon Master's Guide: 6th Edition" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Dungeon-Master-Führer: 6. Edition" +msgstr[1] "Exemplare von Dungeon-Master-Führer: 6. Edition" #. ~ Description for {'str': "Dungeon Master's Guide: 6th Edition", 'str_pl': #. "copies of Dungeon Master's Guide: 6th Edition"} @@ -28442,8 +28510,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Through the Lens" msgid_plural "copies of Through the Lens" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Durch das Objektiv" +msgstr[1] "Exemplare von Durch das Objektiv" #. ~ Description for {'str': 'Through the Lens', 'str_pl': 'copies of Through #. the Lens'} @@ -28478,8 +28546,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Outdoor Adventures" msgid_plural "issues of Outdoor Adventures" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Abenteuer im Freien" +msgstr[1] "Ausgaben von Abenteuer im Freien" #. ~ Description for {'str': 'Outdoor Adventures', 'str_pl': 'issues of #. Outdoor Adventures'} @@ -28526,8 +28594,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Autobiography of a Mountain Man" msgid_plural "copies of Autobiography of a Mountain Man" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Autobiografie eines Manns aus den Bergen" +msgstr[1] "Exemplare von Autobiografie eines Manns aus den Bergen" #. ~ Description for {'str': 'Autobiography of a Mountain Man', 'str_pl': #. 'copies of Autobiography of a Mountain Man'} @@ -28544,8 +28612,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Outdoor Survival Guide" msgid_plural "copies of Outdoor Survival Guide" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Überleben im Freien" +msgstr[1] "Exemplare von Überleben im Freien" #. ~ Description for {'str': 'Outdoor Survival Guide', 'str_pl': 'copies of #. Outdoor Survival Guide'} @@ -28561,8 +28629,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Natural Remedies of New England" msgid_plural "copies of Natural Remedies of New England" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Naturheilmittel Neuenglands" +msgstr[1] "Exemplare von Naturheilmittel Neuenglands" #. ~ Description for {'str': 'Natural Remedies of New England', 'str_pl': #. 'copies of Natural Remedies of New England'} @@ -28571,12 +28639,14 @@ msgid "" "A leather bound manuscript, it features native herbal remedies with hand " "colored illustrations of each plant." msgstr "" +"Eine in Leder gebundene Handschrift, die über natürliche Kräuterheilmittel " +"berichtet mit hand­ko­lo­rierten Illustrationen jeder Pflanze. " #: lang/json/BOOK_from_json.py msgid "Swim Planet" msgid_plural "issues of Swim Planet" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Schwimm-Planet" +msgstr[1] "Ausgaben von Schwimm-Planet" #. ~ Description for {'str': 'Swim Planet', 'str_pl': 'issues of Swim Planet'} #: lang/json/BOOK_from_json.py @@ -28586,8 +28656,8 @@ msgstr "Die weltweit führende Quelle über Wassersport." #: lang/json/BOOK_from_json.py msgid "Water Survival Training Field Manual" msgid_plural "copies of Water Survival Training Field Manual" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Wasserüberlebenstrainingsfelddienstvorschrift" +msgstr[1] "Exemplare von Wasserüberlebenstrainingsfelddienstvorschrift" #. ~ Description for {'str': 'Water Survival Training Field Manual', 'str_pl': #. 'copies of Water Survival Training Field Manual'} @@ -28654,8 +28724,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Sew What? Clothing!" msgid_plural "copies of Sew What? Clothing!" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Was nähen? Kleidung!" +msgstr[1] "Exemplare von Was nähen? Kleidung!" #. ~ Description for {'str': 'Sew What? Clothing!', 'str_pl': 'copies of Sew #. What? Clothing!'} @@ -28683,20 +28753,22 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Traditional Japanese Kimono" msgid_plural "copies of Traditional Japanese Kimono" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Traditioneller Japanischer Kimono" +msgstr[1] "Exemplare von Traditioneller Japanischer Kimono" #. ~ Description for {'str': 'Traditional Japanese Kimono', 'str_pl': 'copies #. of Traditional Japanese Kimono'} #: lang/json/BOOK_from_json.py msgid "An illustrated textbook on the crafting of Japanese traditional garb." msgstr "" +"Ein illustriertes Lehrbuch über das Schneidern japanischer " +"Traditionskleidung." #: lang/json/BOOK_from_json.py msgid "Friendly, Humane Fashion" msgid_plural "copies of Friendly, Humane Fashion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Tierfreundliche, humane Mode" +msgstr[1] "Exemplare von Tierfreundliche, humane Mode" #. ~ Description for {'str': 'Friendly, Humane Fashion', 'str_pl': 'copies of #. Friendly, Humane Fashion'} @@ -28715,8 +28787,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Sewing Techniques for Designers" msgid_plural "copies of Sewing Techniques for Designers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nähtechniken für Designer" +msgstr[1] "Exemplare von Nähtechniken für Designer" #. ~ Description for {'str': 'Sewing Techniques for Designers', 'str_pl': #. 'copies of Sewing Techniques for Designers'} @@ -28731,8 +28803,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Diskobolus" msgid_plural "issues of Diskobolus" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Diskuswerfer" +msgstr[1] "Ausgaben von Diskuswerfer" #. ~ Description for {'str': 'Diskobolus', 'str_pl': 'issues of Diskobolus'} #: lang/json/BOOK_from_json.py @@ -28744,8 +28816,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "The Complete Guide to Pitching" msgid_plural "copies of The Complete Guide to Pitching" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Der vollständige Pitch-Führer" +msgstr[1] "Exemplare von Der vollständige Pitch-Führer" #. ~ Description for {'str': 'The Complete Guide to Pitching', 'str_pl': #. 'copies of The Complete Guide to Pitching'} @@ -28761,8 +28833,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "How to Trap Anything" msgid_plural "copies of How to Trap Anything" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Wie man Sachen fängt" +msgstr[1] "Exemplare von Wie man Sachen fängt" #. ~ Description for {'str': 'How to Trap Anything', 'str_pl': 'copies of How #. to Trap Anything'} @@ -28776,8 +28848,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "Trapper's Life" msgid_plural "issues of Trapper's Life" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Leben des Fallenstellers" +msgstr[1] "Ausgaben von Leben des Fallenstellers" #. ~ Description for {'str': "Trapper's Life", 'str_pl': "issues of Trapper's #. Life"} @@ -28792,8 +28864,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "The Modern Trapper" msgid_plural "copies of The Modern Trapper" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Der moderne Fallensteller" +msgstr[1] "Exemplare von Der moderne Fallensteller" #. ~ Description for {'str': 'The Modern Trapper', 'str_pl': 'copies of The #. Modern Trapper'} @@ -28808,8 +28880,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "The Compleat Trapper" msgid_plural "copies of The Compleat Trapper" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Fallenstellen vollständig erklärt" +msgstr[1] "Exemplare von Fallenstellen vollständig erklärt" #. ~ Description for {'//~': 'The spelling is intentionally archaic, as this #. form is commonly used in the titles of books.', 'str': 'The Compleat @@ -28858,8 +28930,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "101 Wrestling Moves" msgid_plural "copies of 101 Wrestling Moves" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "101 Ringmanöver" +msgstr[1] "Exemplare von 101 Ringmanöver" #. ~ Description for {'str': '101 Wrestling Moves', 'str_pl': 'copies of 101 #. Wrestling Moves'} @@ -28869,6 +28941,9 @@ msgid "" "spiral-bound paper. Still, there are lots of useful tips for unarmed " "combat." msgstr "" +"Es scheint ein Handbuch für Ringer zu sein, schlecht fotokopiert und auf " +"spiralgebundenem Papier veröffentlicht. Trotzdem enthält es viele nützliche " +"Tipps für den unbewaffneten Kampf." #: lang/json/BOOK_from_json.py msgid "readable magazine" @@ -28879,8 +28954,8 @@ msgstr[1] "" #: lang/json/BOOK_from_json.py msgid "original copy of Housefly" msgid_plural "original copies of Housefly" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Originalexemplar von Stubenfliege" +msgstr[1] "Originalexemplare von Stubenfliege" #. ~ Description for {'str': 'original copy of Housefly', 'str_pl': 'original #. copies of Housefly'} @@ -28891,6 +28966,12 @@ msgid "" "Victoria from a mysterious threat. You never got to publish it, but reading" " it lets you forget the horrors of the Cataclysm, if only for a moment." msgstr "" +"Das einzige Exemplar von Stubenfliege, das existiert - ein langes Buch über " +"drei Individuen, die das Schicksal in den frühen Jahren des 18. Jahrhunderts" +" zusammengeführt hat, um ihr englisches Dorf Victoria vor einer mysteriösen " +"Bedrohung zu retten. Du hattest nie die Möglichkeit es zu veröffentlichen, " +"aber es zu lesen lässt dich die Schrecken der Katastrophe vergessen, wenn " +"auch nur für einen Augenblick." #: lang/json/BOOK_from_json.py msgid "USMC M1014 technical manual" @@ -28927,8 +29008,8 @@ msgstr "" #: lang/json/BOOK_from_json.py msgid "America's Rifle" msgid_plural "copies of America's Rifle" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Amerikas Gewehr" +msgstr[1] "Exemplare von Amerikas Gewehr" #. ~ Description for {'str': "America's Rifle", 'str_pl': "copies of America's #. Rifle"} @@ -28939,12 +29020,16 @@ msgid "" " of the M1 Garand rifle's use throughout history as well as its design and " "quirks with the weapon." msgstr "" +"Ein von einem anonymen Autor niedergeschriebenes Geschichtsbuch. Beginnend " +"beim Design von John Garand und endend beim Vietnamkrieg bietet es eine " +"detaillierte Zusammenfassung der Verwendung des M1-Garand-Gewehrs durch die " +"Geschichte ebenso wie seine Bauart und Merkwürdigkeiten mit der Waffe." #: lang/json/BOOK_from_json.py msgid "Jane's Flamethrowers and Firestarters" msgid_plural "copies of Jane's Flamethrowers and Firestarters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Janes Flammenwerfer und Brandstifter" +msgstr[1] "Exemplare von Janes Flammenwerfer und Brandstifter" #. ~ Description for {'str': "Jane's Flamethrowers and Firestarters", #. 'str_pl': "copies of Jane's Flamethrowers and Firestarters"} @@ -28955,12 +29040,16 @@ msgid "" "Mortars and Rocket Launchers, and so it's mostly incomprehensible to anyone " "without prior knowledge." msgstr "" +"Ein detaillierter, voll kolorierter Führer über Flammenwerfer, Brand legende" +" Waffen und Napalm. Er baut auf den in seinem Schwesterbuch Janes Mörser und" +" Raketenwerfer zur Verfügung gestellten Informationen auf und ist deshalb " +"größtenteils unverständlich für jeden ohne jenes Vorwissen. " #: lang/json/BOOK_from_json.py msgid "Nuclear Physics Made Easy" msgid_plural "copies of Nuclear Physics Made Easy" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Kernphysik leichtgemacht" +msgstr[1] "Exemplare von Kernphysik leichtgemacht" #. ~ Description for {'str': 'Nuclear Physics Made Easy', 'str_pl': 'copies of #. Nuclear Physics Made Easy'} @@ -28969,12 +29058,14 @@ msgid "" "A book detailing the workings of state of the art atomic technology, and the" " physics behind it." msgstr "" +"Ein Buch, welches im Detail die Funktionsweise der hochmodernen Atomtechnik " +"sowie der Physik dahinter beschreibt." #: lang/json/BOOK_from_json.py msgid "Case #5846, Illegal Gun Modification" msgid_plural "copies of Case #5846, Illegal Gun Modification" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Fall Nr. 5846: Illegale Waffenmodifikation" +msgstr[1] "Exemplare von Fall Nr. 5846: Illegale Waffenmodifikation" #. ~ Description for {'str': 'Case #5846, Illegal Gun Modification', 'str_pl': #. 'copies of Case #5846, Illegal Gun Modification'} @@ -29459,7 +29550,8 @@ msgid_plural "commercial fertilizer" msgstr[0] "Handelsdünger" msgstr[1] "Handelsdünger" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "Nährstoffreiches Granulat für Pflanzen." @@ -29550,7 +29642,8 @@ msgid_plural "concentrated acid" msgstr[0] "konzentrierte Säure" msgstr[1] "konzentrierte Säure" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Konzentrierte Säure. Trink’s nicht." @@ -30331,7 +30424,7 @@ msgid_plural "cheap whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -30837,7 +30930,7 @@ msgid_plural "cooked fish" msgstr[0] "gekochter Fisch" msgstr[1] "gekochte Fische" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "Ein frisch gekochter Fisch. Sehr nahrhaft." @@ -30925,7 +31018,7 @@ msgid_plural "chunks of meat" msgstr[0] "Fleischstück" msgstr[1] "Fleischstücke" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -30954,7 +31047,8 @@ msgid_plural "chunks of mutant meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -31085,7 +31179,7 @@ msgid_plural "cooked offal" msgstr[0] "gekochte Innereien" msgstr[1] "gekochte Innereien" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -31263,7 +31357,8 @@ msgid_plural "cooked pieces of lung" msgstr[0] "gekochtes Lungenstück" msgstr[1] "gekochte Lungenstücke" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -31324,7 +31419,7 @@ msgid_plural "cooked brains" msgstr[0] "gekochtes Gehirn" msgstr[1] "gekochte Gehirne" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -31443,7 +31538,8 @@ msgid_plural "chunks of mutant fat" msgstr[0] "Mutantenfettklumpen" msgstr[1] "Mutantenfettklumpen" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -31531,7 +31627,8 @@ msgid_plural "chunks of tainted meat" msgstr[0] "verpestetes Fleischstück" msgstr[1] "verpestete Fleischstücke" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -32091,7 +32188,7 @@ msgid_plural "chamomile tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -32118,7 +32215,7 @@ msgid_plural "coffee" msgstr[0] "Kaffee" msgstr[1] "Kaffee" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -32136,7 +32233,8 @@ msgid_plural "coffee substitute" msgstr[0] "" msgstr[1] "" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -32150,7 +32248,7 @@ msgid_plural "chicory brew" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -32565,7 +32663,7 @@ msgid_plural "clean water" msgstr[0] "klares Wasser" msgstr[1] "klares Wasser" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "" @@ -33094,7 +33192,8 @@ msgid_plural "cooked strawberries" msgstr[0] "gekochte Erdbeere" msgstr[1] "gekochte Erdbeeren" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "Es ist wie Erdbeermarmelarde, nur ohne Zucker." @@ -33114,7 +33213,8 @@ msgid_plural "cooked blueberries" msgstr[0] "gekochte Blaubeere" msgstr[1] "gekochte Blaubeeren" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "Das ist wie Blaubeermarmelade, nur ohne Zucker." @@ -33988,18 +34088,18 @@ msgid_plural "chocolate candies" msgstr[0] "Schokosüßigkeit" msgstr[1] "Schokosüßigkeiten" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "Eine Handvoll bunte Süßigkeiten mit Schokolade Füllung." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "Kausüßigkeit" -msgstr[1] "Kausüßigkeiten" +msgid_plural "chewy candy" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "Eine Handvoll bunte Kausüßigkeiten mit Frucht-Aromen." @@ -34249,7 +34349,7 @@ msgid_plural "cheese nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -34382,7 +34482,7 @@ msgid_plural "chili dogs" msgstr[0] "Chili Dogs" msgstr[1] "Chili Dogs" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Ein Hot Dog mit Chili con Carne als Garnierung. Mjam!" @@ -34421,7 +34521,8 @@ msgid_plural "chocolate pancakes" msgstr[0] "Schokopfannkuchen" msgstr[1] "Schokopfannkuchen" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -34458,7 +34559,7 @@ msgid_plural "cheese fries" msgstr[0] "Käsepommes" msgstr[1] "Käsepommes" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "Gebratene Kartoffeln, die mit leckerem Käse bedeckt wurden." @@ -34501,11 +34602,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "gekochter Hot Dog" -msgstr[1] "ungekochter Hot Dog" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -35063,21 +35162,23 @@ msgid_plural "chilis con carne" msgstr[0] "Chili con Carne" msgstr[1] "Chili con Carne" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "" @@ -36012,7 +36113,7 @@ msgid_plural "cocaine" msgstr[0] "Kokain" msgstr[1] "Kokain" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -36193,7 +36294,7 @@ msgid_plural "chewing gum" msgstr[0] "Kaugummi" msgstr[1] "Kaugummi" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "Hellrosa Kaugummi. Zuckerhaltig, süß und schlecht für deine Zähne." @@ -38364,7 +38465,7 @@ msgid_plural "chitin powder" msgstr[0] "Chitinpulver" msgstr[1] "Chitinpulver" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -38425,7 +38526,7 @@ msgid_plural "cooked beans" msgstr[0] "gekochte Bohnen" msgstr[1] "gekochte Bohnen" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "Eine herzhafte Portion gekochter Bohnen." @@ -38503,7 +38604,7 @@ msgid_plural "cooked lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "" @@ -38514,7 +38615,7 @@ msgid_plural "coffee powder" msgstr[0] "Kaffeepulver" msgstr[1] "Kaffeepulver" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -40205,7 +40306,7 @@ msgid_plural "chicory seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "" @@ -40290,7 +40391,8 @@ msgid_plural "chili pepper seeds" msgstr[0] "Chilipfeffersamen" msgstr[1] "Chilipfeffersamen" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Einige Chilipfeffersamen." @@ -40661,7 +40763,7 @@ msgid_plural "coffee beans" msgstr[0] "Kaffeebohnen" msgstr[1] "Kaffeebohnen" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Einige Kaffeebohnen, können geröstet werden." @@ -40683,7 +40785,7 @@ msgid_plural "chamomile seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "" @@ -41010,11 +41112,9 @@ msgstr "Ein Stängel Thymian. Riecht lecker." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "gekochter Rohrkolbenstängel" -msgstr[1] "gekochte Rohrkolbenstängel" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -41044,7 +41144,8 @@ msgid_plural "cooked dandelion greens" msgstr[0] "gekochtes Löwenzahngrünzeug" msgstr[1] "gekochtes Löwenzahngrünzeug" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Gekochte Blätter von wildem Löwenzahn. Lecker und nahrhaft." @@ -41079,7 +41180,8 @@ msgid_plural "cooked wild vegetables" msgstr[0] "gekochtes Wildgemüse" msgstr[1] "gekochtes Wildgemüse" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "" @@ -41104,7 +41206,7 @@ msgid_plural "cooked buckwheat" msgstr[0] "gekochter Buchweizen" msgstr[1] "gekochte Buchweizen" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -41158,7 +41260,7 @@ msgid_plural "cooked rice" msgstr[0] "gekochter Reis" msgstr[1] "gekochter Reis" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Ein herzhaftes Gericht aus gegartem weißen Langkornreis." @@ -41791,9 +41893,11 @@ msgstr "Eine leckere Pizza mit geschmolzenem Käse." #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "Müsli" +msgid_plural "granola" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -44611,7 +44715,7 @@ msgid_plural "rock salt" msgstr[0] "Steinsalz" msgstr[1] "Steinsalz" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "" @@ -44623,7 +44727,7 @@ msgid_plural "rhodonite" msgstr[0] "" msgstr[1] "" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -44636,7 +44740,7 @@ msgid_plural "zincite" msgstr[0] "" msgstr[1] "" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -44853,7 +44957,8 @@ msgid_plural "semi ground grains" msgstr[0] "" msgstr[1] "" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "" @@ -44864,7 +44969,8 @@ msgid_plural "smoldering embers" msgstr[0] "schwelende Glut" msgstr[1] "schwelende Glut" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -44899,7 +45005,7 @@ msgid_plural "coins" msgstr[0] "Münze" msgstr[1] "Münzen" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -44929,19 +45035,27 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "nahes Feuer" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "Muskelkraft" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -44955,6 +45069,15 @@ msgid_plural "none" msgstr[0] "" msgstr[1] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -45053,7 +45176,7 @@ msgid_plural "leather patches" msgstr[0] "Lederflicken" msgstr[1] "Lederflicken" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "" @@ -45065,7 +45188,7 @@ msgid_plural "felt patches" msgstr[0] "Filzflicken" msgstr[1] "Filzflicken" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "" @@ -45157,7 +45280,8 @@ msgid_plural "ceramic disks" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -45468,7 +45592,7 @@ msgid_plural "concrete" msgstr[0] "Beton" msgstr[1] "Beton" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "Etwas Beton, bereit, um in einem Bauprojekt verwendet zu werden." @@ -45509,7 +45633,7 @@ msgid_plural "dead flares" msgstr[0] "ausgebrannte Leuchtfackel" msgstr[1] "ausgebrannte Leuchtfackeln" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "Dies ist eine verbrauchte Leuchtfackel. Sie ist praktisch Müll." @@ -46080,7 +46204,8 @@ msgid_plural "high-quality lenses" msgstr[0] "Qualitätslinse" msgstr[1] "Qualitätslinsen" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -46095,7 +46220,8 @@ msgid_plural "small high-quality lenses" msgstr[0] "kleine Qualitätslinse" msgstr[1] "kleine Qualitätslinsen" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -46110,7 +46236,8 @@ msgid_plural "pairs of tinted glass" msgstr[0] "Paar getönte Gläser" msgstr[1] "Paar getönte Gläser" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -46273,7 +46400,7 @@ msgid_plural "fish bowls" msgstr[0] "Fischglas" msgstr[1] "Fischgläser" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -46628,7 +46755,7 @@ msgid_plural "lumps of clay" msgstr[0] "Tonklumpen" msgstr[1] "Tonklumpen" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Ein frisches Stück Ton. Nützlich in ein einigen Fertigungsrezepten." @@ -46650,7 +46777,7 @@ msgid_plural "mortar" msgstr[0] "Mörtel" msgstr[1] "Mörtel" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "Etwas Mörtel, bereit, um in einem Bauprojekt verwendet zu werden." @@ -46661,17 +46788,17 @@ msgid_plural "soft adobe bricks" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -46905,7 +47032,7 @@ msgid_plural "cured hides" msgstr[0] "gepökelte Tierhaut" msgstr[1] "gepökelte Tierhäute" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46922,7 +47049,7 @@ msgid_plural "tanned hides" msgstr[0] "gegerbte Tierhaut" msgstr[1] "gegerbte Tierhäute" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -46937,7 +47064,7 @@ msgid_plural "cured pelts" msgstr[0] "gepökeltes Fell" msgstr[1] "gepökelte Felle" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46954,7 +47081,7 @@ msgid_plural "tanned pelts" msgstr[0] "gegerbtes Fell" msgstr[1] "gegerbte Felle" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -46970,7 +47097,7 @@ msgid_plural "piles of straw" msgstr[0] "Strohhaufen" msgstr[1] "Strohhaufen" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -46985,7 +47112,7 @@ msgid_plural "straw dolls" msgstr[0] "Strohpuppe" msgstr[1] "Strohpuppen" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "Alte Strohpuppe. Stellt eine Frau in einem Kleid dar." @@ -47151,7 +47278,7 @@ msgid_plural "joint roaches" msgstr[0] "Jointstummel" msgstr[1] "Jointstummel" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -47347,7 +47474,7 @@ msgid_plural "refrigerant tanks" msgstr[0] "Kältemitteltank" msgstr[1] "Kältemitteltanks" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -47581,7 +47708,7 @@ msgid_plural "flyers" msgstr[0] "Flyer" msgstr[1] "Flyer" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "Ein Papierfetzen." @@ -47592,7 +47719,7 @@ msgid_plural "survivor's notes" msgstr[0] "Notiz eines Überlebenden" msgstr[1] "Überlebenden-Notizen" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -47618,7 +47745,7 @@ msgid_plural "score cards" msgstr[0] "" msgstr[1] "" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "" @@ -47629,7 +47756,7 @@ msgid_plural "newspaper pages" msgstr[0] "Zeitungsseite" msgstr[1] "Zeitungsseiten" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -47642,7 +47769,7 @@ msgstr "" "Die meisten Informationen darauf sind furchtbar trivial oder veraltet, aber " "eine Sache erregt kurz deine Aufmerksamkeit." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -47655,7 +47782,7 @@ msgstr "" "meisten Informationen darauf sind furchtbar trivial oder veraltet, aber eine" " Sache erregt kurz deine Aufmerksamkeit." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -47667,7 +47794,7 @@ msgstr "" "Informationen darauf sind furchtbar trivial oder veraltet, aber eine Sache " "erregt kurz deine Aufmerksamkeit." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -47678,7 +47805,7 @@ msgstr "" "gedruckt. Die meisten Informationen darauf sind furchtbar trivial oder " "veraltet, aber eine Sache erregt kurz deine Aufmerksamkeit." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -47689,7 +47816,7 @@ msgstr "" "Katastrophe gedruckt. Die meisten Informationen darauf sind furchtbar " "trivial oder veraltet, aber eine Sache erregt kurz deine Aufmerksamkeit." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -47706,7 +47833,7 @@ msgid_plural "vault leaflets" msgstr[0] "Bunkerkomplex-Prospekt" msgstr[1] "Bunkerkomplex-Prospekte" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -48281,7 +48408,8 @@ msgid_plural "sets of tiny spidery legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "" @@ -48292,7 +48420,8 @@ msgid_plural "sets of reverse-jointed legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -48304,7 +48433,8 @@ msgid_plural "sets of omni wheels" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "" @@ -48315,7 +48445,7 @@ msgid_plural "sets of rotors" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "" @@ -48326,7 +48456,8 @@ msgid_plural "sets of android legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "" @@ -48337,7 +48468,8 @@ msgid_plural "sets of android arms" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "" @@ -48348,7 +48480,8 @@ msgid_plural "sets of small tank tread" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" @@ -48359,7 +48492,8 @@ msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -48372,7 +48506,8 @@ msgid_plural "police bot chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -48403,7 +48538,7 @@ msgid_plural "misc software" msgstr[0] "sonstige Software" msgstr[1] "sonstige Software" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "Irgeindeine Hobbysoftware. Wahrscheinlich nutzlos." @@ -48414,7 +48549,7 @@ msgid_plural "hackPRO" msgstr[0] "hackPRO" msgstr[1] "hackPRO" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "Eine Hackingsoftware." @@ -48447,7 +48582,7 @@ msgid_plural "infection data" msgstr[0] "Infektionsdaten" msgstr[1] "Infektionsdaten" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Medizinische Daten über Zombieblut." @@ -48458,7 +48593,7 @@ msgid_plural "lab data" msgstr[0] "Labordaten" msgstr[1] "Labordaten" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "Forschungsarchive von einem Regierungslabor." @@ -48469,7 +48604,7 @@ msgid_plural "train data" msgstr[0] "Zugdaten" msgstr[1] "Zugdaten" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "Logistische Daten zu unterirdischen Zugstrecken und Fahrplänen." @@ -48480,7 +48615,7 @@ msgid_plural "neural data" msgstr[0] "" msgstr[1] "" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -48494,7 +48629,8 @@ msgid_plural "misc software" msgstr[0] "" msgstr[1] "" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -51538,7 +51674,7 @@ msgid_plural "spare parts" msgstr[0] "Ersatzteil" msgstr[1] "Ersatzteile" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -52024,17 +52160,20 @@ msgid_plural "expandable batons (extended)" msgstr[0] "Teleskopschlagstock (ausgefahren)" msgstr[1] "Teleskopschlagstöcke (ausgefahren)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "Einfahren" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Du schiebst deinen Schlagstock ein." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -52322,7 +52461,8 @@ msgid_plural "ironshod quarterstaves" msgstr[0] "eisenbeschlagener Quarterstaff" msgstr[1] "eisenbeschlagene Quarterstaffs" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -52577,7 +52717,7 @@ msgid_plural "quarterstaves" msgstr[0] "Quarterstaff" msgstr[1] "Quarterstaffs" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -52592,7 +52732,7 @@ msgid_plural "rocks in socks" msgstr[0] "Stein in einer Socke" msgstr[1] "Steine in Socken" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "" @@ -52605,7 +52745,8 @@ msgid_plural "sharpened toothbrushes" msgstr[0] "geshärfte Zahnbürste" msgstr[1] "geshärfte Zahnbürsten" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "" @@ -52926,7 +53067,7 @@ msgid_plural "naginata" msgstr[0] "Naginata" msgstr[1] "Naginata" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52938,7 +53079,7 @@ msgstr "" " Samurai in den frühen Zeitaltern benutzt, oder von ihren Frauen zur " "Verteidigung des Haushalts." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52946,7 +53087,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -52960,7 +53101,8 @@ msgid_plural "survivor naginata" msgstr[0] "Überlebendennaginata" msgstr[1] "Überlebendennaginatas" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -53046,7 +53188,7 @@ msgid_plural "dories" msgstr[0] "Dory" msgstr[1] "Dorata" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "" @@ -53058,7 +53200,7 @@ msgid_plural "ji" msgstr[0] "Ji" msgstr[1] "Ji" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -53135,7 +53277,7 @@ msgid_plural "jian" msgstr[0] "Jian" msgstr[1] "Jian" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -53257,7 +53399,7 @@ msgid_plural "nodachi" msgstr[0] "Nodachi" msgstr[1] "Nodachi" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -53267,7 +53409,7 @@ msgstr "" "gekrümmten zweihändigen Schwerts aus Japan. Es ist überraschend leicht für " "dessen Größe." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -53401,7 +53543,7 @@ msgid_plural "cutlasses" msgstr[0] "Entermesser" msgstr[1] "Entermesser" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -53514,7 +53656,7 @@ msgid_plural "krises" msgstr[0] "Kris" msgstr[1] "Krise" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -53545,7 +53687,7 @@ msgid_plural "tiger claws" msgstr[0] "Tigerklauen" msgstr[1] "Tigerklauen" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -53574,7 +53716,8 @@ msgid_plural "pairs of brass knuckles" msgstr[0] "Paar Schlagringe" msgstr[1] "Paar Schlagringe" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -53608,7 +53751,8 @@ msgid_plural "pairs of nail knuckles" msgstr[0] "Paar Nagelschlagringe" msgstr[1] "Paar Nagelschlagringe" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -53623,7 +53767,8 @@ msgid_plural "pairs of steel knuckles" msgstr[0] "Paar Stahlschlagringe" msgstr[1] "Paar Stahlschlagringe" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -53723,7 +53868,7 @@ msgid_plural "throwing knives" msgstr[0] "Wurfmesser" msgstr[1] "Wurfmesser" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -53753,14 +53898,15 @@ msgid_plural "sheets of glass" msgstr[0] "Glasscheibe" msgstr[1] "Glasscheiben" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -53774,7 +53920,8 @@ msgid_plural "sheets of reinforced glass" msgstr[0] "große Panzerglasscheibe" msgstr[1] "große Panzerglasscheiben" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "Eine große, mit Stahlverdrahtung verstärkte Glasscheibe." @@ -53785,7 +53932,8 @@ msgid_plural "panes of reinforced glass" msgstr[0] "kleine Panzerglasscheibe" msgstr[1] "kleine Panzerglasscheiben" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "Eine kleine, mit Stahldrähten verstärkte Glasscheibe." @@ -53885,7 +54033,7 @@ msgid_plural "scrap copper" msgstr[0] "Kupferstückchen" msgstr[1] "Kupferstückchen" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "" @@ -53951,7 +54099,7 @@ msgid_plural "mattresses" msgstr[0] "Matratze" msgstr[1] "Matratzen" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "Eine Matratze für ein Einzel- oder Doppelbett. " @@ -53962,7 +54110,7 @@ msgid_plural "down mattresses" msgstr[0] "Daunenmatratze" msgstr[1] "Daunenmatratzen" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "Eine mit Daunen gefüllte Matratze für ein Einzel- oder Doppelbett. " @@ -54303,21 +54451,28 @@ msgid_plural "sealed jars of eggs" msgstr[0] "Einmachglas mit Eiern" msgstr[1] "Einmachgläser mit Eiern" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Einmachglas öffnen" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Du öffnest das Einmachglas und setzt es somit der Atmosphäre aus." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -54332,7 +54487,8 @@ msgid_plural "sealed jars of pickles" msgstr[0] "Einmachglas mit Essiggurken" msgstr[1] "Einmachgläser mit Essiggurken" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -54347,7 +54503,8 @@ msgid_plural "sealed jars of sauerkraut" msgstr[0] "Einmachglas mit Sauerkraut" msgstr[1] "Einmachgläser mit Sauerkraut" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -55014,7 +55171,7 @@ msgid_plural "radio car boxes" msgstr[0] "Schachtel mit funkferngesteuertem Modellauto" msgstr[1] "Schachteln mit funkferngesteuerten Modellautos" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -55124,7 +55281,8 @@ msgid_plural "sets of ring stand clamps" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -55188,7 +55346,8 @@ msgid_plural "pairs of knitting needles" msgstr[0] "Paar Stricknadeln" msgstr[1] "Paar Stricknadeln" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -55285,7 +55444,8 @@ msgid_plural "distaves and spindles" msgstr[0] "Rocken und Spindel" msgstr[1] "Rocken und Spindeln" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -55408,7 +55568,7 @@ msgid_plural "storage battery cases" msgstr[0] "Akkumulatorhalterung" msgstr[1] "Akkumulatorhalterungen" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -55423,7 +55583,7 @@ msgid_plural "wood boat hulls" msgstr[0] "Holz-Bootsrumpf" msgstr[1] "Holz-Bootsrümpfe" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -55439,7 +55599,7 @@ msgid_plural "plastic boat hulls" msgstr[0] "Kunststoff-Bootsrumpf" msgstr[1] "Kunststoff-Bootsrümpfe" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -55473,7 +55633,7 @@ msgid_plural "oars" msgstr[0] "Paar Ruder" msgstr[1] "Paar Ruder" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Ruder für ein Boot." @@ -55484,7 +55644,7 @@ msgid_plural "sails" msgstr[0] "" msgstr[1] "" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "" @@ -55495,7 +55655,8 @@ msgid_plural "inflatable section" msgstr[0] "aufblasbares Segment" msgstr[1] "aufblasbares Segment" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "Ein aufblasbares Bootsegment." @@ -55506,7 +55667,8 @@ msgid_plural "inflatable airbag" msgstr[0] "aufblasbarer Airbag" msgstr[1] "aufblasbarer Airbag" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "Ein aufblasbarer Airbag." @@ -55694,7 +55856,8 @@ msgid_plural "sets of vehicle controls" msgstr[0] "Fahrzeugsteuerung" msgstr[1] "Fahrzeugsteuerungen" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "Ein Satz diverser Fahrzeugsteuerungen. Nützlich für die Fertigung." @@ -55754,7 +55917,8 @@ msgid_plural "sets of drive by wire controls" msgstr[0] "Drive-by-Wire-Steuerung" msgstr[1] "Drive-by-Wire-Steuerungen" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -55769,7 +55933,7 @@ msgid_plural "robot driving units" msgstr[0] "Roboterfahrteinheit" msgstr[1] "Roboterfahrteinheiten" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -55963,7 +56127,7 @@ msgid_plural "vehicle scoops" msgstr[0] "Fahrzeugschaufel" msgstr[1] "Fahrzeugschaufeln" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -55979,7 +56143,7 @@ msgid_plural "seed drills" msgstr[0] "Drillmaschine" msgstr[1] "Drillmaschinen" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -55996,7 +56160,7 @@ msgid_plural "reapers" msgstr[0] "Erntemaschine" msgstr[1] "Erntemaschinen" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -56046,7 +56210,7 @@ msgid_plural "plows" msgstr[0] "Pflug" msgstr[1] "Pflüge" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "" @@ -56209,7 +56373,8 @@ msgid_plural "emergency vehicle lights (red)" msgstr[0] "rote Rundumkennleuchte" msgstr[1] "rote Rundumkennleuchten" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -56225,7 +56390,8 @@ msgid_plural "emergency vehicle lights (blue)" msgstr[0] "blaue Rundumkennleuchte" msgstr[1] "blaue Rundumkennleuchten" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -56268,7 +56434,8 @@ msgid_plural "sets of hand rims" msgstr[0] "Greifreifensatz" msgstr[1] "Greifreifensätze" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "Greifreifen für die Benutzung an einem Rollstuhl." @@ -56964,7 +57131,7 @@ msgid_plural "vehicle coolers" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "" @@ -56975,7 +57142,7 @@ msgid_plural "vehicle heaters" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "" @@ -57350,9 +57517,8 @@ msgstr[1] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -70567,7 +70733,7 @@ msgid_plural "lambs" msgstr[0] "Lamm" msgstr[1] "Lämmer" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -79091,7 +79257,8 @@ msgstr[1] "Berghelme (an)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -79710,12 +79877,14 @@ msgid_plural "phase immersion suits (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -90781,22 +90950,22 @@ msgid "" "These are small metal objects covered with many sharp points. If an " "unsuspecting victim steps on one, they'll get a spine through the foot." msgstr "" -"Diese sind kleine, mit vielen schwarfen Spitzen überzogene, Metallobjekte. " -"Wenn ein ahnungsloses Opfer auf ein solches tritt, wird es ein Dorn durch " +"Diese sind kleine, mit vielen scharfen Spitzen überzogene Metallobjekte. " +"Wenn ein ahnungsloses Opfer auf ein solches tritt, wird es einen Dorn durch " "dessen Fuß gebohrt bekommen." #: lang/json/TOOL_from_json.py msgid "loose glass caltrops" msgid_plural "loose glass caltrops" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lose Glaskrähenfüße" +msgstr[1] "lose Glaskrähenfüße" #. ~ Use action done_message for {'str': 'loose glass caltrops', 'str_pl': #. 'loose glass caltrops'}. #: lang/json/TOOL_from_json.py #, no-python-format msgid "You scatter the glass caltrops on the %s." -msgstr "" +msgstr "Du breitest die Glaskrähenfüße aus auf: %s. " #. ~ Description for {'str': 'loose glass caltrops', 'str_pl': 'loose glass #. caltrops'} @@ -90805,6 +90974,9 @@ msgid "" "These are glass shards glued together to expose their sharp edges. If an " "unsuspecting victim steps on one, they'll get cut." msgstr "" +"Kleine Glasscherben wurden so zusammengeklebt, dass ihre scharfen Kanten " +"frei liegen. Wenn ein ahnungsloses Opfer darauf tritt, wird es sich " +"schneiden. " #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py msgid "crossbow trap" @@ -105839,10 +106011,10 @@ msgid "" msgstr "" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "Heu" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "Ein Heuballen. Du könntest darauf schlafen, wenn du verzweifelt bist." @@ -112325,14 +112497,16 @@ msgstr "" #: lang/json/gun_from_json.py msgid "staff sling" msgid_plural "staff slings" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Stockschleuder" +msgstr[1] "Stockschleudern" #: 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 "" +"Eine Lederschleuder, die an einem Stock befestigt ist, einfach zu benutzen " +"und genau. Sie benutzt Steine als Munition. " #: lang/json/gun_from_json.py msgid "brace slingshot" @@ -162113,7 +162287,7 @@ msgstr "Wer hat das gesagt?" #: lang/json/snippet_from_json.py msgid "Who goes there?" -msgstr "" +msgstr "Wer geht da?" #: lang/json/snippet_from_json.py msgid "That sounds bad." @@ -164963,7 +165137,7 @@ msgstr "Da ist ein schön ausgeführtes Graffiti-Tag an der Wand." #: lang/json/snippet_from_json.py msgid " is a heteronormative bully!" -msgstr "" +msgstr " weiß Bescheid!" #: lang/json/snippet_from_json.py msgid " + " @@ -164999,18 +165173,21 @@ msgid "" "\n" "Do you want to talk about it? You know where to find me. Love you sweety." msgstr "" +"Ich habe eine feste und liebevolle Beziehung zu deiner Mutter, und du musst dich damit abfinden.\n" +"\n" +"Willst du darüber reden? Du weißt, wo du mich finden kannst. Habe dich lieb, Sweety." #: lang/json/snippet_from_json.py msgid " you fuckin gave me ADES you SHIT." -msgstr "" +msgstr " du hasst mich mit ÄITS angeschteckt du ARSCH" #: lang/json/snippet_from_json.py msgid "I <3 ." -msgstr "" +msgstr "I <3 " #: lang/json/snippet_from_json.py msgid " fucked ." -msgstr "" +msgstr " fickt ." #: lang/json/snippet_from_json.py msgid "This is a spraypainted drawing of an angel with wings made of vines." @@ -165102,98 +165279,109 @@ msgid "" "This is a spraypainting of an anatomically unlikely woman wearing very " "little." msgstr "" +"Dieses Graffito zeigt eine anatomisch ungewöhnliche Frau, die sehr spärlich " +"bekleidet ist. " #: lang/json/snippet_from_json.py msgid "BIGGEST WASTE OF TAX MONEY FUCK YOU GOVERMINT" -msgstr "" +msgstr "DIE GRÖSSTE STEUERGELDVERSCHWENDUNG FICK DICH REGIERUNG" #: lang/json/snippet_from_json.py msgid "Dont eat the proten bars" -msgstr "" +msgstr "Esst nicht die Proteinriegel" #: lang/json/snippet_from_json.py msgid "FEMA: FUCKIN EAT MY ASSHOLE" -msgstr "" +msgstr "FEMA: FRISS MEIN SCHEISS ARSCHLOCH" #: lang/json/snippet_from_json.py msgid "" "This is a simple drawing of a skinny figure wearing an emergency evac jacket" " and a gas mask. Scrawled beneath, it says \"thanks for the outfit\"." msgstr "" +"Ein simples Bild einer mageren Figur, die eine Not-Jacke und eine Gasmaske " +"trägt. Darunter steht gekritzelt: »danke für das outfit«" #: lang/json/snippet_from_json.py msgid "Abandon hope, all ye who enter here." -msgstr "" +msgstr "Alle, die ihr hier eintretet, lasst alle Hoffnung fahren." #: lang/json/snippet_from_json.py msgid "NO ONE IS COMING FOR US" -msgstr "" +msgstr "NIEMAND WIRD UNS RETTEN" #: lang/json/snippet_from_json.py msgid "THERE'S NO RESCUE BUS" -msgstr "" +msgstr "ES GIBT KEINEN RETTUNGSBUS" #: lang/json/snippet_from_json.py msgid "THEY LET US DOWN" -msgstr "" +msgstr "SIE HABEN UNS IM STICH GELASSEN" #: lang/json/snippet_from_json.py msgid "Don't dead open inside" -msgstr "" +msgstr "Nicht Tote öffnen drinnen" #: lang/json/snippet_from_json.py msgid "SANCTUARY" -msgstr "" +msgstr "ZUFLUCHTSORT" #: lang/json/snippet_from_json.py msgid "'s cosplay supply all welcome" -msgstr "" +msgstr "'s Cosplay-Bedarf Alle willkommen" #: lang/json/snippet_from_json.py msgid "Cataclysm Bus Stop" -msgstr "" +msgstr "Katastrophenhaltestelle" #: lang/json/snippet_from_json.py msgid "They aren't coming to help, they're coming to clean up" -msgstr "" +msgstr "Sie kommen nicht zum Helfen, sie kommen zur Säuberung" #: lang/json/snippet_from_json.py msgid "" "This is a far-too-detailed drawing of an enormous mind-bending monster, the " "sort that attacked during the Cataclysm." msgstr "" +"Ein viel zu detailliertes Bild eines riesigen Wahnsinnsmonsters, die Sorte, " +"die bei der Katastrophe angriff" #: lang/json/snippet_from_json.py msgid "" "This is a quick rendition in permanent marker of a swirling gateway, with " "zombies spilling out of it. Underneath, it reads \"What did they do?\"" msgstr "" +"Eine hastig mit Permanentmarker ausgeführte Zeichnung eines aufschwingenden " +"Eingangstores, aus dem Zombies herausströmen. Darunter steht: »Was haben sie" +" getan?«" #: lang/json/snippet_from_json.py msgid "RIP humanity" -msgstr "" +msgstr "RIP Menschheit" #: lang/json/snippet_from_json.py msgid "Everyone's dead Dave" -msgstr "" +msgstr "Alle sind tot Dave" #: lang/json/snippet_from_json.py msgid "WE'RE ALL FINE HERE HOW R U" -msgstr "" +msgstr "UNS GEHT'S GUT WIE GEHT'S DIR" #: lang/json/snippet_from_json.py msgid "" " I couldn't wait any longer, went to camp 36. Meet me there. " "Love ." msgstr "" +", ich konnte nicht länger warten. Bin zu Lager 36. Triff mich " +"da. In Liebe " #: lang/json/snippet_from_json.py msgid " I am still looking for you." -msgstr "" +msgstr ", ich suche noch immer nach dir." #: lang/json/snippet_from_json.py msgid " was here and still alive" -msgstr "" +msgstr " war hier und lebt" #: lang/json/snippet_from_json.py msgid "Blue 52" @@ -165202,6 +165390,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid " I no I said Id wait for u but I gotta run, find me" msgstr "" +" ich wais ich sagte dir ich warte aber ich muss wech finde mich" #: lang/json/snippet_from_json.py msgid "" @@ -165213,52 +165402,62 @@ msgid "" "\n" "I would not be alive without all of you. I will not forget." msgstr "" +"In memoriam:\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"Ohne euch wäre ich nicht mehr am Leben. Ich werde euch nicht vergessen. " #: lang/json/snippet_from_json.py msgid "" "This is a drawing of a cartoon character smashing a zombie corpse with a " "sledgehammer. Beneath it is a scrawled message: \"Gotta pulp em all\"" msgstr "" +"Das Bild zeigt einen Cartooncharackter, der mit einem Vorschlaghammer einen " +"Zombiekörper zerschmettert. Darunter steht die gekritzelte Nachricht: »Macht" +" sie alle zu Brei« " #: lang/json/snippet_from_json.py msgid "They get back up. Headshots don't work." -msgstr "" +msgstr "Sie stehen wieder auf. Kopfschüsse reichen nicht. " #: lang/json/snippet_from_json.py msgid "stay out of " -msgstr "" +msgstr "bleibt raus aus " #: lang/json/snippet_from_json.py msgid " has fallen" -msgstr "" +msgstr " ist gefallen" #: lang/json/snippet_from_json.py msgid "NO ONE LEFT HERE MOVE ON" -msgstr "" +msgstr "KEINER MEHR ÜBRIG ZIEH WEITER" #: lang/json/snippet_from_json.py msgid "deth trap" -msgstr "" +msgstr "Todesfalle" #: lang/json/snippet_from_json.py msgid "no ones coming" -msgstr "" +msgstr "niemand wird kommt" #: lang/json/snippet_from_json.py msgid "GOVERMENT DID THIS TO US" -msgstr "" +msgstr "DIE REGIERUNG HAT UNS DAS ANGETAN" #: lang/json/snippet_from_json.py msgid "FUCK CHINA" -msgstr "" +msgstr "FICK CHINA" #: lang/json/snippet_from_json.py msgid "FUCK THE COMMUNISTS" -msgstr "" +msgstr "FICK DIE KOMMUNISTEN" #: lang/json/snippet_from_json.py msgid "Remember " -msgstr "" +msgstr "Gedenkt " #: lang/json/snippet_from_json.py msgid "" @@ -174654,7 +174853,7 @@ msgid "Clothing Store" msgstr "Bekleidungsgeschäft" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174662,7 +174861,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174810,42 +175009,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174918,13 +175117,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175140,14 +175339,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175318,16 +175517,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "Was machst du hier?" @@ -175399,24 +175598,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "Nein, einfach nein, …" +msgid "Anything to do before I go to sleep?" +msgstr "Gibt es irgendetwas zu tun, bevor ich mich schlafen lege?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "Lass mich einfach schlafen, !" +msgid "Just few minutes more..." +msgstr "Nur noch ein paar Minuten …" #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Mach schnell, ich will mich wieder schlafen legen." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Nur noch ein paar Minuten …" +msgid "Just let me sleep, !" +msgstr "Lass mich einfach schlafen, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "Gibt es irgendetwas zu tun, bevor ich mich schlafen lege?" +msgid "No, just no..." +msgstr "Nein, einfach nein, …" #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -175530,15 +175729,15 @@ msgid "Let's go." msgstr "Los geht’s!" #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175546,19 +175745,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175566,7 +175761,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -175574,7 +175769,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175582,19 +175777,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175602,7 +175797,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175610,13 +175805,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -175726,13 +175925,12 @@ msgid "Attack anything you want." msgstr "Greif an, was du willst." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175742,11 +175940,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175786,12 +175985,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175801,12 +176000,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175842,19 +176041,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175898,7 +176097,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175906,11 +176105,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175918,7 +176113,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175926,7 +176121,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175934,7 +176129,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175942,7 +176137,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175950,7 +176145,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175958,7 +176153,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175966,13 +176161,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Folge den gleichen Regeln wie dieser Gefährte." @@ -176141,14 +176340,14 @@ msgstr "" msgid "Sure thing, I'll make my way there." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -176321,28 +176520,28 @@ msgid "I don't care." msgstr "Ist mir egal." #: 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?" +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 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?" +msgid "I don't have any jobs for you." +msgstr "Ich hab nichts für dich zu tun." #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" +msgid "I have more 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?" +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." -msgstr "Ich hab nichts für dich zu tun." +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 don't have any more jobs for you." -msgstr "Ich hab nichts weiteres für dich zu tun." +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?" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -176353,10 +176552,6 @@ msgstr "Oh, okay." msgid "Never mind, I'm not interested." msgstr "Vergiss es, ich bin nicht interessiert." -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Welche Aufgabe?" @@ -176365,6 +176560,10 @@ msgstr "Welche Aufgabe?" msgid "What about it?" msgstr "Wie wär’s?" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Ich mach’s!" @@ -176583,32 +176782,32 @@ msgstr "Hmm, okay." msgid "Thanks!" msgstr "Danke!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "Ich bin zu durstig, gib mir was zu Trinken." +msgid "I have some reason for not telling you." +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Ich bin zu hungrig, gib mir etwas zu Essen." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "Ich bin zu müde, lass mich zuerst etwas ruhen." #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "" +msgid "I'm too hungry, give me something to eat." +msgstr "Ich bin zu hungrig, gib mir etwas zu Essen." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." +msgid "I'm too thirsty, give me something to drink." +msgstr "Ich bin zu durstig, gib mir was zu Trinken." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176616,16 +176815,16 @@ msgid "Ah, okay." msgstr "Ah, okay." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Nicht, bevor ich ein paar Antibiotika kriege." +msgid "Why should I travel with you?" +msgstr "Warum sollte ich mit dir reisen?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Du hast mich erst kürzlich gefragt; frag später nach." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "Warum sollte ich mit dir reisen?" +msgid "Not until I get some antibiotics..." +msgstr "Nicht, bevor ich ein paar Antibiotika kriege." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -176715,21 +176914,21 @@ msgstr "Nein, wir sind hier okay." msgid "On second thought, never mind." msgstr "Wenn ich darüber nachdenke, vergiss es." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Ich kann dich nicht trainieren, solange du ein Fahrzeug benutzt!" - #: lang/json/talk_topic_from_json.py msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I have some reason for denying you training." +msgstr "Ich habe Gründe, um dir die Ausbildung zu verweigern." + #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "Nur Geduld, ich werd dir später etwas neues zeigen …" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "Ich habe Gründe, um dir die Ausbildung zu verweigern." +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Ich kann dich nicht trainieren, solange du ein Fahrzeug benutzt!" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -176767,14 +176966,14 @@ msgstr "Ich behalte das lieber für mich." msgid "I understand…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Du hast mich gerade eben um etwas gefragt, frag später nach." - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "Warum sollte ich dir etwas abgeben?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Du hast mich gerade eben um etwas gefragt, frag später nach." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "In Ordnung." @@ -176919,16 +177118,16 @@ msgstr "Es war mir ein Vergnügen, Geschäfte zu machen!" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "" @@ -177990,15 +178189,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178006,11 +178205,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179665,10 +179864,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "Ich kann darüber jetzt einfach nicht reden. Ich kann nicht." - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -179677,7 +179872,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179688,10 +179884,13 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "Ich kann darüber jetzt einfach nicht reden. Ich kann nicht." + #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." msgstr "Es könnte helfen, es von der Seele zu bekommen." @@ -180103,20 +180302,20 @@ msgstr "Danke, dass du mir das alles erzählt hast. " #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Mein Mann schaffte es mit mir zusammen nach draußen, aber sie wurde von " +"Meine Frau schaffte es mit mir zusammen nach draußen, aber sie wurde von " "eines dieser verdammten Pflanzenmonster gefressen. Das ist ein paar Tage, " "bevor ich dich getroffen habe, passiert. Das war kein großartiges Jahr für " "mich." #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Meine Frau schaffte es mit mir zusammen nach draußen, aber sie wurde von " +"Mein Mann schaffte es mit mir zusammen nach draußen, aber sie wurde von " "eines dieser verdammten Pflanzenmonster gefressen. Das ist ein paar Tage, " "bevor ich dich getroffen habe, passiert. Das war kein großartiges Jahr für " "mich." @@ -180180,11 +180379,10 @@ msgid "I'm sorry you lost someone." msgstr "Es tut mir leid, dass du jemanden verloren hast." #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" -"Ich habe gesagt, dass ich darüber nicht reden will. Wieso kannst du das " -"nicht verstehen?" +"Nur eine weitere Geschichte über Liebe und Verlust. Keine die ich " +"gerne erzähle." #: lang/json/talk_topic_from_json.py msgid "" @@ -180195,10 +180393,11 @@ msgstr "" "nicht um, sie noch einmal zu erzählen." #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" -"Nur eine weitere Geschichte über Liebe und Verlust. Keine die ich " -"gerne erzähle." +"Ich habe gesagt, dass ich darüber nicht reden will. Wieso kannst du das " +"nicht verstehen?" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -180223,52 +180422,52 @@ msgid "" msgstr "Oh, . Das hat weder etwas mit dir, noch mit uns zu tun." #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." +msgid "All right, fine. I had someone. I lost her." msgstr "In Ordnung, schon gut. Ich hatte jemanden und hab sie verloren." #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost her." +msgid "All right, fine. I had someone. I lost him." msgstr "In Ordnung, schon gut. Ich hatte jemanden und hab sie verloren." #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"Er war zuhause, als die Bomben fielen und die Hölle auf Erden ausbrach. Ich " -"war auf der Arbeit. Ich versuchte, zu unserem Haus zu gelangen, aber die " +"Sie war zuhause, als die Bomben fielen und die Hölle auf Erden ausbrach. Ich" +" war auf der Arbeit. Ich versuchte, zu unserem Haus zu gelangen, aber die " "Stadt war ein Kriegsgebiet. Dinge, die ich nicht beschreiben kann, taumelten" " durch die Straßen und zerschlugen Menschen und Autos. Soldaten versuchten, " "sie zu stoppen, aber sie trafen Menschen im Kreuzfeuer so oft wie andere " "Dinge. Und dann stünde der Kollateralschaden gleich wieder auf und liefe zum" -" Feind über. Wenn da nicht noch mein Mann gewesen wäre, wär ich einfach " +" Feind über. Wenn da nicht noch meine Frau gewesen wäre, wär ich einfach " "abgehauen, aber ich tat, was ich konnte und kam durch. Ich hab es verdammt " "noch mal lebendig geschafft." #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"Sie war zuhause, als die Bomben fielen und die Hölle auf Erden ausbrach. Ich" -" war auf der Arbeit. Ich versuchte, zu unserem Haus zu gelangen, aber die " +"Er war zuhause, als die Bomben fielen und die Hölle auf Erden ausbrach. Ich " +"war auf der Arbeit. Ich versuchte, zu unserem Haus zu gelangen, aber die " "Stadt war ein Kriegsgebiet. Dinge, die ich nicht beschreiben kann, taumelten" " durch die Straßen und zerschlugen Menschen und Autos. Soldaten versuchten, " "sie zu stoppen, aber sie trafen Menschen im Kreuzfeuer so oft wie andere " "Dinge. Und dann stünde der Kollateralschaden gleich wieder auf und liefe zum" -" Feind über. Wenn da nicht noch meine Frau gewesen wäre, wär ich einfach " +" Feind über. Wenn da nicht noch mein Mann gewesen wäre, wär ich einfach " "abgehauen, aber ich tat, was ich konnte und kam durch. Ich hab es verdammt " "noch mal lebendig geschafft." @@ -180345,11 +180544,11 @@ msgstr "Hast du es ins Haus geschafft?" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -180357,11 +180556,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -181163,6 +181362,16 @@ msgstr "" " denke ich, wandere ich auf Höllen auf Erden. Ich wünschte, ich hätte mehr " "in der Sonntagsschule aufgepasst." +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -181174,16 +181383,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -181281,14 +181480,6 @@ msgstr "Es tut mir leid wegen Buck. " msgid "I'm sorry about Buck. " msgstr "Es tut mir leid wegen Buck " -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "" -"Wie ich schon sagte, wenn du von mir eine Geschichte hören willst, musst du " -"den Whisky rüberwachsen lassen. Eine volle Flasche, wohlgemerkt." - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " @@ -181298,6 +181489,14 @@ msgstr "" "interessiert darin, eine Beziehung anzufangen. Du hast mich nicht dafür " "bezahlt, dein Freund zu sein." +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "" +"Wie ich schon sagte, wenn du von mir eine Geschichte hören willst, musst du " +"den Whisky rüberwachsen lassen. Eine volle Flasche, wohlgemerkt." + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -181705,30 +181904,30 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm" -" just gonna keep on believing they're out there, doing well. That's more " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " +"just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" "Nun, ich habe diese seltsame Hoffnung. Sie ist vielleicht dumm, aber ich " -"sah, wie mein Verlobter mit seiner Schwester – meiner Ehrendame – mit " -"quietschdem Reifen in ihrem Pick-Up floh, als die Dinge so richtig schlimm " +"sah, wie meine Verlobte mit ihrem Bruder – meinem besten Mann – mit " +"quietschdem Reifen in seinem Pick-Up floh, als die Dinge so richtig schlimm " "wurden. Also, bis ich ihnen wieder begegne – so oder so – werde ich weiter " "glauben, dass sie da draußen sind und es ihnen gut geht. Das ist mehr als " "was die meisten von uns haben." #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " -"just gonna keep on believing they're out there, doing well. That's more " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm" +" just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" "Nun, ich habe diese seltsame Hoffnung. Sie ist vielleicht dumm, aber ich " -"sah, wie meine Verlobte mit ihrem Bruder – meinem besten Mann – mit " -"quietschdem Reifen in seinem Pick-Up floh, als die Dinge so richtig schlimm " +"sah, wie mein Verlobter mit seiner Schwester – meiner Ehrendame – mit " +"quietschdem Reifen in ihrem Pick-Up floh, als die Dinge so richtig schlimm " "wurden. Also, bis ich ihnen wieder begegne – so oder so – werde ich weiter " "glauben, dass sie da draußen sind und es ihnen gut geht. Das ist mehr als " "was die meisten von uns haben." @@ -181737,6 +181936,10 @@ msgstr "" msgid "What were you saying before that?" msgstr "Was hast du davor gesagt?" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "Hallöchen!" @@ -181757,10 +181960,6 @@ msgstr "" msgid "How's the weather?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "Was ist das für ein Ort?" @@ -181847,16 +182046,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181903,15 +182102,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181945,15 +182144,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181996,14 +182195,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182072,11 +182271,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182133,11 +182332,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182149,19 +182348,19 @@ msgid "You're disgusting." msgstr "Du bist ekelerregend." #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182187,9 +182386,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182197,7 +182394,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182272,13 +182471,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182372,7 +182571,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182380,7 +182579,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182678,11 +182877,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182881,8 +183080,13 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "Marshal, ich hoffe, dass du hier bist, um uns zu helfen." +msgid "" +"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 "" +"Junge, ich weiß nicht, wie zur Hölle du hier nach unten gekommen sind, aber " +"wenn du irgendeine Form von Anstand hast, solltest du von hier verschwinden," +" solange du noch kannst." #: lang/json/talk_topic_from_json.py msgid "" @@ -182894,13 +183098,8 @@ msgstr "" " solange du noch kannst." #: 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 " -"you'll get out while you can." -msgstr "" -"Junge, ich weiß nicht, wie zur Hölle du hier nach unten gekommen sind, aber " -"wenn du irgendeine Form von Anstand hast, solltest du von hier verschwinden," -" solange du noch kannst." +msgid "Marshal, I hope you're here to assist us." +msgstr "Marshal, ich hoffe, dass du hier bist, um uns zu helfen." #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -182982,16 +183181,16 @@ 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." -msgstr "Marshal, ich bin doch etwas überrascht, dich hier zu sehen." +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "Marshal, ich bin doch etwas überrascht, dich hier zu sehen." #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -183038,22 +183237,6 @@ msgstr "" "Kommunikationsnetzwerks zu bewahren. Wir hoffen, dass wir ein paar Meldungen" " im Klartext aufnehmen können." -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "Hallo, Marshal!" - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "Marshal, ich fürchte, ich kann jetzt nicht reden." - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "Ich bin nicht der Verantwortliche hier, Marshal." - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "Ich sollte alle Fragen der Führung übergeben, Marshal." - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "" @@ -183068,6 +183251,16 @@ msgstr "" msgid "If you need something you'll need to talk to someone else." msgstr "Wenn du etwas brauchst, musst du mit jemand anderem reden." +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "Gnä’ Frau" + +#: lang/json/talk_topic_from_json.py +msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgstr "" +"Hey, Fräulein, glaubst du nicht, dass es sicherer wäre, wenn du mich " +"begleiten würdest?" + #: lang/json/talk_topic_from_json.py msgid "Sir." msgstr "Sir." @@ -183079,14 +183272,20 @@ msgstr "" "einzuschreiben." #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "Gnä’ Frau" +msgid "Hello, marshal." +msgstr "Hallo, Marshal!" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" -msgstr "" -"Hey, Fräulein, glaubst du nicht, dass es sicherer wäre, wenn du mich " -"begleiten würdest?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "Marshal, ich fürchte, ich kann jetzt nicht reden." + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "Ich bin nicht der Verantwortliche hier, Marshal." + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." +msgstr "Ich sollte alle Fragen der Führung übergeben, Marshal." #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -183143,15 +183342,16 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "" +msgid "Please, help me. I need food." +msgstr "Bitte hilf mir. Ich brauche Essen." #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" +"Bitte hilf mir. Ich brauche etwas zu essen. Bist du nicht deren Sheriff? " +"Kannst du mir nicht helfen?" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -183159,15 +183359,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" -"Bitte hilf mir. Ich brauche etwas zu essen. Bist du nicht deren Sheriff? " -"Kannst du mir nicht helfen?" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "Bitte hilf mir. Ich brauche Essen." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -183186,18 +183385,18 @@ msgstr "Geh weg von mir." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" +"Sie lassen mich nicht rein. Sie sagen, dass sie zu voll sind. Ich darf " +"hier draußen campen, solange ich es sauber halte und keinen großen Wirbel " +"mache, aber ich bin so hungrig." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" -"Sie lassen mich nicht rein. Sie sagen, dass sie zu voll sind. Ich darf " -"hier draußen campen, solange ich es sauber halte und keinen großen Wirbel " -"mache, aber ich bin so hungrig." #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -183304,13 +183503,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183354,18 +183553,18 @@ 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 "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" -"Hab ich dir was über Pappkarton erzählt, mein Freund? Hast du welchen?" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "Have I told you about cardboard, friend? Do you have any?" 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…" @@ -183395,16 +183594,16 @@ msgstr "Trägst du ernsthaft ein Dinosaurierkostüm?" msgid "Do you need something to eat?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -183504,15 +183703,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. Thanks." +" You've helped me a lot. I'm feeling much more myself with all this to " +"keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. Thanks." -" You've helped me a lot. I'm feeling much more myself with all this to " -"keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -183532,15 +183731,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "" +msgid "Don't bother with these assholes." +msgstr "Kümmere dich nicht um diese Arschlöcher." #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -183550,19 +183752,16 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "Kümmere dich nicht um diese Arschlöcher." +msgid "Fuck off, dickwaddle." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -183852,16 +184051,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183906,14 +184105,14 @@ msgstr "" msgid "I'll see what I can do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "Hey, was hältst du vom Prinzip des Überleben des Stärkeren?" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "Warum fragst du?" @@ -183930,12 +184129,6 @@ msgstr "" msgid "Nice to see you. I gotta be going though." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " @@ -183944,6 +184137,12 @@ msgstr "" "Denn ich bin bestimmt nicht stark, also harre ich hier aus, bis ich zu Tode " "verhungere. Kannst du einer armen schwachen Seele helfen?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "" @@ -183965,12 +184164,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "Warum kampierst du hier draußen, wenn sie dich nicht hereinlassen?" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184258,6 +184457,10 @@ msgstr "" msgid "What's your take on the situation here?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "Oh, hey, du schon wieder." @@ -184270,10 +184473,6 @@ msgstr "" msgid "Aw hey, look who's back." msgstr "Sieh mal an, wer wieder da ist." -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "Schön dich zu sehen, Kind. Was ist los?" @@ -184291,16 +184490,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "Ich bin kein Kind, ok? Ich bin sechzehn." +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "Ich bin kein Kind, ok? Ich bin vierzehn." #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "Ich bin kein Kind, ok? Ich bin fünfzehn" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "Ich bin kein Kind, ok? Ich bin vierzehn." +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "Ich bin kein Kind, ok? Ich bin sechzehn." #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -184310,6 +184509,19 @@ msgstr "Tschuldigung, so meinte ich das nicht. Was ist los?" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "Tschuldigung, so meinte ich das nicht. Ich bin schon unterwegs." +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" +"Ich weiß nicht, was los ist. Ich bin mir nicht sicher, was wir hier " +"eigentlich machen. Sie sagen, wir sollten hier warten, bis wir zum " +"Unterschlupf treppab umziehen können, aber wir waren hier tagelang und es " +"gab keine Erklärung darüber, wie lange wir warten werden. Es ist alles so " +"traurig, und niemand kann mir etwas sagen." + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -184324,19 +184536,6 @@ msgstr "" "was wir hier tun. Ich habe all die Bücher gelesen und es gibt Zombies da " "draußen, also stecken wir hier fest. Nachts können wir sie hören." -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" -"Ich weiß nicht, was los ist. Ich bin mir nicht sicher, was wir hier " -"eigentlich machen. Sie sagen, wir sollten hier warten, bis wir zum " -"Unterschlupf treppab umziehen können, aber wir waren hier tagelang und es " -"gab keine Erklärung darüber, wie lange wir warten werden. Es ist alles so " -"traurig, und niemand kann mir etwas sagen." - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -184374,7 +184573,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184384,8 +184584,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184415,33 +184614,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -184470,6 +184669,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -184478,8 +184683,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184489,10 +184694,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." -msgstr "" +msgid "Ah, another new face. Hello. I am Boris." +msgstr "Ah, ein weiteres neues Gesicht. Hallo. Ich bin Boris." #: lang/json/talk_topic_from_json.py msgid "Well, well. I'm glad you are back." @@ -184506,10 +184709,6 @@ msgstr "Hallo zurück, mein Freund." msgid "It is good to see you again." msgstr "Es ist schön, dich wieder zu sehen." -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "Ah, ein weiteres neues Gesicht. Hallo. Ich bin Boris." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -184578,13 +184777,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -184595,6 +184787,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -184623,6 +184822,10 @@ msgstr "" msgid "Got any more bread I can trade flour for?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there. I'm Dana, nice to see a new face." +msgstr "Hallo. Ich bin Dana, schön, ein neues Gesicht zu sehen." + #: lang/json/talk_topic_from_json.py msgid "Hello, nice to see you again." msgstr "Hallo, nett, dich wiederzusehen." @@ -184631,10 +184834,6 @@ msgstr "Hallo, nett, dich wiederzusehen." msgid "It's good to see you're still around." msgstr "Gut zu sehen, dass es dich noch gibt." -#: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." -msgstr "Hallo. Ich bin Dana, schön, ein neues Gesicht zu sehen." - #: lang/json/talk_topic_from_json.py msgid "Dana, hey? Nice to meet you." msgstr "Dana, ja? Schön, dich zu sehen." @@ -184685,8 +184884,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184697,10 +184898,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184722,6 +184921,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -184743,12 +184948,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -184778,10 +184977,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -184789,6 +184984,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -184825,16 +185024,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -185069,12 +185268,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185174,14 +185373,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185232,6 +185431,12 @@ msgstr "" msgid "Is there anything I can do to help you out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "Hallo nochmal." @@ -185244,12 +185449,6 @@ msgstr "" msgid "Oh, hi." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "" @@ -185309,15 +185508,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185382,6 +185581,12 @@ msgid "" "look like we'll be here for the long term. If we live that long." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hi." msgstr "Hi." @@ -185390,12 +185595,6 @@ msgstr "Hi." msgid "Hey again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "" @@ -185442,10 +185641,6 @@ msgid "" " I think my mom's on the fence." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." -msgstr "Nett dich wiederzusehen." - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." @@ -185453,6 +185648,10 @@ msgstr "" "Hi. Ich habe dich hier bisher noch nicht gesehen. Ich bin Jenny. Jenny " "Forcette." +#: lang/json/talk_topic_from_json.py +msgid "Nice to see you again." +msgstr "Nett dich wiederzusehen." + #: lang/json/talk_topic_from_json.py msgid "Nice meeting you. What are you doing on that computer?" msgstr "Schön dich kennenzulernen. Was machst du an dem Computer?" @@ -185644,6 +185843,20 @@ msgstr "" " genug zu Essen und wir sind nicht freiwillig zusammen. Ich weiß nicht, wie " "lange wir noch so bleiben können, bis jemand durchdreht." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" +"Nun, es gibt ein paar von uns. Wir sind im Begriff, eine Art Gemeinschaft zu" +" bilden. Fatima und ich arbeiten recht häufig zusammen und ich hänge oft mit" +" Dana, Draco und Aleesha ab. Ich kenne die Borichenko-Leute, die Singhs, " +"Vanessa, Uyen und Rhyzaea nicht so gut, aber wir haben genug geredet. Was " +"wolltest du wissen?" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -185664,20 +185877,6 @@ msgstr "" "hier ist. Uyen und Rhyzaea streiten sich immer über Führungsentscheidungen, " "als ob sie solche Dinge tun könnten. Was wolltest du wissen?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" -"Nun, es gibt ein paar von uns. Wir sind im Begriff, eine Art Gemeinschaft zu" -" bilden. Fatima und ich arbeiten recht häufig zusammen und ich hänge oft mit" -" Dana, Draco und Aleesha ab. Ich kenne die Borichenko-Leute, die Singhs, " -"Vanessa, Uyen und Rhyzaea nicht so gut, aber wir haben genug geredet. Was " -"wolltest du wissen?" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "Kannst du mir etwas über die Freien Händler erzählen?" @@ -185748,22 +185947,6 @@ msgid "" "hope that there's a future to be had." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I didn't get to know Boris, Garry, and Stan so well for the first while. " -"They kinda kept to themselves. Boris and Garry had just lost their son, you" -" know. It's pretty lucky that Stan was with them, he's Boris' little " -"brother. Together, they're a pretty good team. I feel bad for thinking " -"they were standoffish before. They probably do the most to pull their " -"weight around here whenever there's work to be done." -msgstr "" -"In der ersten Zeit lernte ich Boris, Garry und Stan nicht so sehr kennen. " -"Sie blieben meist unter sich. Da hatten Boris und Garry gerade ihren Sohn " -"verloren, verstehst du? Es ist großes Glück, dass Stan mit ihnen dabei war, " -"er ist Boris’ kleiner Bruder. Zusammen sind sie ein ziemlich gutes Team. Ich" -" fühle mich schlecht, dass ich glaubte, dass sie uns schlecht behandeln. Sie" -" machen hier vielleicht die meiste Arbeit, wenn es Arbeit zu erledigen gibt." - #: lang/json/talk_topic_from_json.py msgid "" "Boris and Garry are married, I guess. They kinda keep to themselves, they " @@ -185780,12 +185963,19 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The Singhs are really shy, and I think they feel pretty bad about making it " -"through this together. They're the only complete family I've seen since " -". That has to feel really weird, and I think it's made them " -"stick really close together. I think… I think they also just don't really " -"like any of us." +"I didn't get to know Boris, Garry, and Stan so well for the first while. " +"They kinda kept to themselves. Boris and Garry had just lost their son, you" +" know. It's pretty lucky that Stan was with them, he's Boris' little " +"brother. Together, they're a pretty good team. I feel bad for thinking " +"they were standoffish before. They probably do the most to pull their " +"weight around here whenever there's work to be done." msgstr "" +"In der ersten Zeit lernte ich Boris, Garry und Stan nicht so sehr kennen. " +"Sie blieben meist unter sich. Da hatten Boris und Garry gerade ihren Sohn " +"verloren, verstehst du? Es ist großes Glück, dass Stan mit ihnen dabei war, " +"er ist Boris’ kleiner Bruder. Zusammen sind sie ein ziemlich gutes Team. Ich" +" fühle mich schlecht, dass ich glaubte, dass sie uns schlecht behandeln. Sie" +" machen hier vielleicht die meiste Arbeit, wenn es Arbeit zu erledigen gibt." #: lang/json/talk_topic_from_json.py msgid "" @@ -185801,14 +185991,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… I'm doing my best, I really am, but we just do not get along. One " -"of these days one of us is probably going to brain the other with a tire " -"iron, and I'm just grateful I spend more time around the tire irons. Uyen " -"and Rhyzaea are both excellent people, and I genuinely like them, but I " -"can't stand this ongoing political bullshit they've got going on. Alonso is" -" just a… he's… there's no polite word for what he is. A lot of the others " -"are fine with it, and okay, sure, I guess. John is a walking stereotype, " -"but he's a great poker buddy. I admit I kinda like him." +"The Singhs are really shy, and I think they feel pretty bad about making it " +"through this together. They're the only complete family I've seen since " +". That has to feel really weird, and I think it's made them " +"stick really close together. I think… I think they also just don't really " +"like any of us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185824,7 +186011,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Howdy, pardner." +msgid "" +"Vanessa… I'm doing my best, I really am, but we just do not get along. One " +"of these days one of us is probably going to brain the other with a tire " +"iron, and I'm just grateful I spend more time around the tire irons. Uyen " +"and Rhyzaea are both excellent people, and I genuinely like them, but I " +"can't stand this ongoing political bullshit they've got going on. Alonso is" +" just a… he's… there's no polite word for what he is. A lot of the others " +"are fine with it, and okay, sure, I guess. John is a walking stereotype, " +"but he's a great poker buddy. I admit I kinda like him." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185832,6 +186027,10 @@ msgid "" "Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Howdy, pardner." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -185886,11 +186085,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185933,15 +186132,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -186142,12 +186341,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -186238,17 +186437,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -186360,10 +186559,6 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "Oh, da bist du ja wieder." - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " @@ -186372,6 +186567,10 @@ msgstr "" "Oh, fantastisch. Noch ein Maul zu stopfen? Genau was wir gebraucht haben. " "Jedenfalls, ich bin Vanessa." +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "Oh, da bist du ja wieder." + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -186412,14 +186611,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -186428,6 +186619,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -186605,15 +186804,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -187008,14 +187207,14 @@ msgstr "Bleib zivil oder es wird schmerzhaft." msgid "Just on watch, move along." msgstr "Ich bin nur auf Wache, weitergehen." -#: lang/json/talk_topic_from_json.py -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 "Rough out there, isn't it?" msgstr "Es ist gefährlich da draußen, nicht wahr?" +#: lang/json/talk_topic_from_json.py +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…" msgstr "" @@ -187044,14 +187243,14 @@ msgstr "" msgid "Well, I'd better be going. Bye." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "Willkommen, Marshal…" - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "Willkommen…" +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "Willkommen, Marshal…" + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -187298,14 +187497,14 @@ msgid "" "attacked by zombie hordes, as you might guess." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "Marshal…" - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "Bürger…" +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "Marshal…" + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "Kann ich gegen Vorräte handeln?" @@ -187375,14 +187574,14 @@ msgstr "" " hab nicht die Mittel, um von dir zu kaufen. Ich glaube nicht, dass du " "spenden willst." -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "Das ist wirklich eine glänzende Dienstmarke, die Sie da haben!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Hey, du siehst wichtig aus." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "Das ist wirklich eine glänzende Dienstmarke, die Sie da haben!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "Ich bin eigentlich neu hier." @@ -187449,6 +187648,10 @@ msgid "" "it." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " @@ -187457,10 +187660,6 @@ msgstr "" "Genauso, wie ich deins gekriegt habe, glaub ich. Sag besser kein Wort davon," " einige Leute hier schauen auf Leute wie uns herab." -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "Es tut mir leid, dass ich frage." @@ -187486,22 +187685,22 @@ msgstr "Ich kaufe." msgid "Who needs rebar?" msgstr "Wer braucht Bewehrungsstab?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "Als ob man mit dir reden könnte. Geh zum Teufel!" - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "Geh zum Teufel!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "" +msgid "As if you're one to talk. Screw You." +msgstr "Als ob man mit dir reden könnte. Geh zum Teufel!" #: lang/json/talk_topic_from_json.py 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 "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "" @@ -187824,6 +188023,16 @@ msgstr "Ich denke, du bist der Boss." msgid "Glad to have you aboard." msgstr "Ich bin froh, dich an Bord zu haben." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -187904,16 +188113,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -188184,38 +188383,38 @@ msgid "Keep it civil, merc." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Still plenty of outlaws in the roads, perhaps you should tend to your job, " -"marshal..." +msgid "Here to trade, I hope?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You see anything you want, marshal?" +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, a U.S. marshal, how quaint." +msgid "" +"Still plenty of outlaws in the roads, perhaps you should tend to your job, " +"marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" +msgid "You see anything you want, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -188459,16 +188658,16 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "Kann ich dir helfen, Marshal?" +msgid "Morning ma'am, how can I help you?" +msgstr "Guten Morgen, wie kann ich helfen?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "Guten Morgen, wie kann ich helfen?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "Guten Morgen, wie kann ich helfen?" +msgid "Can I help you, marshal?" +msgstr "Kann ich dir helfen, Marshal?" #: lang/json/talk_topic_from_json.py msgid "" @@ -188604,15 +188803,15 @@ msgid "Not now." msgstr "Jetzt nicht." #: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." +msgid "I can take a look at you or your companions if you are injured." msgstr "" -"Komm später wieder zurück, ich werde mich zuerst um ein paar Dinge kümmern " -"müssen." +"Ich kann mir dich oder deine Begleiter ansehen, wenn ihr verletzt seid." #: lang/json/talk_topic_from_json.py -msgid "I can take a look at you or your companions if you are injured." +msgid "Come back later, I need to take care of a few things first." msgstr "" -"Ich kann mir dich oder deine Begleiter ansehen, wenn ihr verletzt seid." +"Komm später wieder zurück, ich werde mich zuerst um ein paar Dinge kümmern " +"müssen." #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." @@ -188875,7 +189074,7 @@ msgid "Ok." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -188898,9 +189097,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -189003,11 +189203,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -189019,11 +189219,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -197695,12 +197895,6 @@ msgstr "" msgid "mana weaving" msgstr "" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "nichts" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -204703,16 +204897,18 @@ msgstr "" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s]ortieren: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F]ilter" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "Zu[r]ücksetzen" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -204748,8 +204944,9 @@ msgid "Unsorted (recently added first)" msgstr "Unsortiert (neueres kommt zuerst)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] Hilfe >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -207750,6 +207947,13 @@ msgstr "" msgid " BIONICS " msgstr " BIONIKEN " +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -207759,19 +207963,13 @@ msgstr "" "Bionik zum Neubelegen wählen; mit Leert. abbrechen." #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" #: src/bionics_ui.cpp @@ -207867,10 +208065,8 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"Du kannst %s nicht aktivieren! Um die Beschreibung von %s zu lesen, drücke " -"»!«, dann »%c«." #: src/bonuses.cpp msgid "Accuracy" @@ -215779,7 +215975,7 @@ msgstr "Hauptdaten laden" #: src/game.cpp msgid "Please wait while the world data loads…" -msgstr "" +msgstr "Bitte warte, während die Weltdaten laden…" #: src/game.cpp src/start_location.cpp msgid "Please wait as we build your world" @@ -215807,6 +216003,9 @@ msgid "" "\n" "Are you sure you wish to keep this world?" msgstr "" +"Warnung: Interaktionen mit NPCs und einige andere globale Zustände werden nicht zurückgesetzt, wenn man mit einem neuen Protagonisten in einer bereits bespielten Welt startet. Dies kann zu einigem seltsamen Verhalten führen. \n" +"\n" +"Bist du sicher, dass du diese Welt behalten willst?" #: src/game.cpp msgid "Reset world" @@ -215823,12 +216022,12 @@ msgstr "Welt behalten" #: src/game.cpp #, c-format msgid "World retained. Characters remaining:%s" -msgstr "" +msgstr "Welt behalten. Verbleibende Protagonisten:%s" #: src/game.cpp #, c-format msgid "The %s is dangerously close!" -msgstr "" +msgstr "%s ist gefährlich nah!" #: src/game.cpp msgid "Wait till you wake up…" @@ -215853,7 +216052,7 @@ msgstr "%s %s" #: src/game.cpp msgid "Faction Camp" -msgstr "" +msgstr "Fraktionslager" #: src/game.cpp msgid "Confirm:" @@ -216008,15 +216207,15 @@ msgstr "Du hältst keine Fernwaffe." #: src/game.cpp msgid "Watch the last moments of your life…?" -msgstr "" +msgstr "Willst du die letzten Augenblicke deines Lebens sehen?" #: src/game.cpp msgid "Loading the save…" -msgstr "" +msgstr "Laden des Spielstandes…" #: src/game.cpp src/options.cpp msgid "Please wait…" -msgstr "" +msgstr "Bitte warten…" #: src/game.cpp msgid "Loading files" @@ -216385,7 +216584,7 @@ msgstr "Vergiss es" #: src/game.cpp src/npctalk.cpp msgid "You may be attacked! Proceed?" -msgstr "" +msgstr "Du könntest angegriffen werden? Weitermachen?" #: src/game.cpp msgid "Examine where?" @@ -216393,7 +216592,7 @@ msgstr "Wo soll etwas untersucht werden?" #: src/game.cpp msgid "There is nothing that can be examined nearby." -msgstr "" +msgstr "Es ist nichts zum Untersuchen in der Nähe." #: src/game.cpp msgid "There is a fire here." @@ -216415,6 +216614,8 @@ msgid "" "Without extra fuel it might burn yet for maybe %s, but might also go out " "sooner." msgstr "" +"Ohne zusätzlichen Brennstoff wird es vielleicht noch für %s brennen. Es " +"könnte aber auch schon früher ausgehen." #: src/game.cpp #, c-format @@ -216422,6 +216623,8 @@ msgid "" "Without extra fuel it might burn yet for between %s to %s, but might also go" " out sooner." msgstr "" +"Ohne zusätzlichen Brennstoff wird es noch zwischen %s und %s brennen. Es " +"könnte aber auch schon früher ausgehen." #: src/game.cpp msgid "" @@ -216447,12 +216650,13 @@ msgstr "" #: src/game.cpp #, c-format msgid "Without extra fuel it will burn for about %s." -msgstr "" +msgstr "Ohne zusätzlichen Brennstoff wird es weiterbrennen für ungefähr %s." #: src/game.cpp #, c-format msgid "Without extra fuel it will burn for between %s to %s." msgstr "" +"Ohne zusätzlichen Brennstoff wird es zwischen %s und %s weiterbrennen. " #: src/game.cpp src/game.cpp src/iuse.cpp src/iuse.cpp src/iuse.cpp #: src/iuse_actor.cpp src/iuse_actor.cpp @@ -216627,7 +216831,7 @@ msgstr "Typ bearbeiten" #: src/game.cpp msgid "Edit filter" -msgstr "" +msgstr "Filter bearbeiten" #: src/game.cpp msgid "Edit options" @@ -216771,20 +216975,20 @@ msgstr "%s (%d)" #: src/game.cpp #, c-format msgid "Your best tool has %d butchering." -msgstr "" +msgstr "Dein bestes Werkzeug hat eine Schlachtungsqualität von %d." #: src/game.cpp msgid "You have no butchering tool." -msgstr "" +msgstr "Du hast kein Werkzeug zum Schlachten." #: src/game.cpp #, c-format msgid "Your best tool has %d fine cutting." -msgstr "" +msgstr "Dein bestes Werkzeug hat eine Feinschnittqualität von %d." #: src/game.cpp msgid "You have no fine cutting tool." -msgstr "" +msgstr "Du hast kein Werkzeug mit Feinschnittqualität." #: src/game.cpp msgid "Choose type of butchery:" @@ -216833,7 +217037,7 @@ msgstr "Leiche ausnehmen" #: src/game.cpp msgid "has no organs" -msgstr "" +msgstr "hat keine Organe" #: src/game.cpp msgid "" @@ -216850,11 +217054,11 @@ msgstr "" #: src/game.cpp msgid "Skin corpse" -msgstr "" +msgstr "Leiche häuten" #: src/game.cpp msgid "has no skin" -msgstr "" +msgstr "hat keine Haut" #: src/game.cpp msgid "" @@ -216908,6 +217112,11 @@ msgid "" "scalpel-grade cutting tools, ruins corpse, and consumes a lot of time. Your" " medical knowledge is most useful here." msgstr "" +"Durch ein sorgfältiges Sezieren der Leiche untersuchst du sie nach möglichen" +" Bionikimplantaten oder eigenständigen Organen und entnimmst sie, falls " +"möglich. Benötigt ein Werkzeug mit Feinschnittqualität, ruiniert die Leiche " +"und benötigt viel Zeit. Deine medizinischen Kenntnisse werden hier am " +"nützlichsten sein." #: src/game.cpp msgid "You can't butcher while driving!" @@ -216934,7 +217143,7 @@ msgstr "" #: src/game.cpp #, c-format msgid "You see %s nearby! Start butchering anyway?" -msgstr "" +msgstr "In der Nähe siehst du %s! Trotzdem mit dem Schlachten anfangen?" #: src/game.cpp msgid "Choose corpse to butcher / item to disassemble" @@ -216950,7 +217159,7 @@ msgstr "Alles einmal demontieren" #: src/game.cpp msgid "Disassemble everything recursively" -msgstr "" +msgstr "Alles rekursiv demontieren" #: src/game.cpp msgid "Cut up everything" @@ -216975,7 +217184,7 @@ msgstr "" #: src/veh_interact.cpp #, c-format msgid "%s helps with this task…" -msgstr "" +msgstr "%s hilft bei dieser Aufgabe…" #: src/game.cpp #, c-format @@ -217012,7 +217221,7 @@ msgstr "Du hast nichts zum Nachladen." #: src/game.cpp msgid "You aren't holding something you can reload." -msgstr "" +msgstr "Du hältst nichts, was du nachladen kannst." #: src/game.cpp #, c-format @@ -217039,6 +217248,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 entdeckt – Sicherheitsmodus ist an! (%2$s zum Ausschalten oder %3$s, um" +" Monster %4$s zu ignorieren)" #: src/game.cpp #, c-format @@ -217509,7 +217720,7 @@ msgstr "Behutsam steigst du mittels deinen Lianen ab." msgid "" "You effortlessly lower yourself and leave a vine rooted for future use." msgstr "" -"Mühelos seilst du dich ab und lässt eine Liane für spätere Verwending " +"Mühelos seilst du dich ab und lässt eine Liane für spätere Verwendung " "angewurzelt." #: src/game.cpp @@ -220066,7 +220277,7 @@ msgid "You can't crack a safe while deaf!" msgstr "Du kannst keinen Tresor knacken, solange du taub bist!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -222354,13 +222565,8 @@ msgstr "Keine Auswahlmöglichkeiten vorhanden" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Filter" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Filter: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -241371,6 +241577,16 @@ msgid "" "necessary glyphs." msgstr "" +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "Feldbilder verwenden" @@ -243341,10 +243557,6 @@ msgstr "" msgid "Heat :" msgstr "" -#: src/panels.cpp -msgid "Sound :" -msgstr "" - #: src/panels.cpp msgid "Deaf!" msgstr "Taub!" @@ -248254,8 +248466,9 @@ msgid "Remove attached curtains first." msgstr "Zuerst die montierten Vorhänge entfernen." #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "Zuerst die daran montierte Komponente entfernen." +#, c-format +msgid "Remove the attached %s first." +msgstr "" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/es_AR.po b/lang/po/es_AR.po index b3adfcd5bc7bf..1667283d14c26 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: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Noctivagante , 2020\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/es_AR/)\n" @@ -729,7 +729,7 @@ msgid_plural "oxygen" msgstr[0] "oxígeno" msgstr[1] "oxígeno" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Es un tubo de oxígeno." @@ -822,7 +822,7 @@ msgid_plural "nitrox" msgstr[0] "nitrox" msgstr[1] "nitrox" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "" @@ -835,7 +835,7 @@ msgid_plural "tinder" msgstr[0] "yesca" msgstr[1] "yesca" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "" @@ -858,7 +858,7 @@ msgid_plural "metal RPG dice" msgstr[0] "dado de metal de JDR" msgstr[1] "dados de metal de JDR" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "Es un dado de metal que se utiliza en diversos juegos de rol." @@ -898,7 +898,7 @@ msgid_plural "sulfur" msgstr[0] "azúfre" msgstr[1] "azúfre" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -946,7 +946,7 @@ msgid_plural "limestone" msgstr[0] "caliza" msgstr[1] "caliza" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -963,7 +963,7 @@ msgid_plural "quicklime" msgstr[0] "cal" msgstr[1] "cal" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -983,7 +983,7 @@ msgid_plural "sand" msgstr[0] "arena" msgstr[1] "arena" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -998,7 +998,7 @@ msgid_plural "soil" msgstr[0] "tierra fértil" msgstr[1] "tierra fértil" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1032,7 +1032,7 @@ msgid_plural "zinc powder" msgstr[0] "polvo de zinc" msgstr[1] "polvo de zinc" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1050,7 +1050,7 @@ msgid_plural "zinc oxide" msgstr[0] "óxido de zinc" msgstr[1] "óxido de zinc" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1065,7 +1065,8 @@ msgid_plural "manganese dioxide" msgstr[0] "óxido de manganeso" msgstr[1] "óxido de manganeso" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1082,7 +1083,8 @@ msgid_plural "potassium chloride" msgstr[0] "cloruro de potasio" msgstr[1] "cloruro de potasio" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1101,7 +1103,8 @@ msgid_plural "potassium hydroxide" msgstr[0] "hidróxido de potasio" msgstr[1] "hidróxido de potasio" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1118,7 +1121,7 @@ msgid_plural "sulfuric acid" msgstr[0] "ácido sulfúrico" msgstr[1] "ácido sulfúrico" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1172,7 +1175,7 @@ msgid_plural "nitric acid" msgstr[0] "ácido nítrico" msgstr[1] "ácido nítrico" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1296,7 +1299,7 @@ msgid_plural "saltpeter" msgstr[0] "nitrato de potasio" msgstr[1] "nitrato de potasio" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1313,7 +1316,7 @@ msgid_plural "niter" msgstr[0] "nitro" msgstr[1] "nitro" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1390,7 +1393,7 @@ msgid_plural "thermite" msgstr[0] "termita" msgstr[1] "termita" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1447,7 +1450,8 @@ msgid_plural "match head powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1524,7 +1528,7 @@ msgid_plural "soap flakes" msgstr[0] "ralladura de jabón" msgstr[1] "ralladura de jabón" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "" @@ -1551,7 +1555,7 @@ msgid_plural "wood ashes" msgstr[0] "ceniza de madera" msgstr[1] "cenizas de madera" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1678,7 +1682,7 @@ msgid_plural "lamp oil" msgstr[0] "querosén" msgstr[1] "querosén" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "" @@ -1691,7 +1695,7 @@ msgid_plural "motor oil" msgstr[0] "aceite de motor" msgstr[1] "aceite de motor" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "Es un aceite que se utiliza en los motores de los vehículos." @@ -1702,7 +1706,7 @@ msgid_plural "napalm" msgstr[0] "napalm" msgstr[1] "napalm" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -3353,6 +3357,9 @@ msgid "" "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" @@ -3435,6 +3442,9 @@ msgid "" "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. 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 ".50 BMG Match, reloaded" @@ -5201,7 +5211,7 @@ msgid_plural "red paint" msgstr[0] "pintura roja" msgstr[1] "pintura roja" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Una lata de pintura roja." @@ -5223,7 +5233,7 @@ msgid_plural "white paint" msgstr[0] "pintura blanca" msgstr[1] "pintura blanca" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Una lata de pintura blanca." @@ -5245,7 +5255,7 @@ msgid_plural "purple paint" msgstr[0] "pintura púrpura" msgstr[1] "pintura púrpura" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Una lata de pintura púrpura." @@ -5256,7 +5266,7 @@ msgid_plural "yellow paint" msgstr[0] "pintura amarilla" msgstr[1] "pintura amarilla" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Una lata de pintura amarilla." @@ -5330,7 +5340,7 @@ msgstr[0] "oro" msgstr[1] "oro" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5351,7 +5361,7 @@ msgid_plural "zinc" msgstr[0] "zinc" msgstr[1] "zinc" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5370,7 +5380,7 @@ msgid_plural "lead" msgstr[0] "plomo" msgstr[1] "plomo" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5385,7 +5395,7 @@ msgid_plural "magnesium powder" msgstr[0] "polvo de magnesio" msgstr[1] "polvo de magnesio" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5400,7 +5410,7 @@ msgid_plural "silver" msgstr[0] "plata" msgstr[1] "plata" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5607,7 +5617,7 @@ msgid_plural "leather scraps" msgstr[0] "pedazos de cuero" msgstr[1] "pedazos de cuero" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5622,7 +5632,7 @@ msgid_plural "lycra scraps" msgstr[0] "pedazos de licra" msgstr[1] "pedazos de licra" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5637,7 +5647,7 @@ msgid_plural "neoprene scraps" msgstr[0] "pedazos de neopreno" msgstr[1] "pedazos de neopreno" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5652,7 +5662,8 @@ msgid_plural "synthetic fabric scraps" msgstr[0] "pedazos de tela sintética" msgstr[1] "pedazos de tela sintética" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5695,7 +5706,8 @@ 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 +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5721,7 +5733,8 @@ 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 +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5747,7 +5760,8 @@ 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 +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5790,7 +5804,8 @@ 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 +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5822,7 +5837,8 @@ 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 +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5852,7 +5868,8 @@ 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 +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5878,7 +5895,8 @@ 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 +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -6215,11 +6233,11 @@ msgstr "" #: lang/json/AMMO_from_json.py msgid "grenade cartridge" -msgstr "" +msgstr "cartucho granada" #: lang/json/AMMO_from_json.py msgid "HEDP grenade cartridge" -msgstr "" +msgstr "cartucho granada HEDP" #. ~ Description for HEDP grenade cartridge #: lang/json/AMMO_from_json.py @@ -6228,6 +6246,9 @@ msgid "" "producing good penetration and a high number of damaging fragments. Good " "for armored or soft targets." msgstr "" +"Es un cartucho granada con carga doble de alta explosividad, capaz de " +"producir una gran penetración y con gran número de fragmentos. Bueno tanto " +"para objetivos blindados o suaves." #: lang/json/AMMO_from_json.py msgid "beanbag grenade cartridge" @@ -7911,12 +7932,14 @@ msgstr[0] "bolso de munición" msgstr[1] "bolsos de munición" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -7931,7 +7954,8 @@ msgstr[1] "bolsos de munición" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -7940,11 +7964,14 @@ msgid "You stash your %s." msgstr "Guardás tu %s." #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -7979,7 +8006,8 @@ msgid_plural "chest ammo pouches" msgstr[0] "bolsa pechera de munición" msgstr[1] "bolsas pecheras de munición" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -7994,7 +8022,7 @@ msgid_plural "chest rig" msgstr[0] "tirador utilitario" msgstr[1] "tirador utilitario" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -8013,12 +8041,13 @@ msgid_plural "javelin bags" msgstr[0] "bolsa para jabalinas" msgstr[1] "bolsas para jabalinas" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "Guardar jabalinas" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -8048,7 +8077,7 @@ msgid_plural "leg ammo pouches" msgstr[0] "bolsa pernera de munición" msgstr[1] "bolsas perneras de munición" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -8271,7 +8300,8 @@ msgid_plural "pairs of 2-by-arm guards" msgstr[0] "par de mangas de madera" msgstr[1] "pares de mangas de madera" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -8601,7 +8631,7 @@ msgid_plural "grenade pouches" msgstr[0] "bolso de granadas" msgstr[1] "bolsos de granadas" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -8631,12 +8661,14 @@ msgid_plural "large grenade pouches" msgstr[0] "bolso grande de granadas" msgstr[1] "bolsos grandes de granadas" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "Almacenar granadas" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "" @@ -9101,6 +9133,8 @@ msgid_plural "pairs of armored boots" msgstr[0] "par de botas blindadas" msgstr[1] "pares de botas blindadas" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -9209,6 +9243,8 @@ msgid_plural "pairs of XL survivor boots" msgstr[0] "par de botas de supervivencia XL" msgstr[1] "pares de botas de supervivencia XL" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -9695,7 +9731,8 @@ msgid_plural "pairs of ankle socks" msgstr[0] "par de soquetes" msgstr[1] "pares de soquetes" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -11168,7 +11205,8 @@ msgid_plural "pairs of armored fingerless gloves" msgstr[0] "par de guantes reforzados sin dedos" msgstr[1] "pares de guantes reforzados sin dedos" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -11504,7 +11542,8 @@ msgid_plural "pairs of XL survivor gloves" msgstr[0] "par de guantes de supervivencia XL" msgstr[1] "pares de guantes de supervivencia XL" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -11893,7 +11932,7 @@ msgid_plural "kippahs" msgstr[0] "kipá" msgstr[1] "kipás" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "Un gorro redondo y fino. Un tocado tradicional del judaismo." @@ -11904,7 +11943,7 @@ msgid_plural "kufi caps" msgstr[0] "gorra kufi" msgstr[1] "gorras kufi" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Es una gorra corta y redonda, sin ala." @@ -12243,7 +12282,7 @@ msgid_plural "galeae" msgstr[0] "galea" msgstr[1] "galeae" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -13009,7 +13048,7 @@ msgid_plural "diver's watches" msgstr[0] "reloj de buzo" msgstr[1] "relojes de buzo" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -17387,7 +17426,8 @@ msgid_plural "pairs of 2-by-shin guards" msgstr[0] "par de canilleras de madera" msgstr[1] "pares de canilleras de madera" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -17420,7 +17460,8 @@ msgid_plural "pairs of chainmail leggings" msgstr[0] "par de perneras de cota de malla" msgstr[1] "pares de perneras de cota de malla" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -17436,7 +17477,7 @@ msgid_plural "leather chaps" msgstr[0] "chaparrera de cuero" msgstr[1] "chaparreras de cuero" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -17451,7 +17492,7 @@ msgid_plural "fencing pants" msgstr[0] "pantalón de esgrima" msgstr[1] "pantalones de esgrima" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" @@ -17558,7 +17599,8 @@ msgid_plural "light survivor cargo pants" msgstr[0] "pantalón cargo ligero de supervivencia" msgstr[1] "pantalones cargo ligeros de supervivencia" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -17573,7 +17615,8 @@ msgid_plural "pairs of motorcycle pants" msgstr[0] "pantalones de moto" msgstr[1] "pares de pantalones de moto" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "" @@ -17613,7 +17656,7 @@ msgid_plural "breeches" msgstr[0] "calzones" msgstr[1] "calzones" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -17641,7 +17684,7 @@ msgid_plural "hot pants" msgstr[0] "minipantalón" msgstr[1] "minipantalones" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "Es un simple pantalón muy, muy corto." @@ -17652,7 +17695,7 @@ msgid_plural "fur hot pants" msgstr[0] "minipantalón de piel" msgstr[1] "minipantalones de piel" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "Es un simple pantalón muy, muy corto de piel." @@ -17663,7 +17706,8 @@ msgid_plural "leather hot pants" msgstr[0] "minipantalón de cuero" msgstr[1] "minipantalones de cuero" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "Es un simple pantalón muy, muy corto de cuero." @@ -17674,7 +17718,7 @@ msgid_plural "jeans" msgstr[0] "jean" msgstr[1] "jeans" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "Es un jean azul con dos bolsillos grandes." @@ -17714,7 +17758,7 @@ msgid_plural "leggings" msgstr[0] "calza larga" msgstr[1] "calzas largas" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -17850,7 +17894,7 @@ msgid_plural "fur pants" msgstr[0] "pantalón de piel" msgstr[1] "pantalones de piel" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Son unos pantalones pesados, recubiertos de piel." @@ -17874,7 +17918,7 @@ msgid_plural "leather pants" msgstr[0] "pantalón de cuero" msgstr[1] "pantalones de cuero" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -17900,7 +17944,8 @@ msgid_plural "mail carrier shorts" msgstr[0] "pantalón corto de cartero" msgstr[1] "pantalones cortos de cartero" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "Es un pantalón corto azul oscuro, de los que usan los carteros." @@ -17922,7 +17967,7 @@ msgid_plural "cargo shorts" msgstr[0] "bermuda cargo" msgstr[1] "bermudas cargo" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "" @@ -17935,7 +17980,7 @@ msgid_plural "denim shorts" msgstr[0] "pantalón corto de jean" msgstr[1] "pantalones cortos de jean" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -18088,18 +18133,21 @@ msgid_plural "bondage masks (zipped)" msgstr[0] "máscara de bondage (cerrada)" msgstr[1] "máscaras de bondage (cerradas)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Abrir el cierre" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "" "Abrís el cierre que cubre los ojos y la boca de la máscara de bondage." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -19093,7 +19141,7 @@ msgid_plural "leather pouches" msgstr[0] "bolso de cuero" msgstr[1] "bolsos de cuero" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -20363,7 +20411,8 @@ msgid_plural "lorica segmentata" msgstr[0] "lorica segmentata" msgstr[1] "lorica segmentata" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -20421,7 +20470,7 @@ msgid_plural "cuirasses" msgstr[0] "coraza" msgstr[1] "corazas" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -21194,7 +21243,8 @@ msgid_plural "pairs of arm warmers" msgstr[0] "par de guantillas" msgstr[1] "pares de guantillas" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "" @@ -21286,7 +21336,7 @@ msgid_plural "boy shorts" msgstr[0] "culotte" msgstr[1] "culottes" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -21314,7 +21364,7 @@ msgid_plural "briefs" msgstr[0] "slip" msgstr[1] "slips" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "Es un slip. Ropa interior cómoda para hombre." @@ -21442,7 +21492,8 @@ msgid_plural "pairs of XL leg warmers" msgstr[0] "par de calentadores XL" msgstr[1] "pares de calentadores XL" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -21578,7 +21629,8 @@ msgid_plural "compression shorts" msgstr[0] "calza corta" msgstr[1] "calzas cortas" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -23119,7 +23171,7 @@ msgid_plural "test batteries" msgstr[0] "" msgstr[1] "" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -24167,7 +24219,8 @@ msgid_plural "Power Storage CBM Mk. II" msgstr[0] "" msgstr[1] "" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -26164,19 +26217,19 @@ msgstr[1] "" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -30785,7 +30838,8 @@ msgid_plural "commercial fertilizer" msgstr[0] "fertilizante comercial" msgstr[1] "fertilizante comercial" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "Unos gránulos ricos en nutrientes para las plantas." @@ -30876,7 +30930,8 @@ msgid_plural "concentrated acid" msgstr[0] "ácido concentrado" msgstr[1] "ácido concentrado" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Ácido concentrado. No te lo tomes." @@ -31668,7 +31723,7 @@ msgid_plural "cheap whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -32180,7 +32235,7 @@ msgid_plural "cooked fish" msgstr[0] "pescado cocinado" msgstr[1] "pescados cocinados" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "Es un pescado cocinado recientemente. Muy nutritivo." @@ -32269,7 +32324,7 @@ msgid_plural "chunks of meat" msgstr[0] "pedazo de carne" msgstr[1] "pedazos de carne" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -32298,7 +32353,8 @@ msgid_plural "chunks of mutant meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -32424,7 +32480,7 @@ msgid_plural "cooked offal" msgstr[0] "achura cocinada" msgstr[1] "achuras cocinadas" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -32601,7 +32657,8 @@ msgid_plural "cooked pieces of lung" msgstr[0] "pedazo de pulmón cocinado" msgstr[1] "pedazos de pulmón cocinados" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -32659,7 +32716,7 @@ msgid_plural "cooked brains" msgstr[0] "cerebro cocinado" msgstr[1] "cerebros cocinados" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -32776,7 +32833,8 @@ msgid_plural "chunks of mutant fat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -32849,7 +32907,8 @@ msgid_plural "chunks of tainted meat" msgstr[0] "pedazo de carne contaminada" msgstr[1] "pedazos de carne contaminada" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -33427,7 +33486,7 @@ msgid_plural "chamomile tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -33454,7 +33513,7 @@ msgid_plural "coffee" msgstr[0] "café" msgstr[1] "café" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -33472,7 +33531,8 @@ msgid_plural "coffee substitute" msgstr[0] "" msgstr[1] "" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -33486,7 +33546,7 @@ msgid_plural "chicory brew" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -33900,7 +33960,7 @@ msgid_plural "clean water" msgstr[0] "agua potable" msgstr[1] "agua potable" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "Agua potable, fresca. Verdaderamente, lo mejor para calmar tu sed." @@ -34419,7 +34479,8 @@ msgid_plural "cooked strawberries" msgstr[0] "frutilla cocinada" msgstr[1] "frutillas cocinadas" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "Es como mermelada de frutilla pero sin azúcar." @@ -34439,7 +34500,8 @@ msgid_plural "cooked blueberries" msgstr[0] "mora azul cocinada" msgstr[1] "moras azules cocinadas" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "Es como mermelada de mora azul pero sin azúcar." @@ -35305,18 +35367,18 @@ msgid_plural "chocolate candies" msgstr[0] "golosina de chocolate" msgstr[1] "golosinas de chocolate" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "Es un puñado de golosinas coloridas rellenas con chocolate." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "caramelo masticable" -msgstr[1] "caramelos masticables" +msgid_plural "chewy candy" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "Es un puñado de caramelos masticables coloridos con sabor a frutas." @@ -35562,7 +35624,7 @@ msgid_plural "cheese nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -35692,7 +35754,7 @@ msgid_plural "chili dogs" msgstr[0] "pancho con chili" msgstr[1] "panchos con chili" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Es un pancho con chili con carne como aderezo. ¡Rico!" @@ -35730,7 +35792,8 @@ msgid_plural "chocolate pancakes" msgstr[0] "panqueque de chocolate" msgstr[1] "panqueques de chocolate" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -35767,7 +35830,7 @@ msgid_plural "cheese fries" msgstr[0] "papas fritas con queso" msgstr[1] "papas fritas con queso" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "Son papas fritas cubiertas con delicioso queso derretido." @@ -35809,11 +35872,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "pancho cocinado" -msgstr[1] "panchos cocinados" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -36364,21 +36425,23 @@ msgid_plural "chilis con carne" msgstr[0] "chili con carne" msgstr[1] "chilis con carne" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "Es un guiso picante que tiene ajíes, carne, tomates y porotos." @@ -37298,7 +37361,7 @@ msgid_plural "cocaine" msgstr[0] "cocaína" msgstr[1] "cocaína" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -37476,7 +37539,7 @@ msgid_plural "chewing gum" msgstr[0] "chicle" msgstr[1] "chicle" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "" @@ -39650,7 +39713,7 @@ msgid_plural "chitin powder" msgstr[0] "polvo de quitina" msgstr[1] "polvo de quitina" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -39712,7 +39775,7 @@ msgid_plural "cooked beans" msgstr[0] "porotos cocinados" msgstr[1] "porotos cocinados" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "Es una porción abundante de porotos norteños cocinados." @@ -39790,7 +39853,7 @@ msgid_plural "cooked lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "" @@ -39801,7 +39864,7 @@ msgid_plural "coffee powder" msgstr[0] "café molido" msgstr[1] "café molido" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -41495,7 +41558,7 @@ msgid_plural "chicory seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "" @@ -41581,7 +41644,8 @@ msgid_plural "chili pepper seeds" msgstr[0] "semillas de ají" msgstr[1] "semillas de ají" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Son unas semillas de ají." @@ -41954,7 +42018,7 @@ msgid_plural "coffee beans" msgstr[0] "granos de café" msgstr[1] "granos de café" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Son unos granos de café. Pueden ser tostados." @@ -41977,7 +42041,7 @@ msgid_plural "chamomile seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "" @@ -42294,11 +42358,9 @@ msgstr "Es un tallo de tomillo. Tiene un olor delicioso." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "tallo de junco cocinado" -msgstr[1] "tallos de junco cocinados" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -42328,7 +42390,8 @@ msgid_plural "cooked dandelion greens" msgstr[0] "hoja verde de dientes de león cocinada" msgstr[1] "hojas verdes de dientes de león cocinadas" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Hojas cocinadas de dientes de león. Sabrosas y nutritivas." @@ -42363,7 +42426,8 @@ msgid_plural "cooked wild vegetables" msgstr[0] "verduras silvestres cocinadas" msgstr[1] "verduras silvestres cocinadas" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "" @@ -42386,7 +42450,7 @@ msgid_plural "cooked buckwheat" msgstr[0] "alforfón cocinado" msgstr[1] "alforfón cocinado" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -42442,7 +42506,7 @@ msgid_plural "cooked rice" msgstr[0] "arroz cocinado" msgstr[1] "arroz cocinado" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Es una porción abundante de arroz de grano grande blanco cocinado." @@ -43065,9 +43129,11 @@ msgstr "Una deliciosa pizza con queso derretido arriba." #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "barra de cereales" +msgid_plural "granola" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -45877,7 +45943,7 @@ msgid_plural "rock salt" msgstr[0] "sal de roca" msgstr[1] "sal de roca" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "" @@ -45890,7 +45956,7 @@ msgid_plural "rhodonite" msgstr[0] "" msgstr[1] "" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -45903,7 +45969,7 @@ msgid_plural "zincite" msgstr[0] "zincita" msgstr[1] "zincita" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -46118,7 +46184,8 @@ msgid_plural "semi ground grains" msgstr[0] "" msgstr[1] "" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "" @@ -46129,7 +46196,8 @@ msgid_plural "smoldering embers" msgstr[0] "brasas ardientes" msgstr[1] "brasas ardientes" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -46163,7 +46231,7 @@ msgid_plural "coins" msgstr[0] "moneda" msgstr[1] "monedas" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -46193,19 +46261,27 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "fuego cercano" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "músculo" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -46219,6 +46295,15 @@ msgid_plural "none" msgstr[0] "" msgstr[1] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -46317,7 +46402,7 @@ msgid_plural "leather patches" msgstr[0] "pedazo de cuero" msgstr[1] "pedazos de cuero" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "" @@ -46330,7 +46415,7 @@ msgid_plural "felt patches" msgstr[0] "pedazo de fieltro" msgstr[1] "pedazos de fieltro" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "" @@ -46420,7 +46505,8 @@ msgid_plural "ceramic disks" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -46732,7 +46818,7 @@ msgid_plural "concrete" msgstr[0] "concreto" msgstr[1] "concreto" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "Es un poco de concreto, listo para ser usado en alguna construcción." @@ -46773,7 +46859,7 @@ msgid_plural "dead flares" msgstr[0] "bengala usada" msgstr[1] "bengalas usadas" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "Es una bengala de magnesio usada. Prácticamente, basura." @@ -47340,7 +47426,8 @@ msgid_plural "high-quality lenses" msgstr[0] "lente de alta calidad" msgstr[1] "lentes de alta calidad" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -47355,7 +47442,8 @@ msgid_plural "small high-quality lenses" msgstr[0] "" msgstr[1] "" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -47370,7 +47458,8 @@ msgid_plural "pairs of tinted glass" msgstr[0] "par de anteojos polarizados" msgstr[1] "pares de anteojos polarizados" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -47532,7 +47621,7 @@ msgid_plural "fish bowls" msgstr[0] "pecera" msgstr[1] "peceras" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -47878,7 +47967,7 @@ msgid_plural "lumps of clay" msgstr[0] "masa de arcilla" msgstr[1] "masas de arcilla" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Una masa de arcilla fresca. Útil para fabricar algunas cosas." @@ -47901,7 +47990,7 @@ msgid_plural "mortar" msgstr[0] "mezcla" msgstr[1] "mezcla" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "Es un poco de mezcla, lista para ser usada en alguna construcción." @@ -47912,17 +48001,17 @@ msgid_plural "soft adobe bricks" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -48154,7 +48243,7 @@ msgid_plural "cured hides" msgstr[0] "pellejo curado" msgstr[1] "pellejos curados" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -48171,7 +48260,7 @@ msgid_plural "tanned hides" msgstr[0] "pellejo curtido" msgstr[1] "pellejos curtidos" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -48186,7 +48275,7 @@ msgid_plural "cured pelts" msgstr[0] "pelaje curado" msgstr[1] "pelajes curados" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -48203,7 +48292,7 @@ msgid_plural "tanned pelts" msgstr[0] "pelaje curtido" msgstr[1] "pelajes curtidos" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -48219,7 +48308,7 @@ msgid_plural "piles of straw" msgstr[0] "pila de paja" msgstr[1] "pilas de paja" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -48234,7 +48323,7 @@ msgid_plural "straw dolls" msgstr[0] "muñeca de paja" msgstr[1] "muñecas de paja" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "Una muñeca vieja de paja. Representa una mujer con un vestido." @@ -48400,7 +48489,7 @@ msgid_plural "joint roaches" msgstr[0] "tuca" msgstr[1] "tucas" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -48594,7 +48683,7 @@ msgid_plural "refrigerant tanks" msgstr[0] "tanque de refrigerante" msgstr[1] "tanques de refrigerante" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -48828,7 +48917,7 @@ msgid_plural "flyers" msgstr[0] "folleto" msgstr[1] "folletos" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "Es un pedazo de papel." @@ -48839,7 +48928,7 @@ msgid_plural "survivor's notes" msgstr[0] "nota de sobreviviente" msgstr[1] "notas de sobreviviente" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -48865,7 +48954,7 @@ msgid_plural "score cards" msgstr[0] "" msgstr[1] "" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "" @@ -48876,7 +48965,7 @@ msgid_plural "newspaper pages" msgstr[0] "página de diario" msgstr[1] "páginas de diario" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -48889,7 +48978,7 @@ msgstr "" "de la información que contiene es terriblemente trivial, o fuera de tiempo, " "pero uno cosa capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -48902,7 +48991,7 @@ msgstr "" "que contiene es terriblemente trivial, o fuera de tiempo, pero uno cosa " "capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -48914,7 +49003,7 @@ msgstr "" "contiene es terriblemente trivial, o fuera de tiempo, pero uno cosa capta tu" " atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -48925,7 +49014,7 @@ msgstr "" " mayoría de la información que contiene es terriblemente trivial, o fuera de" " tiempo, pero uno cosa capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -48936,7 +49025,7 @@ msgstr "" "al Cataclismo. La mayoría de la información que contiene es terriblemente " "trivial, o fuera de tiempo, pero uno cosa capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -48953,7 +49042,7 @@ msgid_plural "vault leaflets" msgstr[0] "panfleto de bóveda" msgstr[1] "panfletos de bóveda" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -49530,7 +49619,8 @@ msgid_plural "sets of tiny spidery legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "" @@ -49541,7 +49631,8 @@ msgid_plural "sets of reverse-jointed legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -49553,7 +49644,8 @@ msgid_plural "sets of omni wheels" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "" @@ -49564,7 +49656,7 @@ msgid_plural "sets of rotors" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "" @@ -49575,7 +49667,8 @@ msgid_plural "sets of android legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "" @@ -49586,7 +49679,8 @@ msgid_plural "sets of android arms" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "" @@ -49597,7 +49691,8 @@ msgid_plural "sets of small tank tread" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" @@ -49608,7 +49703,8 @@ msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -49621,7 +49717,8 @@ msgid_plural "police bot chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -49652,7 +49749,7 @@ msgid_plural "misc software" msgstr[0] "software variado" msgstr[1] "software variado" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "Software variado para pasar el tiempo. Probablemente sea inútil." @@ -49663,7 +49760,7 @@ msgid_plural "hackPRO" msgstr[0] "hackPRO" msgstr[1] "hackPRO" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "Software de hackeo." @@ -49696,7 +49793,7 @@ msgid_plural "infection data" msgstr[0] "información de infección" msgstr[1] "información de infección" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Información médica de sangre de zombi." @@ -49707,7 +49804,7 @@ msgid_plural "lab data" msgstr[0] "info de laboratorio" msgstr[1] "info de laboratorio" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "Son archivos de investigación de un laboratorio gubernamental." @@ -49718,7 +49815,7 @@ msgid_plural "train data" msgstr[0] "info de tren" msgstr[1] "info de tren" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "" @@ -49730,7 +49827,7 @@ msgid_plural "neural data" msgstr[0] "" msgstr[1] "" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -49744,7 +49841,8 @@ msgid_plural "misc software" msgstr[0] "" msgstr[1] "" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -52770,7 +52868,7 @@ msgid_plural "spare parts" msgstr[0] "partes de repuesto" msgstr[1] "partes de repuesto" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -53243,17 +53341,20 @@ msgid_plural "expandable batons (extended)" msgstr[0] "garrote extendible (extendido)" msgstr[1] "garrotes extendibles (extendidos)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "Contraer" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Cerrás tu garrote." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -53536,7 +53637,8 @@ msgid_plural "ironshod quarterstaves" msgstr[0] "vara larga con calces de hierro" msgstr[1] "varas largas con calces de hierro" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -53779,7 +53881,7 @@ msgid_plural "quarterstaves" msgstr[0] "vara larga" msgstr[1] "varas largas" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -53794,7 +53896,7 @@ msgid_plural "rocks in socks" msgstr[0] "piedra en una media" msgstr[1] "piedras en medias" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "" @@ -53807,7 +53909,8 @@ msgid_plural "sharpened toothbrushes" msgstr[0] "cepillo de dientes afilado" msgstr[1] "cepillos de dientes afilados" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "Un objeto de higiene personal convertido en una faca." @@ -54107,7 +54210,7 @@ msgid_plural "naginata" msgstr[0] "naginata" msgstr[1] "naginata" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -54118,7 +54221,7 @@ msgstr "" "katana y otras espadas japonesas. Ocasionalmente era utilizada por los " "samurai en los primeros tiempos, o por sus esposas en defensa de su hogar." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -54126,7 +54229,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -54140,7 +54243,8 @@ msgid_plural "survivor naginata" msgstr[0] "naginata de supervivencia" msgstr[1] "naginatas de supervivencia" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -54216,7 +54320,7 @@ msgid_plural "dories" msgstr[0] "dory" msgstr[1] "dorus" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "" @@ -54228,7 +54332,7 @@ msgid_plural "ji" msgstr[0] "ji" msgstr[1] "ji" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -54306,7 +54410,7 @@ msgid_plural "jian" msgstr[0] "jian" msgstr[1] "jian" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -54424,7 +54528,7 @@ msgid_plural "nodachi" msgstr[0] "nodachi" msgstr[1] "nodachi" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -54433,7 +54537,7 @@ msgstr "" "Es una réplica berreta sin filo de una enorme espada de dos manos curvada de" " origen japonés. Es sorprendentemente liviana para el tamaño que tiene." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -54563,7 +54667,7 @@ msgid_plural "cutlasses" msgstr[0] "sable" msgstr[1] "sables" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -54672,7 +54776,7 @@ msgid_plural "krises" msgstr[0] "kris" msgstr[1] "krises" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -54702,7 +54806,7 @@ msgid_plural "tiger claws" msgstr[0] "garras de tigre" msgstr[1] "garras de tigre" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -54731,7 +54835,8 @@ msgid_plural "pairs of brass knuckles" msgstr[0] "par de nudillos de latón" msgstr[1] "pares de nudillos de latón" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -54764,7 +54869,8 @@ msgid_plural "pairs of nail knuckles" msgstr[0] "par de nudillos con clavos" msgstr[1] "pares de nudillos con clavos" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -54779,7 +54885,8 @@ msgid_plural "pairs of steel knuckles" msgstr[0] "par de nudillos de acero" msgstr[1] "pares de nudillos de acero" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -54878,7 +54985,7 @@ msgid_plural "throwing knives" msgstr[0] "cuchillo arrojadizo" msgstr[1] "cuchillos arrojadizos" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -54907,14 +55014,15 @@ msgid_plural "sheets of glass" msgstr[0] "plancha de vidrio" msgstr[1] "planchas de vidrio" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -54928,7 +55036,8 @@ msgid_plural "sheets of reinforced glass" msgstr[0] "plancha de vidrio reforzado" msgstr[1] "planchas de vidrio reforzado" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "Una plancha grande de vidrio endurecido con alambre de acero." @@ -54939,7 +55048,8 @@ msgid_plural "panes of reinforced glass" msgstr[0] "lámina de vidrio reforzado" msgstr[1] "láminas de vidrio reforzado" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "Una pequeña lámina de vidrio reforzado con alambre de acero." @@ -55034,7 +55144,7 @@ msgid_plural "scrap copper" msgstr[0] "pedazo de cobre" msgstr[1] "pedazo de cobre" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "Es un pedazo chico de cobre, útil para fabricar o reparar cosas." @@ -55100,7 +55210,7 @@ msgid_plural "mattresses" msgstr[0] "" msgstr[1] "" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "" @@ -55111,7 +55221,7 @@ msgid_plural "down mattresses" msgstr[0] "" msgstr[1] "" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "" @@ -55452,21 +55562,28 @@ msgid_plural "sealed jars of eggs" msgstr[0] "frasco sellado con huevos" msgstr[1] "frascos sellados con huevos" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Abrir frasco" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Abrís el frasco, exponiendo el contenido al ambiente." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -55481,7 +55598,8 @@ msgid_plural "sealed jars of pickles" msgstr[0] "frasco sellado con pickles" msgstr[1] "frascos sellados con pickles" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -55496,7 +55614,8 @@ msgid_plural "sealed jars of sauerkraut" msgstr[0] "frasco sellado con chucrut" msgstr[1] "frascos sellados con chucrut" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -56156,7 +56275,7 @@ msgid_plural "radio car boxes" msgstr[0] "caja de auto radiocontrolado" msgstr[1] "cajas de autos radiocontrolados" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -56264,7 +56383,8 @@ msgid_plural "sets of ring stand clamps" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -56328,7 +56448,8 @@ msgid_plural "pairs of knitting needles" msgstr[0] "agujas de tejer" msgstr[1] "pares de agujas de tejer" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -56425,7 +56546,8 @@ msgid_plural "distaves and spindles" msgstr[0] "huso y aspa" msgstr[1] "husos y aspas" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -56548,7 +56670,7 @@ msgid_plural "storage battery cases" msgstr[0] "caja para baterías de almacenamiento" msgstr[1] "cajas para baterías de almacenamiento" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -56563,7 +56685,7 @@ msgid_plural "wood boat hulls" msgstr[0] "casco de madera de bote" msgstr[1] "cascos de madera de bote" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -56579,7 +56701,7 @@ msgid_plural "plastic boat hulls" msgstr[0] "casco de plástico de bote" msgstr[1] "cascos de plástico de bote" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -56613,7 +56735,7 @@ msgid_plural "oars" msgstr[0] "remos" msgstr[1] "remos" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Son remos para un bote." @@ -56624,7 +56746,7 @@ msgid_plural "sails" msgstr[0] "" msgstr[1] "" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "" @@ -56635,7 +56757,8 @@ msgid_plural "inflatable section" msgstr[0] "sección inflable" msgstr[1] "sección inflable" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "Una parte inflable para bote." @@ -56646,7 +56769,8 @@ msgid_plural "inflatable airbag" msgstr[0] "airbag inflable" msgstr[1] "airbags inflables" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "Un airbag inflable." @@ -56831,7 +56955,8 @@ msgid_plural "sets of vehicle controls" msgstr[0] "controles de vehículo" msgstr[1] "conjuntos de controles de vehículo" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "Un conjunto de controles de vehículo. Útil para armar un vehículo." @@ -56891,7 +57016,8 @@ msgid_plural "sets of drive by wire controls" msgstr[0] "controles drive by wire" msgstr[1] "conjuntos de controles drive by wire" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -56906,7 +57032,7 @@ msgid_plural "robot driving units" msgstr[0] "unidad de conducción de robot" msgstr[1] "unidades de conducción de robot" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -57101,7 +57227,7 @@ msgid_plural "vehicle scoops" msgstr[0] "pala mecánica" msgstr[1] "palas mecánicas" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -57117,7 +57243,7 @@ msgid_plural "seed drills" msgstr[0] "sembradora" msgstr[1] "sembradoras" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -57134,7 +57260,7 @@ msgid_plural "reapers" msgstr[0] "cosechadora" msgstr[1] "cosechadoras" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -57183,7 +57309,7 @@ msgid_plural "plows" msgstr[0] "arado" msgstr[1] "arados" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "" @@ -57346,7 +57472,8 @@ msgid_plural "emergency vehicle lights (red)" msgstr[0] "luz de emergencia para vehículo (roja)" msgstr[1] "luces de emergencia para vehículo (rojas)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -57362,7 +57489,8 @@ msgid_plural "emergency vehicle lights (blue)" msgstr[0] "luz de emergencia para vehículo (azul)" msgstr[1] "luces de emergencia para vehículo (azules)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -57404,7 +57532,8 @@ msgid_plural "sets of hand rims" msgstr[0] "conjunto de aros de ruedas" msgstr[1] "conjuntos de aros de ruedas" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "" @@ -58096,7 +58225,7 @@ msgid_plural "vehicle coolers" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "" @@ -58107,7 +58236,7 @@ msgid_plural "vehicle heaters" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "" @@ -58482,9 +58611,8 @@ msgstr[1] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -71613,7 +71741,7 @@ msgid_plural "lambs" msgstr[0] "cordero" msgstr[1] "corderos" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -80039,7 +80167,8 @@ msgstr[1] "cascos de minero (enc.)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -80649,12 +80778,14 @@ msgid_plural "phase immersion suits (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -106443,10 +106574,10 @@ msgid "" msgstr "" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "paja" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "Es un fardo de paja. Podés dormir ahí encima, si estás desesperado/a." @@ -174608,7 +174739,7 @@ msgid "Clothing Store" msgstr "Negocio de Ropa" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174616,7 +174747,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174764,42 +174895,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174872,13 +175003,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175094,14 +175225,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175272,16 +175403,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "¿Qué estás haciendo acá?" @@ -175353,24 +175484,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "No, solo no..." +msgid "Anything to do before I go to sleep?" +msgstr "¿Algo para hacer antes de que me vaya a dormir?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "¡Dejame dormir, !" +msgid "Just few minutes more..." +msgstr "Unos minutitos más..." #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Hacelo rápido, quiero irme a dormir." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Unos minutitos más..." +msgid "Just let me sleep, !" +msgstr "¡Dejame dormir, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "¿Algo para hacer antes de que me vaya a dormir?" +msgid "No, just no..." +msgstr "No, solo no..." #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -175484,15 +175615,15 @@ msgid "Let's go." msgstr "Vamos." #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175500,19 +175631,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175520,7 +175647,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -175528,7 +175655,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175536,19 +175663,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175556,7 +175683,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175564,13 +175691,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -175679,13 +175810,12 @@ msgid "Attack anything you want." msgstr "Atacá todo lo que quieras." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175695,11 +175825,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175739,12 +175870,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175754,12 +175885,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175795,19 +175926,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175851,7 +175982,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175859,11 +175990,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175871,7 +175998,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175879,7 +176006,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175887,7 +176014,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175895,7 +176022,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175903,7 +176030,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175911,7 +176038,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -175919,13 +176046,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Seguir las mismas reglas que su seguidor." @@ -176094,14 +176225,14 @@ msgstr "" msgid "Sure thing, I'll make my way there." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -176272,28 +176403,28 @@ msgid "I don't care." msgstr "No me importa." #: 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?" +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 just have one job for you. Want to hear about it?" -msgstr "Tengo un trabajo para vos. ¿Querés que te cuente?" +msgid "I don't have any jobs for you." +msgstr "No tengo ningún trabajo para vos." #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" +msgid "I have more 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?" +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." -msgstr "No tengo ningún trabajo para vos." +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 don't have any more jobs for you." -msgstr "No tengo ningún otro trabajo para vos." +msgid "I have another job for you. Want to hear about it?" +msgstr "Tengo otro trabajo para vos. ¿Querés que te cuente?" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -176304,10 +176435,6 @@ msgstr "Ah, bueno." msgid "Never mind, I'm not interested." msgstr "No importa, no estoy interesado." -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "¿Cuál trabajo?" @@ -176316,6 +176443,10 @@ msgstr "¿Cuál trabajo?" msgid "What about it?" msgstr "¿Qué te parece?" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "¡Yo lo hago!" @@ -176530,32 +176661,32 @@ msgstr "Hmm, bueno." msgid "Thanks!" msgstr "¡Gracias!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "Tengo mucha sed, dame algo para tomar." +msgid "I have some reason for not telling you." +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Tengo mucha hambre, dame algo para comer." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "Estoy muy cansado/a, dejame descansar un poco." #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "" +msgid "I'm too hungry, give me something to eat." +msgstr "Tengo mucha hambre, dame algo para comer." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." +msgid "I'm too thirsty, give me something to drink." +msgstr "Tengo mucha sed, dame algo para tomar." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176563,16 +176694,16 @@ msgid "Ah, okay." msgstr "Ah, ok." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Hasta que no tenga algún antibiótico, no..." +msgid "Why should I travel with you?" +msgstr "¿Por qué tendría que viajar con vos?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Recién me preguntaste; preguntame de nuevo después." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "¿Por qué tendría que viajar con vos?" +msgid "Not until I get some antibiotics..." +msgstr "Hasta que no tenga algún antibiótico, no..." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -176663,21 +176794,21 @@ msgid "On second thought, never mind." msgstr "Pensandolo bien, olvidate." #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" +msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" -"çNo puedo entrenarte apropiadamente mientras estás controlando un vehículo!" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while I'm operating a vehicle!" -msgstr "" +msgid "I have some reason for denying you training." +msgstr "Tengo razones para negarte el entrenamiento." #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "Dale tiempo, te voy a mostrar algo nuevo después..." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "Tengo razones para negarte el entrenamiento." +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "" +"çNo puedo entrenarte apropiadamente mientras estás controlando un vehículo!" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -176715,14 +176846,14 @@ msgstr "Prefiero quedarme con eso para mí." msgid "I understand…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Ya me pediste cosas; preguntame en otro momento." - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "¿Por qué tendría que compartir mi equipo con vos?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Ya me pediste cosas; preguntame en otro momento." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "Bueno, está bien." @@ -176865,16 +176996,16 @@ msgstr "¡Un placer hacer negocios!" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "" @@ -177871,15 +178002,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -177887,11 +178018,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179498,10 +179629,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "Ahora no puedo hablar de eso. No puedo." - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -179510,7 +179637,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179521,10 +179649,13 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "Ahora no puedo hablar de eso. No puedo." + #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." msgstr "Te podría venir bien sacártelo de adentro." @@ -179921,19 +180052,19 @@ msgstr "Gracias por decirme todo eso. " #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Mi esposo pudo salir conmigo, pero se lo comió uno de esos monstruos plantas" +"Mi esposa pudo salir conmigo, pero se la comió uno de esos monstruos plantas" " de unos días antes de que te encuentre a vos. Este no ha sido un " "buen año para mí." #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Mi esposa pudo salir conmigo, pero se la comió uno de esos monstruos plantas" +"Mi esposo pudo salir conmigo, pero se lo comió uno de esos monstruos plantas" " de unos días antes de que te encuentre a vos. Este no ha sido un " "buen año para mí." @@ -179996,9 +180127,10 @@ msgid "I'm sorry you lost someone." msgstr "Lamento que hayas perdido a alguien querido." #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" -msgstr "Dije que no quería hablar de eso. ¿No entendés?" +msgid "Just another tale of love and loss. Not one I like to tell." +msgstr "" +"Es solo otra historia de de amor y pérdida. Y no me agrada " +"narrarla." #: lang/json/talk_topic_from_json.py msgid "" @@ -180009,10 +180141,9 @@ msgstr "" "contarla una vez más." #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." -msgstr "" -"Es solo otra historia de de amor y pérdida. Y no me agrada " -"narrarla." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" +msgstr "Dije que no quería hablar de eso. ¿No entendés?" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -180035,33 +180166,13 @@ msgid "" "Oh, . This doesn't have anything to do with you, or with us." msgstr "Oh, . Eso no tiene nada que ver con vos, o con nosotros." -#: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." -msgstr "Está bien. Tenía a alguien. Lo perdí." - #: lang/json/talk_topic_from_json.py msgid "All right, fine. I had someone. I lost her." msgstr "Está bien. Tenía a alguien. La perdí." #: lang/json/talk_topic_from_json.py -msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " -"zone. Things I can't describe lurching through the streets, crushing people" -" and cars. Soldiers trying to stop them, but hitting people in the " -"crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " -" made it alive." -msgstr "" -"Él estaba en casa cuando empezaron a caer las bombas y el mundo se fue a la " -"mierda. Yo estaba en el trabajo. Intenté llegar hasta la casa pero la ciudad" -" era una zona de guerra. Cosas que no sé cómo describir tambaleándose por " -"las calles, aplastando gente y autos. Los soldados intentando detenerlos, " -"pero también le daban a la gente en los tiroteos. Y entonces, esos caídos en" -" el daño colateral también se unían al enemigo. Si no hubiera sido por mi " -"marido, me habría ido, pero hice lo que pude y logré escabullirme. Logré " -"sobrevivir,." +msgid "All right, fine. I had someone. I lost him." +msgstr "Está bien. Tenía a alguien. Lo perdí." #: lang/json/talk_topic_from_json.py msgid "" @@ -180083,6 +180194,26 @@ msgstr "" "sido por mi esposa, me habría ido, pero hice lo que pude y logré " "escabullirme. Logré sobrevivir,." +#: lang/json/talk_topic_from_json.py +msgid "" +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " +"zone. Things I can't describe lurching through the streets, crushing people" +" and cars. Soldiers trying to stop them, but hitting people in the " +"crossfire as much as anything. And then the collateral damage would get " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " +" made it alive." +msgstr "" +"Él estaba en casa cuando empezaron a caer las bombas y el mundo se fue a la " +"mierda. Yo estaba en el trabajo. Intenté llegar hasta la casa pero la ciudad" +" era una zona de guerra. Cosas que no sé cómo describir tambaleándose por " +"las calles, aplastando gente y autos. Los soldados intentando detenerlos, " +"pero también le daban a la gente en los tiroteos. Y entonces, esos caídos en" +" el daño colateral también se unían al enemigo. Si no hubiera sido por mi " +"marido, me habría ido, pero hice lo que pude y logré escabullirme. Logré " +"sobrevivir,." + #: lang/json/talk_topic_from_json.py msgid "You must have seen some shit." msgstr "Debés haber visto cosas horribles." @@ -180151,11 +180282,11 @@ msgstr "¿Llegaste a entrar a la casa?" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -180163,11 +180294,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -180944,6 +181075,16 @@ msgstr "" " a transitar este Infierno en la Tierra. Me arrepiento de no haber prestado " "atención en Catecismo." +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -180955,16 +181096,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -181059,14 +181190,6 @@ msgstr "Lamento lo de Buck. " msgid "I'm sorry about Buck. " msgstr "Lamento lo de Buck. " -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "" -"Como te dije, vos querés que yo te cuente una historia, vas a tener que " -"poner whisky. Un botella entera, en lo posible." - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " @@ -181075,6 +181198,14 @@ msgstr "" "Escuchame. Te la hago corta. Yo trabajo para vos, ¿no? No tengo interés en " "crear una relación. No me pagás para que sea tu amigo." +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "" +"Como te dije, vos querés que yo te cuente una historia, vas a tener que " +"poner whisky. Un botella entera, en lo posible." + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -181458,6 +181589,15 @@ msgid "" "help, I'd just be another dripping corpse." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " +"just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancé " @@ -181468,16 +181608,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " -"just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." +msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What were you saying before that?" +msgid "Welcome! You seem new, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181500,10 +181635,6 @@ msgstr "" msgid "How's the weather?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "¿Qué es este lugar?" @@ -181590,16 +181721,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181646,15 +181777,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181688,15 +181819,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181739,14 +181870,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181815,11 +181946,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181876,11 +182007,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181892,19 +182023,19 @@ msgid "You're disgusting." msgstr "Sos desagradable." #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181930,9 +182061,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181940,7 +182069,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182015,13 +182146,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182115,7 +182246,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182123,7 +182254,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182421,11 +182552,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182624,8 +182755,12 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "Alguacil, espero que esté aquí para ayudarnos." +msgid "" +"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 "" +"Señor, no sé cómo demonios llegó hasta acá abajo pero si le queda un poco de" +" juicio se iría mientras pueda." #: lang/json/talk_topic_from_json.py msgid "" @@ -182636,12 +182771,8 @@ msgstr "" "de juicio se iría mientras pueda." #: 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 " -"you'll get out while you can." -msgstr "" -"Señor, no sé cómo demonios llegó hasta acá abajo pero si le queda un poco de" -" juicio se iría mientras pueda." +msgid "Marshal, I hope you're here to assist us." +msgstr "Alguacil, espero que esté aquí para ayudarnos." #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -182722,16 +182853,16 @@ 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." -msgstr "Alguacil, estoy bastante sorprendido de verlo aquí." +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "Alguacil, estoy bastante sorprendido de verlo aquí." #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -182776,24 +182907,6 @@ msgstr "" "de la red de comunicaciones. Esperamos igual que algunos simples mensajes de" " texto puedan ser recibidos." -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "Hola, alguacil." - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "Alguacil, me temo que no puedo hablar ahora." - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "No estoy a cargo acá, alguacil." - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "" -"Se supone que dirija todas las preguntas directamente al liderazgo, " -"alguacil." - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "" @@ -182807,6 +182920,15 @@ msgstr "" msgid "If you need something you'll need to talk to someone else." msgstr "Si necesitás algo vas a tener que hablar con otra persona." +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "Señora" + +#: lang/json/talk_topic_from_json.py +msgid "Hey miss, don't you think it would be safer if you stuck with me?" +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 "Sir." msgstr "Señor." @@ -182816,13 +182938,22 @@ msgid "Dude, if you can hold your own you should look into enlisting." msgstr "Amigo, si podés controlarte deberías enrolarte." #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "Señora" +msgid "Hello, marshal." +msgstr "Hola, alguacil." #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "Alguacil, me temo que no puedo hablar ahora." + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "No estoy a cargo acá, alguacil." + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." msgstr "" -"Hey señorita, ¿no le parece que estaría más segura si se queda conmigo?" +"Se supone que dirija todas las preguntas directamente al liderazgo, " +"alguacil." #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -182879,15 +183010,16 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "" +msgid "Please, help me. I need food." +msgstr "Por favor, ayudame. Necesito comida." #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" +"Por favor, ayudame. Necesito comida. ¿Vos no sos el sheriff? ¿No me podés " +"ayudar?" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -182895,15 +183027,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" -"Por favor, ayudame. Necesito comida. ¿Vos no sos el sheriff? ¿No me podés " -"ayudar?" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "Por favor, ayudame. Necesito comida." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -182922,17 +183053,17 @@ msgstr "Salí de acá." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" +"No me dejan entrar. Dicen que está lleno. Me permiten quedarme acá afuera " +"mientras no ensucie y no haga quilombo, pero tengo hambre." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" -"No me dejan entrar. Dicen que está lleno. Me permiten quedarme acá afuera " -"mientras no ensucie y no haga quilombo, pero tengo hambre." #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -183037,13 +183168,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183087,17 +183218,17 @@ 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?" -msgstr "¿Te conté sobre el cartón, amigo? ¿Tenés un poco?" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "" +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…" @@ -183127,16 +183258,16 @@ msgstr "¿En serio tenés puesto un disfraz de dinosaurio?" msgid "Do you need something to eat?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -183235,15 +183366,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. Thanks." +" You've helped me a lot. I'm feeling much more myself with all this to " +"keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. Thanks." -" You've helped me a lot. I'm feeling much more myself with all this to " -"keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -183263,15 +183394,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "" +msgid "Don't bother with these assholes." +msgstr "No te calentés con estos boludos." #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -183281,19 +183415,16 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "No te calentés con estos boludos." +msgid "Fuck off, dickwaddle." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -183583,16 +183714,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183637,14 +183768,14 @@ msgstr "" msgid "I'll see what I can do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "Ey, ¿te gusta eso de 'supervivencia del más apto'?" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "¿Por qué me preguntás?" @@ -183661,12 +183792,6 @@ msgstr "" msgid "Nice to see you. I gotta be going though." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " @@ -183675,6 +183800,12 @@ msgstr "" "Porque yo seguro que no estoy apto, así que me quedo sentado acá hasta que " "me muera de hambre. ¿Podés ayudar a este pobre mendigo?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "" @@ -183696,12 +183827,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "¿Y qué hacés acampando acá si no te dejan entrar?" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183987,6 +184118,10 @@ msgstr "" msgid "What's your take on the situation here?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "Ah, hola, otra vez vos." @@ -183999,10 +184134,6 @@ msgstr "" msgid "Aw hey, look who's back." msgstr "Oh, hey, miren quién volvió." -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "Encantado de conocerte, chico. ¿Cómo va?" @@ -184020,16 +184151,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "No soy un chico, eh. Tengo dieciséis." +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "No soy un chico, eh. Tengo catorce." #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "No soy un chico, eh. Tengo quince." #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "No soy un chico, eh. Tengo catorce." +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "No soy un chico, eh. Tengo dieciséis." #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -184039,15 +184170,6 @@ msgstr "Perdoname, no quise insinuar nada. ¿Cómo va?" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "Perdoname, no quise insinuar nada. Ya me voy yendo." -#: lang/json/talk_topic_from_json.py -msgid "" -"We're just standing around here waiting, like a bunch of idiots. We're " -"supposedly waiting to go downstairs to the shelter, but it's been over a " -"month. I don't think it's happening. I don't know what we're doing here. " -"I've read all the books, and there's zombies outside so we're stuck in here." -" We can hear them at night." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I don't know what's up. I'm not sure what we've even doing here. They say " @@ -184060,6 +184182,15 @@ msgstr "" "abajo, pero hace días que estamos acá y no nos dicen cuánto tenemos que " "esperar. Es todo muy idiota, y nadie te dice nada." +#: lang/json/talk_topic_from_json.py +msgid "" +"We're just standing around here waiting, like a bunch of idiots. We're " +"supposedly waiting to go downstairs to the shelter, but it's been over a " +"month. I don't think it's happening. I don't know what we're doing here. " +"I've read all the books, and there's zombies outside so we're stuck in here." +" We can hear them at night." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -184097,7 +184228,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184107,8 +184239,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184138,33 +184269,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -184193,6 +184324,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -184201,8 +184338,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184212,9 +184349,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." +msgid "Ah, another new face. Hello. I am Boris." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184229,10 +184364,6 @@ msgstr "" msgid "It is good to see you again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -184301,13 +184432,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -184318,6 +184442,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -184347,15 +184478,15 @@ msgid "Got any more bread I can trade flour for?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, nice to see you again." +msgid "Hi there. I'm Dana, nice to see a new face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "It's good to see you're still around." +msgid "Hello, nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." +msgid "It's good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184407,8 +184538,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184419,10 +184552,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184444,6 +184575,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -184465,12 +184602,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -184500,10 +184631,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -184511,6 +184638,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -184547,16 +184678,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -184791,12 +184922,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184896,14 +185027,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184955,21 +185086,21 @@ msgid "Is there anything I can do to help you out?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again." +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you're still around." +msgid "Hello again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hi." +msgid "Good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." +msgid "Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185031,15 +185162,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185105,17 +185236,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi." +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey again." +msgid "Hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." +msgid "Hey again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185165,12 +185296,12 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." +msgid "" +"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." +msgid "Nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185321,6 +185452,15 @@ msgid "" "like this before somebody snaps." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -185333,15 +185473,6 @@ msgid "" "want to know?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "" @@ -185407,6 +185538,14 @@ msgid "" "hope that there's a future to be had." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -185419,10 +185558,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185436,10 +185575,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185456,25 +185599,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -185529,11 +185660,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185576,15 +185707,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185785,12 +185916,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185881,17 +186012,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -186003,16 +186134,16 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -186049,14 +186180,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -186065,6 +186188,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -186242,15 +186373,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -186642,14 +186773,14 @@ msgstr "Mantenete civilizado o te voy a causar dolor." msgid "Just on watch, move along." msgstr "Solo estoy de guardia, circulando." -#: lang/json/talk_topic_from_json.py -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 "Rough out there, isn't it?" msgstr "¿Está complicado ahí afuera, no?" +#: lang/json/talk_topic_from_json.py +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…" msgstr "" @@ -186678,14 +186809,14 @@ msgstr "" msgid "Well, I'd better be going. Bye." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "Bienvenido, alguacil..." - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "Bienvenido..." +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "Bienvenido, alguacil..." + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -186928,14 +187059,14 @@ msgid "" "attacked by zombie hordes, as you might guess." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "Alguacil..." - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "Ciudadano..." +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "Alguacil..." + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "¿Podemos comerciar recursos?" @@ -187003,14 +187134,14 @@ msgstr "" "No podemos. No hay nada que nos sobre como para venderlo y no tengo plata " "para comprarte nada. Pero si querés donar algo..." -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "¡Esa placa que tenés es bien brillante!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Parecés una persona importante." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "¡Esa placa que tenés es bien brillante!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "En realidad, soy nuevo." @@ -187076,6 +187207,10 @@ msgid "" "it." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " @@ -187084,10 +187219,6 @@ msgstr "" "De la misma manera que vos conseguiste el tuyo, supongo. No hables mucho, " "algunos de acá desprecian a las personas como nosotros." -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "Perdón por preguntar." @@ -187113,22 +187244,22 @@ msgstr "Lo voy a comprar." msgid "Who needs rebar?" msgstr "¿Quién necesita varillas corrugadas?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "Mirá quién habla. No me jodas." - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "¡Andá a cagar!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "" +msgid "As if you're one to talk. Screw You." +msgstr "Mirá quién habla. No me jodas." #: lang/json/talk_topic_from_json.py 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 "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "" @@ -187443,6 +187574,16 @@ msgstr "Supongo que sos el jefe." msgid "Glad to have you aboard." msgstr "Me alegra tenerte en el equipo." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -187523,16 +187664,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -187803,38 +187934,38 @@ msgid "Keep it civil, merc." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Still plenty of outlaws in the roads, perhaps you should tend to your job, " -"marshal..." +msgid "Here to trade, I hope?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You see anything you want, marshal?" +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, a U.S. marshal, how quaint." +msgid "" +"Still plenty of outlaws in the roads, perhaps you should tend to your job, " +"marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" +msgid "You see anything you want, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -188075,16 +188206,16 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "¿Te puedo ayudar, alguacil?" +msgid "Morning ma'am, how can I help you?" +msgstr "Buenos días, señora, ¿la puedo ayudar en algo?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "Buenos días, señor, ¿lo puedo ayudar en algo?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "Buenos días, señora, ¿la puedo ayudar en algo?" +msgid "Can I help you, marshal?" +msgstr "¿Te puedo ayudar, alguacil?" #: lang/json/talk_topic_from_json.py msgid "" @@ -188217,14 +188348,14 @@ msgstr "¿Qué tipo de trabajo tienen para mí?" msgid "Not now." msgstr "Ahora no." -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "Vení después, necesito encargarme de unas cosas antes." - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "Puedo revisarte a vos o a tus compañeros si hay alguien herido." +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "Vení después, necesito encargarme de unas cosas antes." + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$200, 30m] Necesito que me cures." @@ -188479,7 +188610,7 @@ msgid "Ok." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -188502,9 +188633,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -188606,11 +188738,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -188622,11 +188754,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -197255,12 +197387,6 @@ msgstr "" msgid "mana weaving" msgstr "" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "nada" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -204189,16 +204315,18 @@ msgstr "" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s]ort: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F]iltrar" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R]esetear" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -204233,8 +204361,9 @@ msgid "Unsorted (recently added first)" msgstr "Desordenado (lo más nuevo, primero)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] show help >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -207219,6 +207348,13 @@ msgstr "" msgid " BIONICS " msgstr "BIÓNICOS" +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -207228,19 +207364,13 @@ msgstr "" "Elegí un biónico para reasignar o apretá la BARRA ESPACIADORA para cancelar." #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" #: src/bionics_ui.cpp @@ -207336,10 +207466,8 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"¡No podés activar %s!\n" -"Para leer la descripción de %s, apretá '!', y después '%c'." #: src/bonuses.cpp msgid "Accuracy" @@ -219472,7 +219600,7 @@ msgid "You can't crack a safe while deaf!" msgstr "¡No podés crackear la caja fuerte mientras estés sordo!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -221759,13 +221887,8 @@ msgstr "No hay opciones disponibles" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Filtro" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Filtro: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -240634,6 +240757,16 @@ msgid "" "necessary glyphs." msgstr "" +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "Usar gráficos" @@ -242573,10 +242706,6 @@ msgstr "Descanso:" msgid "Heat :" msgstr "Calor :" -#: src/panels.cpp -msgid "Sound :" -msgstr "" - #: src/panels.cpp msgid "Deaf!" msgstr "¡Sordo!" @@ -247446,8 +247575,9 @@ msgid "Remove attached curtains first." msgstr "Primero sacá las cortinas." #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "Primero sacá la parte que está conectada." +#, c-format +msgid "Remove the attached %s first." +msgstr "" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/es_ES.po b/lang/po/es_ES.po index 5ac35c52e14ef..dbc69f6fc519e 100644 --- a/lang/po/es_ES.po +++ b/lang/po/es_ES.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Toni López , 2020\n" "Language-Team: Spanish (Spain) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/es_ES/)\n" @@ -720,7 +720,7 @@ msgid_plural "oxygen" msgstr[0] "oxígeno" msgstr[1] "oxígeno" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Un tubo de oxígeno." @@ -801,7 +801,7 @@ msgid_plural "nitrox" msgstr[0] "nitrox" msgstr[1] "nitrox" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "Mezcla de oxígeno y nitrógeno en proporciones adecuadas para bucear." @@ -812,7 +812,7 @@ msgid_plural "tinder" msgstr[0] "yesca" msgstr[1] "yesca" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "" @@ -835,7 +835,7 @@ msgid_plural "metal RPG dice" msgstr[0] "dado de rol de metal" msgstr[1] "dados de rol de metal" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "Un dado de metal usado para jugar a varios juegos de rol." @@ -871,7 +871,7 @@ msgid_plural "sulfur" msgstr[0] "azúfre" msgstr[1] "azúfre" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -914,7 +914,7 @@ msgid_plural "limestone" msgstr[0] "caliza" msgstr[1] "caliza" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -931,7 +931,7 @@ msgid_plural "quicklime" msgstr[0] "cal" msgstr[1] "cal" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -951,7 +951,7 @@ msgid_plural "sand" msgstr[0] "arena" msgstr[1] "arena" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -966,7 +966,7 @@ msgid_plural "soil" msgstr[0] "tierra" msgstr[1] "tierra" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1000,7 +1000,7 @@ msgid_plural "zinc powder" msgstr[0] "polvo de cinc" msgstr[1] "polvo de cinc" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1018,7 +1018,7 @@ msgid_plural "zinc oxide" msgstr[0] "óxido de zinc" msgstr[1] "óxido de zinc" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1031,7 +1031,8 @@ msgid_plural "manganese dioxide" msgstr[0] "dióxido de manganeso" msgstr[1] "dióxido de manganeso" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1045,7 +1046,8 @@ msgid_plural "potassium chloride" msgstr[0] "" msgstr[1] "" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1060,7 +1062,8 @@ msgid_plural "potassium hydroxide" msgstr[0] "hidróxido de potasio" msgstr[1] "hidróxido de potasio" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1074,7 +1077,7 @@ msgid_plural "sulfuric acid" msgstr[0] "ácido sulfúrico" msgstr[1] "ácido sulfúrico" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1125,7 +1128,7 @@ msgid_plural "nitric acid" msgstr[0] "ácido nítrico" msgstr[1] "ácido nítrico" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1239,7 +1242,7 @@ msgid_plural "saltpeter" msgstr[0] "nitrato de potasio" msgstr[1] "nitrato de potasio" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1256,7 +1259,7 @@ msgid_plural "niter" msgstr[0] "nitro" msgstr[1] "nitro" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1333,7 +1336,7 @@ msgid_plural "thermite" msgstr[0] "termita" msgstr[1] "termita" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1390,7 +1393,8 @@ msgid_plural "match head powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1467,7 +1471,7 @@ msgid_plural "soap flakes" msgstr[0] "escamas de jabón" msgstr[1] "escamas de jabón" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "" @@ -1493,7 +1497,7 @@ msgid_plural "wood ashes" msgstr[0] "cenizas de madera" msgstr[1] "cenizas de maderas" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1616,7 +1620,7 @@ msgid_plural "lamp oil" msgstr[0] "queroseno" msgstr[1] "queroseno" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "" @@ -1629,7 +1633,7 @@ msgid_plural "motor oil" msgstr[0] "aceite de motor" msgstr[1] "aceites de motor" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "" @@ -1640,7 +1644,7 @@ msgid_plural "napalm" msgstr[0] "napalm" msgstr[1] "napalm" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -4904,7 +4908,7 @@ msgid_plural "red paint" msgstr[0] "pintura roja" msgstr[1] "pintura roja" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Una lata de pintura roja." @@ -4926,7 +4930,7 @@ msgid_plural "white paint" msgstr[0] "pintura blanca" msgstr[1] "pintura blanca" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Una lata de pintura blanca." @@ -4948,7 +4952,7 @@ msgid_plural "purple paint" msgstr[0] "pintura púrpura" msgstr[1] "pintura púrpura" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Una lata de pintura púrpura." @@ -4959,7 +4963,7 @@ msgid_plural "yellow paint" msgstr[0] "pintura amarilla" msgstr[1] "pintura amarilla" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Una lata de pintura amarilla." @@ -5031,7 +5035,7 @@ msgstr[0] "oro" msgstr[1] "oro" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5052,7 +5056,7 @@ msgid_plural "zinc" msgstr[0] "" msgstr[1] "" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5067,7 +5071,7 @@ msgid_plural "lead" msgstr[0] "plomo" msgstr[1] "plomo" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5082,7 +5086,7 @@ msgid_plural "magnesium powder" msgstr[0] "polvo de magnesio" msgstr[1] "polvo de magnesio" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5097,7 +5101,7 @@ msgid_plural "silver" msgstr[0] "plata" msgstr[1] "plata" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5282,7 +5286,7 @@ msgid_plural "leather scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5295,7 +5299,7 @@ msgid_plural "lycra scraps" msgstr[0] "pedazos de licra" msgstr[1] "pedazos de licra" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5308,7 +5312,7 @@ msgid_plural "neoprene scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5321,7 +5325,8 @@ msgid_plural "synthetic fabric scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5358,7 +5363,8 @@ msgid_plural "patchwork cotton clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5381,7 +5387,8 @@ msgid_plural "patchwork faux fur clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5404,7 +5411,8 @@ 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 +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5440,7 +5448,8 @@ msgid_plural "patchwork lycra clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5467,7 +5476,8 @@ 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 +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5493,7 +5503,8 @@ msgid_plural "patchwork Nomex clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5516,7 +5527,8 @@ msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -7476,12 +7488,14 @@ msgstr[0] "bolso de munición" msgstr[1] "bolsos de munición" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -7496,7 +7510,8 @@ msgstr[1] "bolsos de munición" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -7505,11 +7520,14 @@ msgid "You stash your %s." msgstr "Guardas tu %s." #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -7544,7 +7562,8 @@ msgid_plural "chest ammo pouches" msgstr[0] "bolsa pechera de munición" msgstr[1] "bolsas pecheras de munición" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -7559,7 +7578,7 @@ msgid_plural "chest rig" msgstr[0] "" msgstr[1] "" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -7574,12 +7593,13 @@ msgid_plural "javelin bags" msgstr[0] "bolsa para jabalinas" msgstr[1] "bolsas para jabalinas" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -7607,7 +7627,7 @@ msgid_plural "leg ammo pouches" msgstr[0] "bolsa pernera de munición" msgstr[1] "bolsas perneras de munición" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -7805,7 +7825,8 @@ msgid_plural "pairs of 2-by-arm guards" msgstr[0] "par de mangas de madera" msgstr[1] "pares de mangas de madera" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -8125,7 +8146,7 @@ msgid_plural "grenade pouches" msgstr[0] "cartuchera para granadas" msgstr[1] "cartucheras para granadas" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -8153,12 +8174,14 @@ msgid_plural "large grenade pouches" msgstr[0] "" msgstr[1] "" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "Almacenar granadas" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "" @@ -8618,6 +8641,8 @@ msgid_plural "pairs of armored boots" msgstr[0] "par de botas blindadas" msgstr[1] "pares de botas blindadas" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -8726,6 +8751,8 @@ msgid_plural "pairs of XL survivor boots" msgstr[0] "par de botas de supervivencia XL" msgstr[1] "pares de botas de supervivencia XL" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -9203,7 +9230,8 @@ msgid_plural "pairs of ankle socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -10638,7 +10666,8 @@ msgid_plural "pairs of armored fingerless gloves" msgstr[0] "par de guantes reforzados sin dedos" msgstr[1] "pares de guantes reforzados sin dedos" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -10963,7 +10992,8 @@ msgid_plural "pairs of XL survivor gloves" msgstr[0] "par de guantes de supervivencia XL" msgstr[1] "pares de guantes de supervivencia XL" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -11349,7 +11379,7 @@ msgid_plural "kippahs" msgstr[0] "kipá" msgstr[1] "kipás" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "Un gorro redondo y fino. Un tocado tradicional del judaismo." @@ -11360,7 +11390,7 @@ msgid_plural "kufi caps" msgstr[0] "gorra kufi" msgstr[1] "gorras kufi" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Una gorra corta y redonda, sin ala." @@ -11699,7 +11729,7 @@ msgid_plural "galeae" msgstr[0] "galea" msgstr[1] "galeae" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -12416,7 +12446,7 @@ msgid_plural "diver's watches" msgstr[0] "reloj de buzo" msgstr[1] "relojes de buzo" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -16383,7 +16413,8 @@ msgid_plural "pairs of 2-by-shin guards" msgstr[0] "par de canilleras de madera" msgstr[1] "pares de canilleras de madera" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -16413,7 +16444,8 @@ msgid_plural "pairs of chainmail leggings" msgstr[0] "par de perneras de cota de malla" msgstr[1] "pares de perneras de cota de malla" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -16426,7 +16458,7 @@ msgid_plural "leather chaps" msgstr[0] "cazadora de cuero" msgstr[1] "cazadoras de cuero" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -16441,7 +16473,7 @@ msgid_plural "fencing pants" msgstr[0] "pantalón de esgrima" msgstr[1] "pantalones de esgrima" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" @@ -16542,7 +16574,8 @@ msgid_plural "light survivor cargo pants" msgstr[0] "pantalón de carga de superviviente ligero" msgstr[1] "pantalones de carga de superviviente ligeros" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -16557,7 +16590,8 @@ msgid_plural "pairs of motorcycle pants" msgstr[0] "pantalones de moto" msgstr[1] "pares de pantalones de moto" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "" @@ -16597,7 +16631,7 @@ msgid_plural "breeches" msgstr[0] "pantalones de montar" msgstr[1] "pantalones de montar" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -16625,7 +16659,7 @@ msgid_plural "hot pants" msgstr[0] "minipantalón" msgstr[1] "minipantalones" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "Es un simple pantalón muy, muy corto." @@ -16636,7 +16670,7 @@ msgid_plural "fur hot pants" msgstr[0] "minipantalón de piel" msgstr[1] "minipantalones de piel" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "Es un simple pantalón muy, muy corto de piel." @@ -16647,7 +16681,8 @@ msgid_plural "leather hot pants" msgstr[0] "minipantalón de cuero" msgstr[1] "minipantalones de cuero" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "Es un simple pantalón muy, muy corto de cuero." @@ -16658,7 +16693,7 @@ msgid_plural "jeans" msgstr[0] "pantalón vaquero" msgstr[1] "pantalones vaqueros" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "Es un pantalón vaquero azul con dos bolsillos grandes." @@ -16699,7 +16734,7 @@ msgid_plural "leggings" msgstr[0] "leggins" msgstr[1] "leggins" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -16834,7 +16869,7 @@ msgid_plural "fur pants" msgstr[0] "pantalón de piel" msgstr[1] "pantalones de piel" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Unos pantalones pesados, recubiertos de piel." @@ -16858,7 +16893,7 @@ msgid_plural "leather pants" msgstr[0] "pantalón de cuero" msgstr[1] "pantalones de cuero" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -16884,7 +16919,8 @@ msgid_plural "mail carrier shorts" msgstr[0] "pantalón corto de cartero" msgstr[1] "pantalones cortos de cartero" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "Es un pantalón corto azul oscuro, de los que usan los carteros." @@ -16906,7 +16942,7 @@ msgid_plural "cargo shorts" msgstr[0] "pantalones cortos de carga" msgstr[1] "pantalones cortos de carga" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "" @@ -16919,7 +16955,7 @@ msgid_plural "denim shorts" msgstr[0] "pantalón corto de tela vaquera" msgstr[1] "pantalones cortos de tela vaquera" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -17071,17 +17107,20 @@ msgid_plural "bondage masks (zipped)" msgstr[0] "máscara de bondage (abrochada)" msgstr[1] "máscaras de bondage (abrochadas)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Desabrochar" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "Te desabrochas los ojos y boca de la máscara de bondage." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -18030,7 +18069,7 @@ msgid_plural "leather pouches" msgstr[0] "bolso de cuero" msgstr[1] "bolsos de cuero" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -19239,7 +19278,8 @@ msgid_plural "lorica segmentata" msgstr[0] "lorica segmentata" msgstr[1] "lorica segmentata" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -19293,7 +19333,7 @@ msgid_plural "cuirasses" msgstr[0] "coraza" msgstr[1] "corazas" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -20028,7 +20068,8 @@ msgid_plural "pairs of arm warmers" msgstr[0] "par de manga de brazo" msgstr[1] "pares de mangas de brazo" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "" @@ -20123,7 +20164,7 @@ msgid_plural "boy shorts" msgstr[0] "culotte" msgstr[1] "culottes" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -20150,7 +20191,7 @@ msgid_plural "briefs" msgstr[0] "calzoncillo" msgstr[1] "calzoncillos" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "Es un calzoncillo. Ropa interior cómoda para hombre." @@ -20278,7 +20319,8 @@ msgid_plural "pairs of XL leg warmers" msgstr[0] "par de calentadores XL" msgstr[1] "pares de calentadores XL" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -20411,7 +20453,8 @@ msgid_plural "compression shorts" msgstr[0] "pantalón corto ajustado" msgstr[1] "pantalones cortos ajustados" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -21752,7 +21795,7 @@ msgid_plural "test batteries" msgstr[0] "" msgstr[1] "" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -22647,7 +22690,8 @@ msgid_plural "Power Storage CBM Mk. II" msgstr[0] "" msgstr[1] "" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -24613,19 +24657,19 @@ msgstr[1] "" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -29178,7 +29222,8 @@ msgid_plural "commercial fertilizer" msgstr[0] "fertilizante comercial" msgstr[1] "fertilizante comercial" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "Unos gránulos ricos en nutrientes para las plantas." @@ -29269,7 +29314,8 @@ msgid_plural "concentrated acid" msgstr[0] "ácido concentrado" msgstr[1] "ácido concentrado" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Ácido concentrado. No te lo tomes." @@ -30023,7 +30069,7 @@ msgid_plural "cheap whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -30526,7 +30572,7 @@ msgid_plural "cooked fish" msgstr[0] "pescado cocinado" msgstr[1] "pescados cocinados" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "Es un pescado cocinado recientemente. Muy nutritivo." @@ -30615,7 +30661,7 @@ msgid_plural "chunks of meat" msgstr[0] "pedazo de carne" msgstr[1] "pedazos de carne" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -30642,7 +30688,8 @@ msgid_plural "chunks of mutant meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -30759,7 +30806,7 @@ msgid_plural "cooked offal" msgstr[0] "achura cocinada" msgstr[1] "achuras cocinadas" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -30929,7 +30976,8 @@ msgid_plural "cooked pieces of lung" msgstr[0] "pedazo de pulmón cocinado" msgstr[1] "pedazos de pulmón cocinados" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -30981,7 +31029,7 @@ msgid_plural "cooked brains" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -31094,7 +31142,8 @@ msgid_plural "chunks of mutant fat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -31167,7 +31216,8 @@ msgid_plural "chunks of tainted meat" msgstr[0] "pedazo de carne contaminada" msgstr[1] "pedazos de carne contaminada" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -31721,7 +31771,7 @@ msgid_plural "chamomile tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -31748,7 +31798,7 @@ msgid_plural "coffee" msgstr[0] "café" msgstr[1] "café" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -31762,7 +31812,8 @@ msgid_plural "coffee substitute" msgstr[0] "" msgstr[1] "" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -31776,7 +31827,7 @@ msgid_plural "chicory brew" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -32185,7 +32236,7 @@ msgid_plural "clean water" msgstr[0] "agua potable" msgstr[1] "agua potable" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "Agua potable, fresca. Verdaderamente, lo mejor para calmar tu sed." @@ -32678,7 +32729,8 @@ msgid_plural "cooked strawberries" msgstr[0] "fresa cocinada" msgstr[1] "fresas cocinadas" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "Es como mermelada de fresa pero sin azúcar." @@ -32698,7 +32750,8 @@ msgid_plural "cooked blueberries" msgstr[0] "arándano cocinado" msgstr[1] "arándanos cocinados" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "Es como mermelada de arándanos pero sin azúcar." @@ -33560,18 +33613,18 @@ msgid_plural "chocolate candies" msgstr[0] "golosina de chocolate" msgstr[1] "golosinas de chocolate" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "Es un puñado de golosinas coloridas rellenas con chocolate." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "caramelo masticable" -msgstr[1] "caramelos masticables" +msgid_plural "chewy candy" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "" @@ -33815,7 +33868,7 @@ msgid_plural "cheese nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -33945,7 +33998,7 @@ msgid_plural "chili dogs" msgstr[0] "perrito caliente con chili" msgstr[1] "perritos calientes con chili" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Un perrito caliente servido con chili con carne como aderezo. ¡Rico!" @@ -33983,7 +34036,8 @@ msgid_plural "chocolate pancakes" msgstr[0] "panqueque de chocolate" msgstr[1] "panqueques de chocolate" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -34020,7 +34074,7 @@ msgid_plural "cheese fries" msgstr[0] "patatas fritas con queso" msgstr[1] "patatas fritas con queso" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "" @@ -34062,11 +34116,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -34609,21 +34661,23 @@ msgid_plural "chilis con carne" msgstr[0] "chili con carne" msgstr[1] "chilis con carne" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "Un guiso picante que tiene chiles, carne, tomates y alubias." @@ -35539,7 +35593,7 @@ msgid_plural "cocaine" msgstr[0] "cocaína" msgstr[1] "cocaína" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -35717,7 +35771,7 @@ msgid_plural "chewing gum" msgstr[0] "chicle" msgstr[1] "chicle" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "" @@ -37827,7 +37881,7 @@ msgid_plural "chitin powder" msgstr[0] "polvo de quitina" msgstr[1] "polvo de quitina" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -37889,7 +37943,7 @@ msgid_plural "cooked beans" msgstr[0] "alubias cocinadas" msgstr[1] "alubias cocinadas" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "Es una porción abundante de alubias norteños cocinados." @@ -37967,7 +38021,7 @@ msgid_plural "cooked lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "" @@ -37978,7 +38032,7 @@ msgid_plural "coffee powder" msgstr[0] "café molido" msgstr[1] "café molido" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -39672,7 +39726,7 @@ msgid_plural "chicory seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "" @@ -39758,7 +39812,8 @@ msgid_plural "chili pepper seeds" msgstr[0] "semillas de pimiento picante" msgstr[1] "semillas de pimiento picante" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Algunas semillas de pimiento picante." @@ -40129,7 +40184,7 @@ msgid_plural "coffee beans" msgstr[0] "granos de café" msgstr[1] "granos de café" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Algunos unos granos de café. Pueden ser tostados." @@ -40152,7 +40207,7 @@ msgid_plural "chamomile seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "" @@ -40465,11 +40520,9 @@ msgstr "Es un tallo de tomillo. Tiene un olor delicioso." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "tallo de junco cocinado" -msgstr[1] "tallos de junco cocinados" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -40499,7 +40552,8 @@ msgid_plural "cooked dandelion greens" msgstr[0] "hoja verde de dientes de león cocinada" msgstr[1] "hojas verdes de dientes de león cocinadas" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Hojas cocinadas de dientes de león. Sabrosas y nutritivas." @@ -40534,7 +40588,8 @@ msgid_plural "cooked wild vegetables" msgstr[0] "verduras silvestres cocinadas" msgstr[1] "verduras silvestres cocinadas" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "" @@ -40557,7 +40612,7 @@ msgid_plural "cooked buckwheat" msgstr[0] "trigo sarraceno cocido" msgstr[1] "trigo sarraceno cocido" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -40613,7 +40668,7 @@ msgid_plural "cooked rice" msgstr[0] "arroz cocinado" msgstr[1] "arroz cocinado" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Es una porción abundante de arroz de grano grande blanco cocinado." @@ -41235,9 +41290,11 @@ msgstr "Una deliciosa pizza con queso derretido arriba." #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "granola" +msgid_plural "granola" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -43987,7 +44044,7 @@ msgid_plural "rock salt" msgstr[0] "sal de roca" msgstr[1] "sal de roca" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "" @@ -44000,7 +44057,7 @@ msgid_plural "rhodonite" msgstr[0] "" msgstr[1] "" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -44013,7 +44070,7 @@ msgid_plural "zincite" msgstr[0] "" msgstr[1] "" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -44226,7 +44283,8 @@ msgid_plural "semi ground grains" msgstr[0] "" msgstr[1] "" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "" @@ -44237,7 +44295,8 @@ msgid_plural "smoldering embers" msgstr[0] "brasas ardientes" msgstr[1] "brasas ardientes" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -44269,7 +44328,7 @@ msgid_plural "coins" msgstr[0] "" msgstr[1] "" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -44299,19 +44358,27 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "fuego cercano" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "músculo" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -44325,6 +44392,15 @@ msgid_plural "none" msgstr[0] "" msgstr[1] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -44421,7 +44497,7 @@ msgid_plural "leather patches" msgstr[0] "pedazo de cuero" msgstr[1] "pedazos de cuero" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "" @@ -44434,7 +44510,7 @@ msgid_plural "felt patches" msgstr[0] "pedazo de fieltro" msgstr[1] "pedazos de fieltro" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "" @@ -44523,7 +44599,8 @@ msgid_plural "ceramic disks" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -44830,7 +44907,7 @@ msgid_plural "concrete" msgstr[0] "cemento" msgstr[1] "cemento" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "Es un poco de cemento, listo para ser usado en alguna construcción." @@ -44871,7 +44948,7 @@ msgid_plural "dead flares" msgstr[0] "bengala usada" msgstr[1] "bengalas usadas" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "Es una bengala de magnesio usada. Prácticamente, basura." @@ -45435,7 +45512,8 @@ msgid_plural "high-quality lenses" msgstr[0] "lente de alta calidad" msgstr[1] "lentes de alta calidad" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -45450,7 +45528,8 @@ msgid_plural "small high-quality lenses" msgstr[0] "" msgstr[1] "" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -45463,7 +45542,8 @@ msgid_plural "pairs of tinted glass" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -45618,7 +45698,7 @@ msgid_plural "fish bowls" msgstr[0] "pecera" msgstr[1] "peceras" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -45962,7 +46042,7 @@ msgid_plural "lumps of clay" msgstr[0] "masa de arcilla" msgstr[1] "masas de arcilla" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Una masa de arcilla fresca. Útil para fabricar algunas cosas." @@ -45985,7 +46065,7 @@ msgid_plural "mortar" msgstr[0] "mortero" msgstr[1] "mortero" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "Es un poco de mortero, listo para ser usado en alguna construcción." @@ -45996,17 +46076,17 @@ msgid_plural "soft adobe bricks" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -46238,7 +46318,7 @@ msgid_plural "cured hides" msgstr[0] "pellejo curado" msgstr[1] "pellejos curados" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46255,7 +46335,7 @@ msgid_plural "tanned hides" msgstr[0] "pellejo curtido" msgstr[1] "pellejos curtidos" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -46270,7 +46350,7 @@ msgid_plural "cured pelts" msgstr[0] "pelaje curado" msgstr[1] "pelajes curados" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46287,7 +46367,7 @@ msgid_plural "tanned pelts" msgstr[0] "pelaje curtido" msgstr[1] "pelajes curtidos" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -46303,7 +46383,7 @@ msgid_plural "piles of straw" msgstr[0] "pila de paja" msgstr[1] "pilas de paja" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -46318,7 +46398,7 @@ msgid_plural "straw dolls" msgstr[0] "muñeca de paja" msgstr[1] "muñecas de paja" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "Una muñeca vieja de paja. Representa una mujer con un vestido." @@ -46484,7 +46564,7 @@ msgid_plural "joint roaches" msgstr[0] "chusta" msgstr[1] "chustas" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -46674,7 +46754,7 @@ msgid_plural "refrigerant tanks" msgstr[0] "tanque de refrigerante" msgstr[1] "tanques de refrigerante" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -46902,7 +46982,7 @@ msgid_plural "flyers" msgstr[0] "folleto" msgstr[1] "folletos" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "Un pedazo de papel." @@ -46913,7 +46993,7 @@ msgid_plural "survivor's notes" msgstr[0] "nota de superviviente" msgstr[1] "notas de superviviente" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -46938,7 +47018,7 @@ msgid_plural "score cards" msgstr[0] "" msgstr[1] "" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "" @@ -46949,7 +47029,7 @@ msgid_plural "newspaper pages" msgstr[0] "página de diario" msgstr[1] "páginas de diario" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -46962,7 +47042,7 @@ msgstr "" "de la información que contiene es terriblemente trivial, o fuera de tiempo, " "pero uno cosa capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -46975,7 +47055,7 @@ msgstr "" " que contiene es terriblemente trivial, o fuera de tiempo, pero uno cosa " "capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -46987,7 +47067,7 @@ msgstr "" "contiene es terriblemente trivial, o fuera de tiempo, pero uno cosa capta tu" " atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -46998,7 +47078,7 @@ msgstr "" " mayoría de la información que contiene es terriblemente trivial, o fuera de" " tiempo, pero uno cosa capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -47009,7 +47089,7 @@ msgstr "" "al Cataclismo. La mayoría de la información que contiene es terriblemente " "trivial, o fuera de tiempo, pero uno cosa capta tu atención por un instante." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -47026,7 +47106,7 @@ msgid_plural "vault leaflets" msgstr[0] "panfleto de bóveda" msgstr[1] "panfletos de bóveda" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -47596,7 +47676,8 @@ msgid_plural "sets of tiny spidery legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "" @@ -47607,7 +47688,8 @@ msgid_plural "sets of reverse-jointed legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -47619,7 +47701,8 @@ msgid_plural "sets of omni wheels" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "" @@ -47630,7 +47713,7 @@ msgid_plural "sets of rotors" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "" @@ -47641,7 +47724,8 @@ msgid_plural "sets of android legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "" @@ -47652,7 +47736,8 @@ msgid_plural "sets of android arms" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "" @@ -47663,7 +47748,8 @@ msgid_plural "sets of small tank tread" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" @@ -47674,7 +47760,8 @@ msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -47687,7 +47774,8 @@ msgid_plural "police bot chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -47718,7 +47806,7 @@ msgid_plural "misc software" msgstr[0] "software variado" msgstr[1] "software variado" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "Software variado para pasar el tiempo. Probablemente sea inútil." @@ -47729,7 +47817,7 @@ msgid_plural "hackPRO" msgstr[0] "hackPRO" msgstr[1] "hackPRO" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "Software de hackeo." @@ -47762,7 +47850,7 @@ msgid_plural "infection data" msgstr[0] "información de infección" msgstr[1] "información de infección" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Información médica de sangre de zombi." @@ -47773,7 +47861,7 @@ msgid_plural "lab data" msgstr[0] "dato de laboratorio" msgstr[1] "datos de laboratorios" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "" @@ -47784,7 +47872,7 @@ msgid_plural "train data" msgstr[0] "información ferroviaria" msgstr[1] "informaciones ferroviaria" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "" @@ -47795,7 +47883,7 @@ msgid_plural "neural data" msgstr[0] "" msgstr[1] "" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -47809,7 +47897,8 @@ msgid_plural "misc software" msgstr[0] "" msgstr[1] "" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -50760,7 +50849,7 @@ msgid_plural "spare parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -51233,17 +51322,20 @@ msgid_plural "expandable batons (extended)" msgstr[0] "garrote extendible (extendido)" msgstr[1] "garrotes extendibles (extendidos)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "Colapsar" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Cierras tu garrote." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -51521,7 +51613,8 @@ msgid_plural "ironshod quarterstaves" msgstr[0] "vara larga con calces de hierro" msgstr[1] "varas largas con calces de hierro" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -51751,7 +51844,7 @@ msgid_plural "quarterstaves" msgstr[0] "vara larga" msgstr[1] "varas largas" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -51766,7 +51859,7 @@ msgid_plural "rocks in socks" msgstr[0] "piedra en una calcetín" msgstr[1] "piedras en calcetines" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "" @@ -51777,7 +51870,8 @@ msgid_plural "sharpened toothbrushes" msgstr[0] "cepillo de dientes afilado" msgstr[1] "cepillos de dientes afilados" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "Un objeto de higiene personal convertido en una navaja." @@ -52074,7 +52168,7 @@ msgid_plural "naginata" msgstr[0] "naginata" msgstr[1] "naginata" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52085,7 +52179,7 @@ msgstr "" "katana y otras espadas japonesas. Ocasionalmente era utilizada por los " "samurai en los primeros tiempos, o por sus esposas en defensa de su hogar." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52093,7 +52187,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -52107,7 +52201,8 @@ msgid_plural "survivor naginata" msgstr[0] "naginata de supervivencia" msgstr[1] "naginatas de supervivencia" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -52181,7 +52276,7 @@ msgid_plural "dories" msgstr[0] "dory" msgstr[1] "dorus" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "" @@ -52193,7 +52288,7 @@ msgid_plural "ji" msgstr[0] "ji" msgstr[1] "ji" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -52271,7 +52366,7 @@ msgid_plural "jian" msgstr[0] "jian" msgstr[1] "jian" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -52384,7 +52479,7 @@ msgid_plural "nodachi" msgstr[0] "nodachi" msgstr[1] "nodachi" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -52393,7 +52488,7 @@ msgstr "" "Es una réplica berreta sin filo de una enorme espada de dos manos curvada de" " origen jacolocas. Es sorprendentemente liviana para el tamaño que tiene." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -52520,7 +52615,7 @@ msgid_plural "cutlasses" msgstr[0] "sable" msgstr[1] "sables" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -52627,7 +52722,7 @@ msgid_plural "krises" msgstr[0] "kris" msgstr[1] "krises" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -52657,7 +52752,7 @@ msgid_plural "tiger claws" msgstr[0] "garras de tigre" msgstr[1] "garras de tigre" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -52686,7 +52781,8 @@ msgid_plural "pairs of brass knuckles" msgstr[0] "par de nudillos de latón" msgstr[1] "pares de nudillos de latón" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -52719,7 +52815,8 @@ msgid_plural "pairs of nail knuckles" msgstr[0] "par de nudillos con clavos" msgstr[1] "pares de nudillos con clavos" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -52734,7 +52831,8 @@ msgid_plural "pairs of steel knuckles" msgstr[0] "par de nudillos de acero" msgstr[1] "pares de nudillos de acero" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -52793,8 +52891,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "frisbee" msgid_plural "frisbees" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "frisbee" +msgstr[1] "frisbees" #. ~ Description for frisbee #: lang/json/GENERIC_from_json.py @@ -52833,7 +52931,7 @@ msgid_plural "throwing knives" msgstr[0] "cuchillo arrojadizo" msgstr[1] "cuchillos arrojadizos" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -52862,14 +52960,15 @@ msgid_plural "sheets of glass" msgstr[0] "plancha de cristal" msgstr[1] "planchas de cristal" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -52883,7 +52982,8 @@ msgid_plural "sheets of reinforced glass" msgstr[0] "plancha de cristal reforzado" msgstr[1] "planchas de cristal reforzado" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "Una plancha grande de cristal endurecido con alambre de acero." @@ -52894,7 +52994,8 @@ msgid_plural "panes of reinforced glass" msgstr[0] "lámina de cristal reforzado" msgstr[1] "láminas de cristal reforzado" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "Una pequeña lámina de cristal reforzado con alambre de acero." @@ -52989,7 +53090,7 @@ msgid_plural "scrap copper" msgstr[0] "pedazo de cobre" msgstr[1] "pedazo de cobre" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "Es un pedazo chico de cobre, útil para fabricar o reparar cosas." @@ -53055,7 +53156,7 @@ msgid_plural "mattresses" msgstr[0] "" msgstr[1] "" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "" @@ -53066,7 +53167,7 @@ msgid_plural "down mattresses" msgstr[0] "" msgstr[1] "" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "" @@ -53400,21 +53501,28 @@ msgid_plural "sealed jars of eggs" msgstr[0] "" msgstr[1] "" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Abrir bote" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Abres el frasco, exponiendo el contenido al ambiente." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -53429,7 +53537,8 @@ msgid_plural "sealed jars of pickles" msgstr[0] "" msgstr[1] "" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -53442,7 +53551,8 @@ msgid_plural "sealed jars of sauerkraut" msgstr[0] "jarro sellado con chucrut" msgstr[1] "jarros sellados con chucrut" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -54094,7 +54204,7 @@ msgid_plural "radio car boxes" msgstr[0] "caja de radio de coche" msgstr[1] "cajas de radio de coche" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -54202,7 +54312,8 @@ msgid_plural "sets of ring stand clamps" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -54266,7 +54377,8 @@ msgid_plural "pairs of knitting needles" msgstr[0] "agujas de tejer" msgstr[1] "pares de agujas de tejer" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -54363,7 +54475,8 @@ msgid_plural "distaves and spindles" msgstr[0] "huso y aspa" msgstr[1] "husos y aspas" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -54484,7 +54597,7 @@ msgid_plural "storage battery cases" msgstr[0] "caja para baterías de almacenamiento" msgstr[1] "cajas para baterías de almacenamiento" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -54499,7 +54612,7 @@ msgid_plural "wood boat hulls" msgstr[0] "casco de madera de bote" msgstr[1] "cascos de madera de bote" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -54515,7 +54628,7 @@ msgid_plural "plastic boat hulls" msgstr[0] "casco de plástico de bote" msgstr[1] "cascos de plástico de bote" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -54543,7 +54656,7 @@ msgid_plural "oars" msgstr[0] "remos" msgstr[1] "remos" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Son remos para un bote." @@ -54554,7 +54667,7 @@ msgid_plural "sails" msgstr[0] "" msgstr[1] "" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "" @@ -54565,7 +54678,8 @@ msgid_plural "inflatable section" msgstr[0] "sección inflable" msgstr[1] "sección inflable" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "Una parte inflable para bote." @@ -54576,7 +54690,8 @@ msgid_plural "inflatable airbag" msgstr[0] "airbag inflable" msgstr[1] "airbags inflables" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "Un airbag inflable." @@ -54753,7 +54868,8 @@ msgid_plural "sets of vehicle controls" msgstr[0] "controles de vehículo" msgstr[1] "conjuntos de controles de vehículo" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "Un conjunto de controles de vehículo. Útil para fabricar un vehículo." @@ -54809,7 +54925,8 @@ msgid_plural "sets of drive by wire controls" msgstr[0] "controles conducir por cables" msgstr[1] "conjuntos de controles conducir por cables" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -54824,7 +54941,7 @@ msgid_plural "robot driving units" msgstr[0] "unidad de conducción de robot" msgstr[1] "unidades de conducción de robot" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -55006,7 +55123,7 @@ msgid_plural "vehicle scoops" msgstr[0] "pala mecánica" msgstr[1] "palas mecánicas" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -55022,7 +55139,7 @@ msgid_plural "seed drills" msgstr[0] "sembradora" msgstr[1] "sembradoras" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -55039,7 +55156,7 @@ msgid_plural "reapers" msgstr[0] "cosechadora" msgstr[1] "cosechadoras" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -55088,7 +55205,7 @@ msgid_plural "plows" msgstr[0] "arado" msgstr[1] "arados" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "" @@ -55248,7 +55365,8 @@ msgid_plural "emergency vehicle lights (red)" msgstr[0] "luz de emergencia para vehículo (roja)" msgstr[1] "luces de emergencia para vehículo (rojas)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -55264,7 +55382,8 @@ msgid_plural "emergency vehicle lights (blue)" msgstr[0] "luz de emergencia para vehículo (azul)" msgstr[1] "luces de emergencia para vehículo (azules)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -55306,7 +55425,8 @@ msgid_plural "sets of hand rims" msgstr[0] "conjunto de aros de ruedas" msgstr[1] "conjuntos de aros de ruedas" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "" @@ -55979,7 +56099,7 @@ msgid_plural "vehicle coolers" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "" @@ -55990,7 +56110,7 @@ msgid_plural "vehicle heaters" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "" @@ -56358,9 +56478,8 @@ msgstr[1] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -69350,7 +69469,7 @@ msgid_plural "lambs" msgstr[0] "cordero" msgstr[1] "corderos" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -77628,7 +77747,8 @@ msgstr[1] "cascos de minero (encendidos)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -78222,12 +78342,14 @@ msgid_plural "phase immersion suits (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -103607,12 +103729,12 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "roulette table" -msgstr "" +msgstr "mesa de ruleta" #. ~ Description for roulette table #: lang/json/furniture_from_json.py msgid "A big, scratched roulette table." -msgstr "" +msgstr "Una gran mesa de ruleta rayada." #. ~ Description for this should never actually show up, it's a pseudo #. furniture @@ -103631,7 +103753,7 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "womp!" -msgstr "" +msgstr "¡womp!" #: lang/json/furniture_from_json.py msgid "satellite dish" @@ -103653,16 +103775,16 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "TV antenna" -msgstr "" +msgstr "Antena de TV" #. ~ Description for TV antenna #: lang/json/furniture_from_json.py msgid "The television antenna improved reception for televisions." -msgstr "" +msgstr "La antena de televisión mejoró la recepción de televisores." #: lang/json/furniture_from_json.py msgid "vent pipe" -msgstr "" +msgstr "conducto de ventilación" #. ~ Description for vent pipe #: lang/json/furniture_from_json.py @@ -103680,10 +103802,10 @@ msgid "" msgstr "" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "paja" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "" @@ -104329,7 +104451,7 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "paf!" -msgstr "" +msgstr "¡paf!" #: lang/json/furniture_from_json.py msgid "cardboard fort" @@ -104364,11 +104486,11 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "clickity clack… clack… clack" -msgstr "" +msgstr "clickity clack… clack… clack" #: lang/json/furniture_from_json.py msgid "clickity clack… clack" -msgstr "" +msgstr "clickity clack… clack" #: lang/json/furniture_from_json.py msgid "open beaded curtain" @@ -104381,7 +104503,7 @@ msgstr "" #: lang/json/furniture_from_json.py msgid "clickity clack… clack… clack!" -msgstr "" +msgstr "¡clickity clack… clack… clack!" #: lang/json/furniture_from_json.py msgid "canvas floor" @@ -104578,7 +104700,7 @@ msgstr "¿Cómo vas a hacer para mover esto?" #: lang/json/furniture_from_json.py msgid "street light" -msgstr "" +msgstr "luz de la calle" #. ~ Description for street light #: lang/json/furniture_from_json.py @@ -104586,10 +104708,12 @@ msgid "" "Raised source of light which used to illuminate streets and their " "surrounding area, but it's useless without electricity." msgstr "" +"Fuente de luz elevada que solía iluminar las calles y sus alrededores, pero " +"es inútil sin electricidad." #: lang/json/furniture_from_json.py msgid "traffic light" -msgstr "" +msgstr "luz de tráfico" #. ~ Description for traffic light #: lang/json/furniture_from_json.py @@ -104597,6 +104721,9 @@ msgid "" "Signaling device positioned at road intersections and pedestrian crossings " "to control flows of traffic, but it's useless without electricity." msgstr "" +"Dispositivo de señalización ubicado en las intersecciones de carreteras y " +"cruces peatonales para controlar los flujos de tráfico, pero es inútil sin " +"electricidad." #: lang/json/furniture_from_json.py msgid "utility pole" @@ -121172,7 +121299,7 @@ msgstr "" #. ~ Sign #: lang/json/mapgen_from_json.py msgid "DANGER MINEFIELD" -msgstr "" +msgstr "CUIDADO, CAMPO DE MINAS" #. ~ Computer name #: lang/json/mapgen_from_json.py @@ -121210,7 +121337,7 @@ msgstr "No es un arte marcial, es el viejo y conocido pegar piñas y patadas." #: lang/json/martial_art_from_json.py msgid "Force unarmed" -msgstr "" +msgstr "Desarmado/a" #. ~ Description for martial art 'Force unarmed' #: lang/json/martial_art_from_json.py @@ -121218,6 +121345,8 @@ msgid "" "Not a martial art, setting this style will prevent weapon attacks and force " "punches (with free hand) or kicks." msgstr "" +"No es un arte marcial, establecer este estilo evitará ataques de armas y " +"golpes de fuerza (con mano libre) o patadas." #: lang/json/martial_art_from_json.py msgid "Aikido" @@ -121230,10 +121359,13 @@ msgid "" "injury to the attacker. It uses defensive throws and disarms but lacks " "offensive techniques." msgstr "" +"El aikido es un arte marcial japonés centrado en la defensa personal, al " +"tiempo que minimiza las lesiones al atacante. Utiliza lanzamientos " +"defensivos y desarma al rival, pero carece de técnicas ofensivas." #: lang/json/martial_art_from_json.py msgid "Aikido Stance" -msgstr "" +msgstr "Postura de Aikido" #. ~ Description of buff 'Aikido Stance' for martial art 'Aikido' #: lang/json/martial_art_from_json.py @@ -121243,10 +121375,13 @@ msgid "" "\n" "Blocked damage reduced by 100%% of Dexterity." msgstr "" +"Al ignorar la ofensiva a favor de la autodefensa, eres mejor en la protección.\n" +"\n" +"Daño bloqueado reducido en un 100%% de Destreza." #: lang/json/martial_art_from_json.py msgid "Intermediate Aikido" -msgstr "" +msgstr "Aikido intermedio" #. ~ Description of buff 'Intermediate Aikido' for martial art 'Aikido' #: lang/json/martial_art_from_json.py @@ -121257,10 +121392,14 @@ msgid "" "Blocked Damage reduced by 100%% of Dexterity.\n" "+1 Block attempts, +1 Dodge attempts." msgstr "" +"Un practicante de aikido intermedio puede protegerse contra múltiples oponentes.\n" +"\n" +"Daño bloqueado reducido en un 100%% de Destreza.\n" +"+1 intentos de bloqueo, +1 intentos de esquivar." #: lang/json/martial_art_from_json.py msgid "Advanced Aikido" -msgstr "" +msgstr "Aikido avanzado" #. ~ Description of buff 'Advanced Aikido' for martial art 'Aikido' #: lang/json/martial_art_from_json.py @@ -121269,6 +121408,9 @@ msgid "" "\n" "+1 Block attempts, +1 Dodge attempts." msgstr "" +"Un practicante de aikido avanzado puede protegerse contra aún más oponentes de lo normal.\n" +"\n" +"+1 intentos de bloqueo, +1 intentos de esquivar." #: lang/json/martial_art_from_json.py msgid "Boxing" @@ -121281,10 +121423,13 @@ msgid "" "of the Victorian era. Strength reduces blocked damage and moving increase " "dodge skill." msgstr "" +"Deporte del verdadero caballero, el boxeo moderno ha evolucionado a partir " +"de los combates profesionales de la época victoriana. La fuerza reduce el " +"daño bloqueado y el movimiento aumenta la habilidad de esquivar." #: lang/json/martial_art_from_json.py msgid "Boxing Stance" -msgstr "" +msgstr "Postura de boxeo" #. ~ Description of buff 'Boxing Stance' for martial art 'Boxing' #: lang/json/martial_art_from_json.py @@ -121294,10 +121439,13 @@ msgid "" "\n" "+2 Bash damage, Blocked damge reduced by 50%% of Strength." msgstr "" +"Una postura sólida le permite bloquear más daño de lo normal y ofrecer mejores golpes.\n" +"\n" +"+2 Daño de golpe, Daño bloqueado reducido en un 50%% de Fuerza." #: lang/json/martial_art_from_json.py msgid "Footwork" -msgstr "" +msgstr "Juego de pies" #. ~ Description of buff 'Footwork' for martial art 'Boxing' #: lang/json/martial_art_from_json.py @@ -121307,6 +121455,10 @@ msgid "" "+1.0 Dodge skill.\n" "Lasts for 1 turns. Stacks 2 times." msgstr "" +"Te harás más difícil de golpear balanceándote y evadiendo mientras te mueves.\n" +"\n" +"+1.0 de habilidad de esquivar.\n" +"Dura 1 turno. Se acumula 2 veces." #: lang/json/martial_art_from_json.py msgid "Counter Chance" @@ -124042,29 +124194,31 @@ msgstr "Matar Mamá Zombi" #: lang/json/mission_def_from_json.py msgid "Oh god, I can't believe it happened…" -msgstr "" +msgstr "Oh dios, no puedo creer que haya sucedido..." #: lang/json/mission_def_from_json.py msgid "" "My mom… she's… she was killed, but then she just got back up… she's one of " "those things now. Can you put her out of her misery for me?" msgstr "" +"Mi madre... ella... fue asesinada, pero luego volvió a levantarse... es una " +"de esas cosas ahora. ¿Puedes sacarla de su miseria por mí?" #: lang/json/mission_def_from_json.py msgid "Thank you… she would've wanted it this way." -msgstr "" +msgstr "Gracias... ella lo hubiera querido así." #: lang/json/mission_def_from_json.py msgid "Please reconsider, I know she's suffering…" -msgstr "" +msgstr "Por favor, reconsidéralo. Sé que ella está sufriendo..." #: lang/json/mission_def_from_json.py msgid "Find a gun if you can, make it quick…" -msgstr "" +msgstr "Encuentra un arma si puedes, date prisa..." #: lang/json/mission_def_from_json.py msgid "Well…? Did you… finish things for my mom?" -msgstr "" +msgstr "¿Y bien… ? ¿Terminaste... las cosas para mi mamá?" #: lang/json/mission_def_from_json.py msgid "Thank you. I couldn't rest until I knew that was finished." @@ -124072,7 +124226,7 @@ msgstr "Gracias. No podía descansar hasta saber que se había terminado. " #: lang/json/mission_def_from_json.py msgid "Really… that's too bad." -msgstr "" +msgstr "Realmente... eso es muy malo." #: lang/json/mission_def_from_json.py msgid "Null mission" @@ -124084,7 +124238,7 @@ msgstr "Llegar a Casa de Granja" #: lang/json/mission_def_from_json.py msgid "I just need a place to start over…" -msgstr "" +msgstr "Solo quiero un sitio para empezar de nuevo..." #: lang/json/mission_def_from_json.py msgid "" @@ -135903,6 +136057,9 @@ msgid "" " when the Cataclysm struck. \"Your\" hospital was overrun and evacuated, " "but there's always work for a good doctor." msgstr "" +"Acababas de completar los trámites administrativos para tu residencia cuando" +" se produjo el Cataclismo. \"Tu\" hospital fue invadido y evacuado, pero " +"siempre hay trabajo para un buen médico." #: lang/json/mutation_from_json.py msgid "Skater" @@ -135914,6 +136071,8 @@ msgid "" "You spent a lot of time actively maneuvering on skates before the Cataclysm," " and are better at staying on your feet when checked or blocked." msgstr "" +"Pasaste mucho tiempo maniobrando activamente en skates antes del Cataclismo," +" y eres mejor para mantenerlos cuando frenan o bloquean." #: lang/json/mutation_from_json.py msgid "Martial Artist" @@ -135925,6 +136084,9 @@ msgid "" "You were shaping up to be a pretty decent student of the martial arts before" " the Cataclysm struck. Time to see just how good you really are." msgstr "" +"Te estabas preparando para ser un estudiante de artes marciales bastante " +"decente antes de que ocurriera el Cataclismo. Es hora de ver cuán bueno eres" +" realmente." #: lang/json/mutation_from_json.py msgid "Black Belt" @@ -135963,6 +136125,9 @@ msgid "" "for surgical procedures. Operations involving it will be moderately more " "likely to succeed." msgstr "" +"Estás capacitado para el correcto funcionamiento del Autodoc, una máquina " +"avanzada utilizada para procedimientos quirúrgicos. Las operaciones que lo " +"involucren serán moderadamente más propensas a tener éxito." #: lang/json/mutation_from_json.py msgid "Dungeon Master" @@ -136029,7 +136194,7 @@ msgstr "Tiene Construcciones Nivel 2" #: lang/json/mutation_from_json.py msgid "Starting NPC" -msgstr "" +msgstr "PNJ al inicio" #. ~ Description for Starting NPC #: lang/json/mutation_from_json.py @@ -136043,17 +136208,18 @@ msgstr "PNJ estático" #. ~ Description for Static NPC #: lang/json/mutation_from_json.py msgid "Marker for static NPCs" -msgstr "" +msgstr "Marca para los PNJ estáticos" #: lang/json/mutation_from_json.py msgid "Hallucination" -msgstr "" +msgstr "Alucinación" #. ~ Description for Hallucination #: lang/json/mutation_from_json.py msgid "" "NPC trait that makes them be hallucination. It is a bug if you have it." msgstr "" +"Rasgo de PNJ que hace que sientan alucinaciones. Es un error si lo tienes." #: lang/json/mutation_from_json.py msgid "Debug Night Vision" @@ -137061,12 +137227,12 @@ msgstr "" #: lang/json/mutation_from_json.py msgid "Mana Regeneration" -msgstr "" +msgstr "Regeneración de Maná" #. ~ Description for Mana Regeneration #: lang/json/mutation_from_json.py msgid "Your natural mana regeneration is faster than normal." -msgstr "" +msgstr "Tu regeneración de maná natural es más rápida de lo normal." #: lang/json/mutation_from_json.py msgid "Greater Mana Regeneration" @@ -137323,7 +137489,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "Real Person" -msgstr "" +msgstr "Persona real" #: lang/json/npc_class_from_json.py msgid "I'm just wandering, like a totally real and normal NP… Person!" @@ -137335,7 +137501,7 @@ msgstr "Chef" #: lang/json/npc_class_from_json.py msgid "I'm a chef." -msgstr "" +msgstr "Soy un chef." #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Foodperson" @@ -137347,19 +137513,20 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Cyborg" -msgstr "" +msgstr "Cíborg" #: lang/json/npc_class_from_json.py msgid "Zzzzzt… I… I'm a Cy… BEEEEEP… borg." -msgstr "" +msgstr "Zzzzzt… S… Soy un cí... BEEEEEP… borg." #: lang/json/npc_class_from_json.py msgid "former cop" -msgstr "" +msgstr "ex policía" #: lang/json/npc_class_from_json.py msgid "I used to be a police officer, but I'm just a survivor now." msgstr "" +"Solía ​​ser un oficial de policía, pero ahora solo soy un superviviente." #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "cook" @@ -137379,7 +137546,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Mr Lapin" -msgstr "" +msgstr "Sr. Lapin" #: lang/json/npc_class_from_json.py msgid "I raise rabbits." @@ -137387,7 +137554,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." @@ -137395,7 +137562,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" @@ -137403,7 +137570,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Chris Isherwood" -msgstr "" +msgstr "Chris Isherwood" #: lang/json/npc_class_from_json.py msgid "I'm Jesse and Carlos' son, part of the Isherwood family" @@ -137411,7 +137578,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Claire Isherwood" -msgstr "" +msgstr "Claire Isherwood" #: lang/json/npc_class_from_json.py msgid "I'm the matriarch of the Isherwood family" @@ -137419,7 +137586,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Eddie Isherwood" -msgstr "" +msgstr "Eddie Isherwood" #: lang/json/npc_class_from_json.py msgid "I'm a dairy farmer, part of the Isherwood family" @@ -137427,7 +137594,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Jack Isherwood" -msgstr "" +msgstr "Jack Isherwood" #: lang/json/npc_class_from_json.py msgid "I'm the patriarch of the Isherwood family" @@ -137435,7 +137602,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Jesse Isherwood" -msgstr "" +msgstr "Jesse Isherwood" #: lang/json/npc_class_from_json.py msgid "I'm a horse trainer, part of the Isherwood family" @@ -137443,7 +137610,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Lisa Isherwood" -msgstr "" +msgstr "Lisa Isherwood" #: lang/json/npc_class_from_json.py msgid "Part of the Isherwood family" @@ -137451,7 +137618,7 @@ msgstr "" #: lang/json/npc_class_from_json.py lang/json/npc_from_json.py msgid "Luke Isherwood" -msgstr "" +msgstr "Luke Isherwood" #: lang/json/npc_class_from_json.py msgid "I'm Eddie's son, part of the Isherwood family" @@ -137459,11 +137626,11 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "Prisoner" -msgstr "" +msgstr "Prisionero" #: lang/json/npc_class_from_json.py msgid "Beggar" -msgstr "" +msgstr "Mendigo" #: lang/json/npc_class_from_json.py lang/json/npc_class_from_json.py #: lang/json/npc_from_json.py lang/json/npc_from_json.py @@ -137553,7 +137720,7 @@ msgstr "" #: lang/json/npc_class_from_json.py msgid "Healer" -msgstr "" +msgstr "Sanador" #: lang/json/npc_class_from_json.py msgid "I will purge this land of its curse." @@ -162143,7 +162310,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid " + " -msgstr "" +msgstr " + " #: lang/json/snippet_from_json.py msgid "Hell in " @@ -162151,15 +162318,15 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "were all gonna die" -msgstr "" +msgstr "vamos a morir todos" #: lang/json/snippet_from_json.py msgid "MOM" -msgstr "" +msgstr "MAMÁ" #: lang/json/snippet_from_json.py msgid "FUCK YOU" -msgstr "" +msgstr "JÓDETE" #: lang/json/snippet_from_json.py msgid "This is a cartoon rendition of a zombie." @@ -162182,11 +162349,11 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "I <3 ." -msgstr "" +msgstr "I <3 ." #: lang/json/snippet_from_json.py msgid " fucked ." -msgstr "" +msgstr " jodido ." #: lang/json/snippet_from_json.py msgid "This is a spraypainted drawing of an angel with wings made of vines." @@ -162194,7 +162361,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "Mr. is a vampire!" -msgstr "" +msgstr "¡El Sr. es un vampiro!" #: lang/json/snippet_from_json.py msgid "Their hiding the truth" @@ -162216,11 +162383,11 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "" -msgstr "" +msgstr "" #: lang/json/snippet_from_json.py msgid "don't drink the water" -msgstr "" +msgstr "no bebas el agua" #: lang/json/snippet_from_json.py msgid "" @@ -162264,7 +162431,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "its in the water" -msgstr "" +msgstr "está en el agua" #: lang/json/snippet_from_json.py msgid "" @@ -162278,11 +162445,11 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "Dont eat the proten bars" -msgstr "" +msgstr "No comas las barras de proteínas" #: lang/json/snippet_from_json.py msgid "FEMA: FUCKIN EAT MY ASSHOLE" -msgstr "" +msgstr "FEMA: COMEDME EL CULO, CABRONES" #: lang/json/snippet_from_json.py msgid "" @@ -162296,15 +162463,15 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "NO ONE IS COMING FOR US" -msgstr "" +msgstr "NADIE VIENE POR NOSOTROS" #: lang/json/snippet_from_json.py msgid "THERE'S NO RESCUE BUS" -msgstr "" +msgstr "NO HAY BUS DE RESCATE" #: lang/json/snippet_from_json.py msgid "THEY LET US DOWN" -msgstr "" +msgstr "NOS HAN DEJADO TIRADOS" #: lang/json/snippet_from_json.py msgid "Don't dead open inside" @@ -162312,7 +162479,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "SANCTUARY" -msgstr "" +msgstr "SANTUARIO" #: lang/json/snippet_from_json.py msgid "'s cosplay supply all welcome" @@ -162320,7 +162487,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "Cataclysm Bus Stop" -msgstr "" +msgstr "Parada de bus del Cataclismo" #: lang/json/snippet_from_json.py msgid "They aren't coming to help, they're coming to clean up" @@ -162340,7 +162507,7 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "RIP humanity" -msgstr "" +msgstr "DEP humanidad" #: lang/json/snippet_from_json.py msgid "Everyone's dead Dave" @@ -162419,15 +162586,15 @@ msgstr "" #: lang/json/snippet_from_json.py msgid "FUCK CHINA" -msgstr "" +msgstr "PUTA CHINA" #: lang/json/snippet_from_json.py msgid "FUCK THE COMMUNISTS" -msgstr "" +msgstr "QUE LE DEN A LOS COMUNISTAS" #: lang/json/snippet_from_json.py msgid "Remember " -msgstr "" +msgstr "Recuerda " #: lang/json/snippet_from_json.py msgid "" @@ -171713,7 +171880,7 @@ msgid "Clothing Store" msgstr "Tienda de Ropa" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -171721,7 +171888,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171869,42 +172036,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -171977,13 +172144,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172199,14 +172366,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172377,16 +172544,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "¿Qué estás haciendo aquí?" @@ -172458,24 +172625,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "No, solo no..." +msgid "Anything to do before I go to sleep?" +msgstr "¿Algo para hacer antes de que me vaya a dormir?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "¡Déjame dormir, !" +msgid "Just few minutes more..." +msgstr "Unos minutitos más..." #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Hazlo rápido, quiero irme a dormir." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Unos minutitos más..." +msgid "Just let me sleep, !" +msgstr "¡Déjame dormir, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "¿Algo para hacer antes de que me vaya a dormir?" +msgid "No, just no..." +msgstr "No, solo no..." #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -172589,15 +172756,15 @@ msgid "Let's go." msgstr "Vamos." #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172605,19 +172772,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172625,7 +172788,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -172633,7 +172796,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172641,19 +172804,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172661,7 +172824,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172669,13 +172832,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -172784,13 +172951,12 @@ msgid "Attack anything you want." msgstr "Ataca todo lo que quieras." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172800,11 +172966,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172844,12 +173011,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172859,12 +173026,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172900,19 +173067,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172956,7 +173123,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172964,11 +173131,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172976,7 +173139,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172984,7 +173147,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172992,7 +173155,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173000,7 +173163,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173008,7 +173171,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173016,7 +173179,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173024,13 +173187,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Seguir las mismas reglas que su seguidor." @@ -173199,14 +173366,14 @@ msgstr "" msgid "Sure thing, I'll make my way there." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -173255,7 +173422,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -msgstr "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Fair enough." @@ -173283,7 +173450,7 @@ msgstr "&Suelta el arma." #: lang/json/talk_topic_from_json.py msgid "Don't worry, I'm not going to hurt you" -msgstr "" +msgstr "No te preocupes, no voy a hacerte daño" #: lang/json/talk_topic_from_json.py msgid "Drop your weapon!" @@ -173291,7 +173458,7 @@ msgstr "¡Suelta el arma!" #: lang/json/talk_topic_from_json.py msgid "Get out of here or I'll kill you." -msgstr "" +msgstr "Sal de aquí o te mataré." #: lang/json/talk_topic_from_json.py msgid "Hey there, ." @@ -173320,11 +173487,11 @@ msgstr "Este es mi territorio, ." #: lang/json/talk_topic_from_json.py msgid "" -msgstr "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Calm down. I'm not going to hurt you." -msgstr "" +msgstr "Cálmate. No voy a hacerte daño." #: lang/json/talk_topic_from_json.py msgid "Screw you, no." @@ -173332,7 +173499,7 @@ msgstr "Jodete, no." #: lang/json/talk_topic_from_json.py msgid "" -msgstr "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "&Put hands up." @@ -173360,11 +173527,11 @@ msgstr "Vale, me voy." #: lang/json/talk_topic_from_json.py msgid "About that job…" -msgstr "" +msgstr "Sobre ese trabajo..." #: lang/json/talk_topic_from_json.py msgid "About one of those jobs…" -msgstr "" +msgstr "Sobre uno de esos trabajos..." #: lang/json/talk_topic_from_json.py msgid "What's the matter?" @@ -173375,28 +173542,28 @@ msgid "I don't care." msgstr "No me importa." #: 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?" +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 just have one job for you. Want to hear about it?" -msgstr "Tengo un trabajo para ti. ¿Quieres que te cuente?" +msgid "I don't have any jobs for you." +msgstr "No tengo ningún trabajo para ti." #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "" +msgid "I have more jobs for you. Want to hear about them?" +msgstr "Tengo más trabajos para tí. ¿Quieres saber de ellos?" #: lang/json/talk_topic_from_json.py -msgid "I have more jobs for you. Want to hear about them?" -msgstr "" +msgid "I have other jobs for you. Want to hear about them?" +msgstr "Tengo otros trabajos para ti. ¿Quieres saber de ellos?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any jobs for you." -msgstr "No tengo ningún trabajo para ti." +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 don't have any more jobs for you." -msgstr "No tengo ningún otro trabajo para ti." +msgid "I have another job for you. Want to hear about it?" +msgstr "Tengo otro trabajo para ti. ¿Quieres que te cuente?" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -173407,10 +173574,6 @@ msgstr "Ah, bueno." msgid "Never mind, I'm not interested." msgstr "No importa, no estoy interesado." -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "¿Cuál trabajo?" @@ -173419,6 +173582,10 @@ msgstr "¿Cuál trabajo?" msgid "What about it?" msgstr "¿Qué te parece?" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "No estás trabajando en nada para mí ahora." + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "¡Lo haré!" @@ -173457,7 +173624,7 @@ msgstr "Como quieras. Adiós." #: lang/json/talk_topic_from_json.py msgid "I'm sorry… I failed." -msgstr "" +msgstr "Lo siento... Fracasé." #: lang/json/talk_topic_from_json.py msgid "Not yet." @@ -173465,7 +173632,7 @@ msgstr "Todavía no." #: lang/json/talk_topic_from_json.py msgid "I killed him." -msgstr "" +msgstr "Lo maté." #: lang/json/talk_topic_from_json.py msgid "I killed it." @@ -173489,7 +173656,7 @@ msgstr "Aquí estoy." #: lang/json/talk_topic_from_json.py msgid "I talked to them." -msgstr "" +msgstr "He hablado con ellos." #: lang/json/talk_topic_from_json.py msgid "Here it is!" @@ -173633,32 +173800,32 @@ msgstr "Hmm, bueno." msgid "Thanks!" msgstr "¡Gracias!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "Tengo mucha sed, dame algo para beber." +msgid "I have some reason for not telling you." +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Tengo mucha hambre, dame algo para comer." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "Estoy muy cansado/a, dejame descansar un poco." #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "" +msgid "I'm too hungry, give me something to eat." +msgstr "Tengo mucha hambre, dame algo para comer." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." +msgid "I'm too thirsty, give me something to drink." +msgstr "Tengo mucha sed, dame algo para beber." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173666,16 +173833,16 @@ msgid "Ah, okay." msgstr "Ah, bueno." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Hasta que no tenga algún antibiótico, no..." +msgid "Why should I travel with you?" +msgstr "¿Por qué tendría que viajar contigo?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Recién me preguntaste; preguntame de nuevo después." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "¿Por qué tendría que viajar contigo?" +msgid "Not until I get some antibiotics..." +msgstr "Hasta que no tenga algún antibiótico, no..." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -173715,7 +173882,7 @@ msgstr "¡Bueno, vamos!" #: lang/json/talk_topic_from_json.py msgid "Yeah… I don't think so." -msgstr "" +msgstr "Ya... No lo creo." #: lang/json/talk_topic_from_json.py msgid "What is it?" @@ -173766,11 +173933,11 @@ msgid "On second thought, never mind." msgstr "Pensandolo bien, olvidate." #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" +msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while I'm operating a vehicle!" +msgid "I have some reason for denying you training." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173778,7 +173945,7 @@ msgid "Give it some time, I'll show you something new later..." msgstr "Dale tiempo, te voy a mostrar algo nuevo después..." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." +msgid "I can't train you properly while you're operating a vehicle!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173815,16 +173982,16 @@ msgstr "Prefiero quedarme con eso para mí." #: lang/json/talk_topic_from_json.py msgid "I understand…" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Ya me pediste cosas; pregúntame en otro momento." +msgstr "Entiendo..." #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "¿Por qué tendría que compartir mi equipo contigo?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Ya me pediste cosas; pregúntame en otro momento." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "Bueno, está bien." @@ -173919,7 +174086,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Smart choice." -msgstr "" +msgstr "Sabia decisión." #: lang/json/talk_topic_from_json.py msgid ", and if you ask again, !" @@ -173967,16 +174134,16 @@ msgstr "¡Un placer hacer negocios!" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "" @@ -174040,7 +174207,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Get out of my sight." -msgstr "" +msgstr "Fuera de mi vista." #: lang/json/talk_topic_from_json.py msgid "No, *I'm* sorry, I didn't mean that. Go do what you want." @@ -174306,7 +174473,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -msgstr "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -174336,7 +174503,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Yes, friend?" -msgstr "" +msgstr "¿Sí, amigo?" #: lang/json/talk_topic_from_json.py msgid "Your travels be fruitful, friend." @@ -174403,15 +174570,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Alright." -msgstr "" +msgstr "Bien." #: lang/json/talk_topic_from_json.py msgid "Can I join you?" -msgstr "" +msgstr "¿Puedo unirme a ti?" #: lang/json/talk_topic_from_json.py msgid "Understood. Can I join you?" -msgstr "" +msgstr "Entendido. ¿Puedo unirme a ti?" #: lang/json/talk_topic_from_json.py msgid "Well, I gotta go." @@ -174423,7 +174590,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "Yes… yes I have." -msgstr "" +msgstr "Sí... sí tengo." #: lang/json/talk_topic_from_json.py msgid "Join us then, eat from this meal with us." @@ -174971,15 +175138,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174987,11 +175154,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176352,10 +176519,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -176364,7 +176527,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176375,8 +176539,11 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176712,13 +176879,13 @@ msgstr "Gracias por decirme todo eso. " #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" @@ -176777,8 +176944,7 @@ msgid "I'm sorry you lost someone." msgstr "Siento que hayas perdido a alguien." #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176788,7 +176954,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176813,34 +176980,34 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." +msgid "All right, fine. I had someone. I lost her." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost her." +msgid "All right, fine. I had someone. I lost him." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" @@ -176892,11 +177059,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -176904,11 +177071,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -177550,6 +177717,16 @@ msgid "" "Hell on Earth. I wish I'd paid more attention in Sunday School." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -177561,16 +177738,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -177646,14 +177813,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." +"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " +"interested in getting attached. You didn't pay me to be your friend." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " -"interested in getting attached. You didn't pay me to be your friend." +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -177961,6 +178128,15 @@ msgid "" "help, I'd just be another dripping corpse." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " +"just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancé " @@ -177971,16 +178147,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " -"just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." +msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What were you saying before that?" +msgid "Welcome! You seem new, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178003,10 +178174,6 @@ msgstr "¡Bienvenido!" msgid "How's the weather?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "¿Qué es este lugar?" @@ -178093,16 +178260,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178149,15 +178316,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178191,15 +178358,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178242,14 +178409,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178318,11 +178485,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178379,11 +178546,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178395,19 +178562,19 @@ msgid "You're disgusting." msgstr "Eres desagradable." #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178433,9 +178600,7 @@ msgid "Sounds good, Barry." msgstr "Suena bien, Barry." #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178443,7 +178608,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178518,13 +178685,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178618,7 +178785,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178626,7 +178793,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178924,11 +179091,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179127,8 +179294,12 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "Alguacil, espero que esté aquí para ayudarnos." +msgid "" +"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 "" +"Señor, no sé cómo demonios llegó hasta aquí abajo pero si le queda un poco " +"de juicio se iría mientras pueda." #: lang/json/talk_topic_from_json.py msgid "" @@ -179139,12 +179310,8 @@ msgstr "" "de juicio se iría mientras pueda." #: 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 " -"you'll get out while you can." -msgstr "" -"Señor, no sé cómo demonios llegó hasta aquí abajo pero si le queda un poco " -"de juicio se iría mientras pueda." +msgid "Marshal, I hope you're here to assist us." +msgstr "Alguacil, espero que esté aquí para ayudarnos." #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -179216,16 +179383,16 @@ 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." -msgstr "Alguacil, estoy bastante sorprendido de verlo aquí." +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "Alguacil, estoy bastante sorprendido de verlo aquí." #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -179270,23 +179437,6 @@ msgstr "" "de la red de comunicaciones. Esperamos igual que algunos simples mensajes de" " texto puedan ser recibidos." -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "Hola, alguacil." - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "Alguacil, me temo que no puedo hablar ahora." - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "" -"Se supone que debo dirigir todas las preguntas a mi liderazgo, alguacil." - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "" @@ -179299,6 +179449,15 @@ msgstr "Deberías meterte en tus propios asuntos, no hay nada que mirar aquí." msgid "If you need something you'll need to talk to someone else." msgstr "Si necesitas algo vas a tener que hablar con otra persona." +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "Señora" + +#: lang/json/talk_topic_from_json.py +msgid "Hey miss, don't you think it would be safer if you stuck with me?" +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 "Sir." msgstr "Señor." @@ -179308,13 +179467,21 @@ msgid "Dude, if you can hold your own you should look into enlisting." msgstr "Amigo, si puedes controlarte deberías enrolarte." #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "Señora" +msgid "Hello, marshal." +msgstr "Hola, alguacil." #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "Alguacil, me temo que no puedo hablar ahora." + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." 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 "I'm supposed to direct all questions to my leadership, marshal." +msgstr "" +"Se supone que debo dirigir todas las preguntas a mi liderazgo, alguacil." #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -179371,14 +179538,13 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "" +msgid "Please, help me. I need food." +msgstr "Por favor, ayudame. Necesito comida." #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179387,13 +179553,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "Por favor, ayudame. Necesito comida." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -179412,14 +179579,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179518,13 +179685,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179568,7 +179735,8 @@ 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 "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179576,8 +179744,7 @@ msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179608,16 +179775,16 @@ msgstr "" msgid "Do you need something to eat?" msgstr "¿Necesitas algo para comer?" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -179709,15 +179876,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. Thanks." +" You've helped me a lot. I'm feeling much more myself with all this to " +"keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. Thanks." -" You've helped me a lot. I'm feeling much more myself with all this to " -"keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179737,15 +179904,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." +msgid "Don't bother with these assholes." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179755,18 +179925,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." +msgid "Fuck off, dickwaddle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180053,16 +180220,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180108,11 +180275,11 @@ msgid "I'll see what I can do." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." +msgid "Hey, are you a big fan of survival of the fittest?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, are you a big fan of survival of the fittest?" +msgid "Thanks again for the grub, my friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180133,14 +180300,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." +"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " +"Help a poor sickly soul out?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " -"Help a poor sickly soul out?" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180164,12 +180331,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180444,19 +180611,19 @@ msgid "What's your take on the situation here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hey, it's you again." +msgid "Oh, uh… hi. You look new. I'm Aleesha." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back, and still alive! Whoa." +msgid "Oh, hey, it's you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Aw hey, look who's back." +msgid "You're back, and still alive! Whoa." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgid "Aw hey, look who's back." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180476,16 +180643,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "" +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "No soy un crio. ¿Eh? Tengo catorce." #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "No soy un chico, eh. Tengo quince." #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "No soy un crio. ¿Eh? Tengo catorce." +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -180495,6 +180662,14 @@ msgstr "" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -180504,14 +180679,6 @@ msgid "" " We can hear them at night." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -180549,7 +180716,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180559,8 +180727,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -180590,33 +180757,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -180645,6 +180812,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -180653,8 +180826,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180664,9 +180837,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." +msgid "Ah, another new face. Hello. I am Boris." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180681,10 +180852,6 @@ msgstr "" msgid "It is good to see you again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -180753,13 +180920,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -180770,6 +180930,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -180799,15 +180966,15 @@ msgid "Got any more bread I can trade flour for?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, nice to see you again." +msgid "Hi there. I'm Dana, nice to see a new face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "It's good to see you're still around." +msgid "Hello, nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." +msgid "It's good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180859,8 +181026,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180871,10 +181040,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180896,6 +181063,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -180917,12 +181090,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -180952,10 +181119,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -180963,6 +181126,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -180999,16 +181166,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -181243,12 +181410,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181348,14 +181515,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181407,21 +181574,21 @@ msgid "Is there anything I can do to help you out?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again." +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you're still around." +msgid "Hello again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hi." +msgid "Good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." +msgid "Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181483,15 +181650,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181557,17 +181724,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi." +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey again." +msgid "Hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." +msgid "Hey again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181617,12 +181784,12 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." +msgid "" +"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." +msgid "Nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181773,6 +181940,15 @@ msgid "" "like this before somebody snaps." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -181785,15 +181961,6 @@ msgid "" "want to know?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "" @@ -181859,6 +182026,14 @@ msgid "" "hope that there's a future to be had." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -181871,10 +182046,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181888,10 +182063,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181908,25 +182087,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -181981,11 +182148,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182028,15 +182195,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182236,15 +182403,15 @@ msgstr "" msgid "What brings you around here? We don't see a lot of new faces." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Need to talk?" -msgstr "¿Necesitas hablar?" - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Need to talk?" +msgstr "¿Necesitas hablar?" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Rhy." msgstr "" @@ -182332,6 +182499,12 @@ msgstr "" msgid "Do you want to talk about your story?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hm? Oh, hi." msgstr "" @@ -182340,12 +182513,6 @@ msgstr "" msgid "...Hi." msgstr "...Hola." -#: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Stan, hey? Nice to meet you." msgstr "" @@ -182455,16 +182622,16 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -182501,14 +182668,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -182517,6 +182676,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -182694,15 +182861,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183094,14 +183261,14 @@ msgstr "Mantenete civilizado o te voy a causar dolor." msgid "Just on watch, move along." msgstr "Solo estoy de guardia, circulando." -#: lang/json/talk_topic_from_json.py -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 "Rough out there, isn't it?" msgstr "¿Está complicado ahí afuera, no?" +#: lang/json/talk_topic_from_json.py +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…" msgstr "" @@ -183130,14 +183297,14 @@ msgstr "" msgid "Well, I'd better be going. Bye." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "Bienvenido, alguacil..." - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "Bienvenido..." +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "Bienvenido, alguacil..." + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -183380,14 +183547,14 @@ msgid "" "attacked by zombie hordes, as you might guess." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "Alguacil..." - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "Ciudadano..." +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "Alguacil..." + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "¿Podemos comerciar recursos?" @@ -183442,14 +183609,14 @@ msgid "" "buy from you. I don't suppose you want to donate?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "¡Esa placa que tienes es bien brillante!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Pareces una persona importante." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "¡Esa placa que tienes es bien brillante!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "En realidad, soy nuevo." @@ -183515,6 +183682,10 @@ msgid "" "it." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " @@ -183523,10 +183694,6 @@ msgstr "" "De la misma manera que conseguiste el tuyo, supongo. No hables mucho, " "algunos de aquí desprecian a las personas como nosotros." -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "Perdón por preguntar." @@ -183552,22 +183719,22 @@ msgstr "Lo voy a comprar." msgid "Who needs rebar?" msgstr "¿Quién necesita varillas corrugadas?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "Mira quién habla. No me jodas." - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "¡Que te den!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "" +msgid "As if you're one to talk. Screw You." +msgstr "Mira quién habla. No me jodas." #: lang/json/talk_topic_from_json.py 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 "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "" @@ -183871,6 +184038,16 @@ msgstr "Supongo que eres el jefe." msgid "Glad to have you aboard." msgstr "Me alegra tenerte en el equipo." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -183951,16 +184128,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -184231,38 +184398,38 @@ msgid "Keep it civil, merc." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Still plenty of outlaws in the roads, perhaps you should tend to your job, " -"marshal..." +msgid "Here to trade, I hope?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You see anything you want, marshal?" +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, a U.S. marshal, how quaint." +msgid "" +"Still plenty of outlaws in the roads, perhaps you should tend to your job, " +"marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" +msgid "You see anything you want, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184504,16 +184671,16 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "¿Puedo ayudarte, alguacil?" +msgid "Morning ma'am, how can I help you?" +msgstr "Buenos días, señora, ¿la puedo ayudar en algo?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "Buenos días, señor, ¿lo puedo ayudar en algo?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "Buenos días, señora, ¿la puedo ayudar en algo?" +msgid "Can I help you, marshal?" +msgstr "¿Puedo ayudarte, alguacil?" #: lang/json/talk_topic_from_json.py msgid "" @@ -184646,14 +184813,14 @@ msgstr "¿Qué tipo de trabajo tienen para mí?" msgid "Not now." msgstr "No ahora." -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "Vení después, necesito encargarme de unas cosas antes." - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "Puedo revisar a ti o a tus compañeros si hay alguien herido." +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "Vení después, necesito encargarme de unas cosas antes." + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "" @@ -184904,7 +185071,7 @@ msgid "Ok." msgstr "Ok." #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184927,9 +185094,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185024,11 +185192,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185040,11 +185208,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -193343,12 +193511,6 @@ msgstr "" msgid "mana weaving" msgstr "" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "nada" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -199964,16 +200126,18 @@ msgstr "" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "<[s] ordenar por: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F]iltrar" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R]esetear" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -200008,8 +200172,9 @@ msgid "Unsorted (recently added first)" msgstr "Desordenado (lo más nuevo, primero)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] show help >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -202992,6 +203157,13 @@ msgstr "" msgid " BIONICS " msgstr "BIÓNICOS" +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -203001,19 +203173,13 @@ msgstr "" "Elige un biónico para reasignar o pulsa la BARRA ESPACIADORA para cancelar." #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" #: src/bionics_ui.cpp @@ -203109,10 +203275,8 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"¡No puedes activar %s!\n" -"Para leer la descripción de %s, pulsa '!', y después '%c'." #: src/bonuses.cpp msgid "Accuracy" @@ -215232,7 +215396,7 @@ msgid "You can't crack a safe while deaf!" msgstr "¡No puedes crackear la caja fuerte mientras estés sordo!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -217494,13 +217658,8 @@ msgstr "" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Filtro" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Filtro: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -236418,6 +236577,16 @@ msgstr "" "dibujo lineal Unicode. Usa esta opción cuando la fuente de texto " "seleccionada no contenga los glifos necesarios." +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "Usar gráficos" @@ -238400,10 +238569,6 @@ msgstr "Desc. :" msgid "Heat :" msgstr "Calor :" -#: src/panels.cpp -msgid "Sound :" -msgstr "Ruido :" - #: src/panels.cpp msgid "Deaf!" msgstr "¡Sordo!" @@ -243295,7 +243460,8 @@ msgid "Remove attached curtains first." msgstr "Primero quita las cortinas enganchadas." #: src/vehicle.cpp -msgid "Remove attached part first." +#, c-format +msgid "Remove the attached %s first." msgstr "" #: src/vehicle.cpp diff --git a/lang/po/hu.po b/lang/po/hu.po index 57a67c247b9bb..4eb61776cf819 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: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Daniel Szollosi-Nagy , 2020\n" "Language-Team: Hungarian (https://www.transifex.com/cataclysm-dda-translators/teams/2217/hu/)\n" @@ -706,7 +706,7 @@ msgid_plural "oxygen" msgstr[0] "oxigén" msgstr[1] "oxigén" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Egy oxigéntartály." @@ -798,7 +798,7 @@ msgid_plural "nitrox" msgstr[0] "nitrox" msgstr[1] "nitrox" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "Oxigén és nitrogén merüléshez megfelelően vegyített keveréke." @@ -809,7 +809,7 @@ msgid_plural "tinder" msgstr[0] "tapló" msgstr[1] "tapló" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "Könnyű tűzgyújtáshoz szétválogatott éghető anyag." @@ -831,7 +831,7 @@ msgid_plural "metal RPG dice" msgstr[0] "fém szerepjáték dobókocka" msgstr[1] "fém szerepjáték dobókocka" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "Többféle szerepjátékhoz használható fém dobókocka." @@ -868,7 +868,7 @@ msgid_plural "sulfur" msgstr[0] "kén" msgstr[1] "kén" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -915,7 +915,7 @@ msgid_plural "limestone" msgstr[0] "mészkő" msgstr[1] "mészkő" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -931,7 +931,7 @@ msgid_plural "quicklime" msgstr[0] "oltatlan mész" msgstr[1] "oltatlan mész" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -951,7 +951,7 @@ msgid_plural "sand" msgstr[0] "homok" msgstr[1] "homok" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -966,7 +966,7 @@ msgid_plural "soil" msgstr[0] "virágföld" msgstr[1] "virágföld" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1000,7 +1000,7 @@ msgid_plural "zinc powder" msgstr[0] "cink por" msgstr[1] "cink por" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1018,7 +1018,7 @@ msgid_plural "zinc oxide" msgstr[0] "cink-oxid" msgstr[1] "cink-oxid" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1033,7 +1033,8 @@ msgid_plural "manganese dioxide" msgstr[0] "mangán-dioxid" msgstr[1] "mangán-dioxid" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1050,7 +1051,8 @@ msgid_plural "potassium chloride" msgstr[0] "kálium-klorid" msgstr[1] "kálium-klorid" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1069,7 +1071,8 @@ msgid_plural "potassium hydroxide" msgstr[0] "kálium-hidroxid" msgstr[1] "kálium-hidroxid" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1086,7 +1089,7 @@ msgid_plural "sulfuric acid" msgstr[0] "kénsav" msgstr[1] "kénsav" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1138,7 +1141,7 @@ msgid_plural "nitric acid" msgstr[0] "salétromsav" msgstr[1] "salétromsav" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1261,7 +1264,7 @@ msgid_plural "saltpeter" msgstr[0] "salétrom" msgstr[1] "salétrom" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1278,7 +1281,7 @@ msgid_plural "niter" msgstr[0] "salétromsó" msgstr[1] "salétromsó" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1353,7 +1356,7 @@ msgid_plural "thermite" msgstr[0] "termit" msgstr[1] "termit" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1410,7 +1413,8 @@ msgid_plural "match head powder" msgstr[0] "gyufafej-por" msgstr[1] "gyufafej-por" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1490,7 +1494,7 @@ msgid_plural "soap flakes" msgstr[0] "szappanpihe" msgstr[1] "szappanpihe" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "Mosógépben használható formájúra reszelt szappan." @@ -1516,7 +1520,7 @@ msgid_plural "wood ashes" msgstr[0] "fahamu" msgstr[1] "fahamu" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1639,7 +1643,7 @@ msgid_plural "lamp oil" msgstr[0] "lámpaolaj" msgstr[1] "lámpaolaj" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Híg és füstmentesen égő olaj lámpákhoz" @@ -1650,7 +1654,7 @@ msgid_plural "motor oil" msgstr[0] "motor olaj" msgstr[1] "motor olaj" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "Gépjárművek motorjában használatos kenőanyag." @@ -1661,7 +1665,7 @@ msgid_plural "napalm" msgstr[0] "napalm" msgstr[1] "napalm" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -5139,7 +5143,7 @@ msgid_plural "red paint" msgstr[0] "vörös festék" msgstr[1] "vörös festék" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Egy kanna vörös festék." @@ -5161,7 +5165,7 @@ msgid_plural "white paint" msgstr[0] "fehér festék" msgstr[1] "fehér festék" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Egy kanna fehér festék." @@ -5183,7 +5187,7 @@ msgid_plural "purple paint" msgstr[0] "lila festék" msgstr[1] "lila festék" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Egy kanna lila festék." @@ -5194,7 +5198,7 @@ msgid_plural "yellow paint" msgstr[0] "sárga festék" msgstr[1] "sárga festék" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Egy kanna sárga festék." @@ -5266,7 +5270,7 @@ msgstr[0] "arany" msgstr[1] "arany" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5287,7 +5291,7 @@ msgid_plural "zinc" msgstr[0] "cink" msgstr[1] "cink" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5306,7 +5310,7 @@ msgid_plural "lead" msgstr[0] "ólom" msgstr[1] "ólom" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5321,7 +5325,7 @@ msgid_plural "magnesium powder" msgstr[0] "magnézium por" msgstr[1] "magnézium por" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5336,7 +5340,7 @@ msgid_plural "silver" msgstr[0] "ezüst" msgstr[1] "ezüst" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5543,7 +5547,7 @@ msgid_plural "leather scraps" msgstr[0] "bőrhulladék" msgstr[1] "bőrhulladék" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5558,7 +5562,7 @@ msgid_plural "lycra scraps" msgstr[0] "lycra hulladék" msgstr[1] "lycra hulladék" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5573,7 +5577,7 @@ msgid_plural "neoprene scraps" msgstr[0] "neoprén hulladék" msgstr[1] "neoprén hulladék" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5588,7 +5592,8 @@ msgid_plural "synthetic fabric scraps" msgstr[0] "műszálas hulladék" msgstr[1] "műszálas hulladék" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5631,7 +5636,8 @@ msgid_plural "patchwork cotton clothing parts" msgstr[0] "textil ruhadarabos patchwork" msgstr[1] "textil ruhadarabos patchwork" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5657,7 +5663,8 @@ msgid_plural "patchwork faux fur clothing parts" msgstr[0] "műszőrme ruhadarabos patchwork" msgstr[1] "műszőrme ruhadarabos patchwork" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5683,7 +5690,8 @@ msgid_plural "patchwork felt clothing parts" msgstr[0] "nemez ruhadarabos patchwork" msgstr[1] "nemez ruhadarabos patchwork" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5727,7 +5735,8 @@ msgid_plural "patchwork lycra clothing parts" msgstr[0] "lycra ruhadarabos patchwork" msgstr[1] "lycra ruhadarabos patchwork" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5757,7 +5766,8 @@ msgid_plural "patchwork neoprene clothing parts" msgstr[0] "neoprén ruhadarabos patchwork" msgstr[1] "neoprén ruhadarabos patchwork" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5786,7 +5796,8 @@ msgid_plural "patchwork Nomex clothing parts" msgstr[0] "nomex ruhadarabos patchwork" msgstr[1] "nomex ruhadarabos patchwork" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5812,7 +5823,8 @@ msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "műszálas ruhadarabos patchwork" msgstr[1] "műszálas ruhadarabos patchwork" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -7785,12 +7797,14 @@ msgstr[0] "lőszertáska" msgstr[1] "lőszertáska" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -7805,7 +7819,8 @@ msgstr[1] "lőszertáska" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -7814,11 +7829,14 @@ msgid "You stash your %s." msgstr "Elteszed a(z) %st." #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -7853,7 +7871,8 @@ msgid_plural "chest ammo pouches" msgstr[0] "mellkason viselt lőszertáska" msgstr[1] "mellkason viselt lőszertáska" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -7868,7 +7887,7 @@ msgid_plural "chest rig" msgstr[0] "" msgstr[1] "" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -7883,12 +7902,13 @@ msgid_plural "javelin bags" msgstr[0] "dárdazsák" msgstr[1] "dárdazsák" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "Dárda eltevése" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -7917,7 +7937,7 @@ msgid_plural "leg ammo pouches" msgstr[0] "lábon viselt lőszertáska" msgstr[1] "lábon viselt lőszertáska" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -8132,7 +8152,8 @@ msgid_plural "pairs of 2-by-arm guards" msgstr[0] "deszka karvédő" msgstr[1] "deszka karvédő" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -8437,7 +8458,7 @@ msgid_plural "grenade pouches" msgstr[0] "gránátheveder" msgstr[1] "gránátheveder" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -8463,12 +8484,14 @@ msgid_plural "large grenade pouches" msgstr[0] "nagy gránátheveder" msgstr[1] "nagy gránátheveder" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "Gránát eltevése" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "" @@ -8911,6 +8934,8 @@ msgid_plural "pairs of armored boots" msgstr[0] "páncélcsizma" msgstr[1] "páncélcsizma" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -9017,6 +9042,8 @@ msgid_plural "pairs of XL survivor boots" msgstr[0] "XL túlélő csizma" msgstr[1] "XL túlélő csizma" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -9480,7 +9507,8 @@ msgid_plural "pairs of ankle socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -10874,7 +10902,8 @@ msgid_plural "pairs of armored fingerless gloves" msgstr[0] "ujj nélküli páncélozott kesztyű" msgstr[1] "ujj nélküli páncélozott kesztyű" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -11208,7 +11237,8 @@ msgid_plural "pairs of XL survivor gloves" msgstr[0] "XL túlélő kesztyű" msgstr[1] "XL túlélő kesztyű" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -11591,7 +11621,7 @@ msgid_plural "kippahs" msgstr[0] "kippa" msgstr[1] "kippa" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "Vékony, kerek fejfedő, a judaizmus hagyományos viselete." @@ -11602,7 +11632,7 @@ msgid_plural "kufi caps" msgstr[0] "kufi sapka" msgstr[1] "kufi sapka" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Karimátlan, rövid és kerek sapka." @@ -11927,7 +11957,7 @@ msgid_plural "galeae" msgstr[0] "galea" msgstr[1] "galea" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -12640,7 +12670,7 @@ msgid_plural "diver's watches" msgstr[0] "búváróra" msgstr[1] "búváróra" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -16582,7 +16612,8 @@ msgid_plural "pairs of 2-by-shin guards" msgstr[0] "deszka lábvédő" msgstr[1] "deszka lábvédő" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -16613,7 +16644,8 @@ msgid_plural "pairs of chainmail leggings" msgstr[0] "sodronypáncél lábszárvédő" msgstr[1] "sodronypáncél lábszárvédő" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -16626,7 +16658,7 @@ msgid_plural "leather chaps" msgstr[0] "motoros bőrnadrág" msgstr[1] "motoros bőrnadrág" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -16641,7 +16673,7 @@ msgid_plural "fencing pants" msgstr[0] "vívónadrág" msgstr[1] "vívónadrág" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py 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." @@ -16736,7 +16768,8 @@ msgid_plural "light survivor cargo pants" msgstr[0] "könnyű túlélő oldalzsebes nadrág" msgstr[1] "könnyű túlélő oldalzsebes nadrág" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -16751,7 +16784,8 @@ msgid_plural "pairs of motorcycle pants" msgstr[0] "motoros nadrág" msgstr[1] "motoros nadrág" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "Krosszmotorosoknak és motorosoknak készített nadrág." @@ -16790,7 +16824,7 @@ msgid_plural "breeches" msgstr[0] "bricsesznadrág" msgstr[1] "bricsesznadrág" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -16817,7 +16851,7 @@ msgid_plural "hot pants" msgstr[0] "forrónadrág" msgstr[1] "forrónadrág" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "Egy nagyon nagyon rövid rövidnadrág." @@ -16828,7 +16862,7 @@ msgid_plural "fur hot pants" msgstr[0] "szőrme forrónadrág" msgstr[1] "szőrme forrónadrág" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "Egy nagyon nagyon rövid szőrme rövidnadrág." @@ -16839,7 +16873,8 @@ msgid_plural "leather hot pants" msgstr[0] "bőr forrónadrág" msgstr[1] "bőr forrónadrág" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "Egy nagyon nagyon rövid bőr rövidnadrág." @@ -16850,7 +16885,7 @@ msgid_plural "jeans" msgstr[0] "farmernadrág" msgstr[1] "farmernadrág" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "Kék farmernadrág két mély zsebbel." @@ -16890,7 +16925,7 @@ msgid_plural "leggings" msgstr[0] "kamásli" msgstr[1] "kamásli" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -17020,7 +17055,7 @@ msgid_plural "fur pants" msgstr[0] "szőrmenadrág" msgstr[1] "szőrmenadrág" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Szőrmével bélelt nagy nadrág." @@ -17042,7 +17077,7 @@ msgid_plural "leather pants" msgstr[0] "bőrnadrág" msgstr[1] "bőrnadrág" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -17068,7 +17103,8 @@ msgid_plural "mail carrier shorts" msgstr[0] "postás rövidnadrág" msgstr[1] "postás rövidnadrág" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "Sötétkék rövidnadrág, amilyent a postások is hordanak." @@ -17090,7 +17126,7 @@ msgid_plural "cargo shorts" msgstr[0] "oldalzsebes rövidnadrág" msgstr[1] "oldalzsebes rövidnadrág" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "Klasszikus szabású, sokzsebes rövidnadrág, sok minden fér el benne." @@ -17101,7 +17137,7 @@ msgid_plural "denim shorts" msgstr[0] "farmer rövidnadrág" msgstr[1] "farmer rövidnadrág" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -17252,17 +17288,20 @@ msgid_plural "bondage masks (zipped)" msgstr[0] "szado-mazo maszk (becipzározott)" msgstr[1] "szado-mazo maszk (becipzározott)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Kicipzároz" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "Kinyitod a szado-mazo maszk száját és szemnyílásait bezáró cipzárt." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -18209,7 +18248,7 @@ msgid_plural "leather pouches" msgstr[0] "bőrtáska" msgstr[1] "bőrtáska" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -19409,7 +19448,8 @@ msgid_plural "lorica segmentata" msgstr[0] "lorica segmentata" msgstr[1] "lorica segmentata" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -19464,7 +19504,7 @@ msgid_plural "cuirasses" msgstr[0] "mellvért" msgstr[1] "mellvért" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -20192,7 +20232,8 @@ msgid_plural "pairs of arm warmers" msgstr[0] "karmelegítő" msgstr[1] "karmelegítő" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "Puha textil karmelegítő, ami melegen tartja a karjaidat." @@ -20286,7 +20327,7 @@ msgid_plural "boy shorts" msgstr[0] "francia bugyi" msgstr[1] "francia bugyi" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -20312,7 +20353,7 @@ msgid_plural "briefs" msgstr[0] "alsógatya" msgstr[1] "alsógatya" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "Fehér alsógatya Y alakú varrással, kényelmes férfiviselet." @@ -20439,7 +20480,8 @@ msgid_plural "pairs of XL leg warmers" msgstr[0] "XL lábmelegítő" msgstr[1] "XL lábmelegítő" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -20568,7 +20610,8 @@ msgid_plural "compression shorts" msgstr[0] "nejlon rövidnadrág" msgstr[1] "nejlon rövidnadrág" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -21898,7 +21941,7 @@ msgid_plural "test batteries" msgstr[0] "" msgstr[1] "" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -22960,7 +23003,8 @@ msgid_plural "Power Storage CBM Mk. II" msgstr[0] "Energiatároló II KBM" msgstr[1] "Energiatároló II KBM" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -25086,19 +25130,19 @@ msgstr[1] "tervrajz" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -29628,7 +29672,8 @@ msgid_plural "commercial fertilizer" msgstr[0] "ipari műtrágya" msgstr[1] "ipari műtrágya" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "Tápanyagban gazdag granulátum a növényeknek." @@ -29719,7 +29764,8 @@ msgid_plural "concentrated acid" msgstr[0] "tömény sav" msgstr[1] "tömény sav" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Tömény sav. Ne idd meg." @@ -30487,7 +30533,7 @@ msgid_plural "cheap whiskey" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -30986,7 +31032,7 @@ msgid_plural "cooked fish" msgstr[0] "sült hal" msgstr[1] "sült hal" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "Frissen sütött hal. Nagyon tápláló." @@ -31071,7 +31117,7 @@ msgid_plural "chunks of meat" msgstr[0] "húsdarab" msgstr[1] "húsdarab" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -31096,7 +31142,8 @@ msgid_plural "chunks of mutant meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -31222,7 +31269,7 @@ msgid_plural "cooked offal" msgstr[0] "főtt belsőség" msgstr[1] "főtt belsőség" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -31391,7 +31438,8 @@ msgid_plural "cooked pieces of lung" msgstr[0] "főtt tüdődarab" msgstr[1] "főtt tüdődarab" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -31445,7 +31493,7 @@ msgid_plural "cooked brains" msgstr[0] "főtt agy" msgstr[1] "főtt agy" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -31560,7 +31608,8 @@ msgid_plural "chunks of mutant fat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -31633,7 +31682,8 @@ msgid_plural "chunks of tainted meat" msgstr[0] "fertőzött húsdarab" msgstr[1] "fertőzött húsdarab" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -32179,7 +32229,7 @@ msgid_plural "chamomile tea" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -32206,7 +32256,7 @@ msgid_plural "coffee" msgstr[0] "kávé" msgstr[1] "kávé" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -32223,7 +32273,8 @@ msgid_plural "coffee substitute" msgstr[0] "" msgstr[1] "" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -32237,7 +32288,7 @@ msgid_plural "chicory brew" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -32639,7 +32690,7 @@ msgid_plural "clean water" msgstr[0] "tiszta víz" msgstr[1] "tiszta víz" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "Friss, tiszta víz. Ennél jobban semmi sem oltja szomjadat." @@ -33148,7 +33199,8 @@ msgid_plural "cooked strawberries" msgstr[0] "főtt eper" msgstr[1] "főtt eper" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "Olyan, mint az eperlekvár, csak éppen cukor nélkül." @@ -33168,7 +33220,8 @@ msgid_plural "cooked blueberries" msgstr[0] "főtt áfonya" msgstr[1] "főtt áfonya" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "Olyan, mint az áfonyalekvár, csak éppen cukor nélkül." @@ -34041,18 +34094,18 @@ msgid_plural "chocolate candies" msgstr[0] "csokis cukorka" msgstr[1] "csokis cukorka" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "Egy maréknyi csokival töltött színes édesség." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "rágós cukorka" -msgstr[1] "rágós cukorka" +msgid_plural "chewy candy" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "Egy maréknyi gyümölcs ízesítésű színes cukorka." @@ -34294,7 +34347,7 @@ msgid_plural "cheese nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -34423,7 +34476,7 @@ msgid_plural "chili dogs" msgstr[0] "chilis hot-dog" msgstr[1] "chilis hot-dog" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Chili con carne feltéttel készített hot-dog. Fincsi!" @@ -34462,7 +34515,8 @@ msgid_plural "chocolate pancakes" msgstr[0] "csokis palacsinta" msgstr[1] "csokis palacsinta" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -34499,7 +34553,7 @@ msgid_plural "cheese fries" msgstr[0] "sajtos hasábburgonya" msgstr[1] "sajtos hasábburgonya" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "Gyorséttermi sült krumpli, ízletes sajtöntettel." @@ -34541,11 +34595,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -35085,21 +35137,23 @@ msgid_plural "chilis con carne" msgstr[0] "chili con carne" msgstr[1] "chili con carne" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "" @@ -36013,7 +36067,7 @@ msgid_plural "cocaine" msgstr[0] "kokain" msgstr[1] "kokain" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -36191,7 +36245,7 @@ msgid_plural "chewing gum" msgstr[0] "rágógumi" msgstr[1] "rágógumi" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "Neonpink rágógumi. Cukros, édes, és rossz a fogadnak." @@ -38308,7 +38362,7 @@ msgid_plural "chitin powder" msgstr[0] "kitinpor" msgstr[1] "kitinpor" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -38368,7 +38422,7 @@ msgid_plural "cooked beans" msgstr[0] "főtt bab" msgstr[1] "főtt bab" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "Kiadós adag főtt óriásbab." @@ -38446,7 +38500,7 @@ msgid_plural "cooked lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "" @@ -38457,7 +38511,7 @@ msgid_plural "coffee powder" msgstr[0] "kávépor" msgstr[1] "kávépor" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -40120,7 +40174,7 @@ msgid_plural "chicory seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "" @@ -40205,7 +40259,8 @@ msgid_plural "chili pepper seeds" msgstr[0] "chili paprika mag" msgstr[1] "chili paprika mag" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Egy maréknyi chili paprika vetőmag." @@ -40568,7 +40623,7 @@ msgid_plural "coffee beans" msgstr[0] "kávészem" msgstr[1] "kávészem" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Néhány szem kávébab, pörkölhető." @@ -40590,7 +40645,7 @@ msgid_plural "chamomile seeds" msgstr[0] "" msgstr[1] "" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "" @@ -40905,11 +40960,9 @@ msgstr "Egy szál kakukkfű. Isteni az illata." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "főtt gyékény szár" -msgstr[1] "főtt gyékény szár" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -40939,7 +40992,8 @@ msgid_plural "cooked dandelion greens" msgstr[0] "főtt pitypang zöldje" msgstr[1] "főtt pitypang zöldje" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Vad pitypang főtt levele. Ízletes és tápláló." @@ -40972,7 +41026,8 @@ msgid_plural "cooked wild vegetables" msgstr[0] "sült vadon termő zöldség" msgstr[1] "sült vadon termő zöldség" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "Vadnövények ehető részei. Érdekes ízkombináció." @@ -40993,7 +41048,7 @@ msgid_plural "cooked buckwheat" msgstr[0] "főtt hajdina" msgstr[1] "főtt hajdina" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -41047,7 +41102,7 @@ msgid_plural "cooked rice" msgstr[0] "főtt rizs" msgstr[1] "főtt rizs" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Kiadós adag főtt fehér hosszú szemű rizs." @@ -41661,9 +41716,11 @@ msgstr "Finom pizza olvadt sajttal a tetején." #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "müzliszelet" +msgid_plural "granola" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -44424,7 +44481,7 @@ msgid_plural "rock salt" msgstr[0] "kősó" msgstr[1] "kősó" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "Egy maréknyi kősó kristály. Konyhasóvá finomítható." @@ -44435,7 +44492,7 @@ msgid_plural "rhodonite" msgstr[0] "" msgstr[1] "" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -44448,7 +44505,7 @@ msgid_plural "zincite" msgstr[0] "" msgstr[1] "" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -44651,7 +44708,8 @@ msgid_plural "semi ground grains" msgstr[0] "" msgstr[1] "" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "" @@ -44662,7 +44720,8 @@ msgid_plural "smoldering embers" msgstr[0] "izzó parázs" msgstr[1] "izzó parázs" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -44696,7 +44755,7 @@ msgid_plural "coins" msgstr[0] "pénzérme" msgstr[1] "pénzérme" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -44726,19 +44785,27 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "közeli tűz" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "izom" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -44752,6 +44819,15 @@ msgid_plural "none" msgstr[0] "" msgstr[1] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -44846,7 +44922,7 @@ msgid_plural "leather patches" msgstr[0] "bőrdarab" msgstr[1] "bőrdarab" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "Egy kisebb bőrdarab, strapabíró ruházatot lehet belőle varrni." @@ -44857,7 +44933,7 @@ msgid_plural "felt patches" msgstr[0] "nemezdarab" msgstr[1] "nemezdarab" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "Egy kisebb nemezdarab, szétszedhető gyapjú szálakra." @@ -44945,7 +45021,8 @@ msgid_plural "ceramic disks" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -45248,7 +45325,7 @@ msgid_plural "concrete" msgstr[0] "beton" msgstr[1] "beton" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "" @@ -45290,7 +45367,7 @@ msgid_plural "dead flares" msgstr[0] "kiégett jelzőfáklya" msgstr[1] "kiégett jelzőfáklya" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "" @@ -45850,7 +45927,8 @@ msgid_plural "high-quality lenses" msgstr[0] "kiváló minőségű objektív" msgstr[1] "kiváló minőségű objektív" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -45865,7 +45943,8 @@ msgid_plural "small high-quality lenses" msgstr[0] "" msgstr[1] "" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -45880,7 +45959,8 @@ msgid_plural "pairs of tinted glass" msgstr[0] "színes szemüveg" msgstr[1] "színes szemüveg" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -46035,7 +46115,7 @@ msgid_plural "fish bowls" msgstr[0] "gömbakvárium" msgstr[1] "gömbakvárium" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -46379,7 +46459,7 @@ msgid_plural "lumps of clay" msgstr[0] "agyagrög" msgstr[1] "agyagrög" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Friss agyagdarab. Néhány kézműves receptnél jól jöhet." @@ -46401,7 +46481,7 @@ msgid_plural "mortar" msgstr[0] "habarcs" msgstr[1] "habarcs" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "" @@ -46413,17 +46493,17 @@ msgid_plural "soft adobe bricks" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -46652,7 +46732,7 @@ msgid_plural "cured hides" msgstr[0] "pácolt bőr" msgstr[1] "pácolt bőr" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46668,7 +46748,7 @@ msgid_plural "tanned hides" msgstr[0] "cserzett bőr" msgstr[1] "cserzett bőr" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -46683,7 +46763,7 @@ msgid_plural "cured pelts" msgstr[0] "pácolt szőrme" msgstr[1] "pácolt szőrme" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46699,7 +46779,7 @@ msgid_plural "tanned pelts" msgstr[0] "cserzett szőrme" msgstr[1] "cserzett szőrme" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -46714,7 +46794,7 @@ msgid_plural "piles of straw" msgstr[0] "szalmahalom" msgstr[1] "szalmahalom" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -46729,7 +46809,7 @@ msgid_plural "straw dolls" msgstr[0] "szalmababa" msgstr[1] "szalmababa" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "A régi szalmababa egy szoknyás nőt ábrázol." @@ -46892,7 +46972,7 @@ msgid_plural "joint roaches" msgstr[0] "joint csótány" msgstr[1] "joint csótány" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -47082,7 +47162,7 @@ msgid_plural "refrigerant tanks" msgstr[0] "hűtőfolyadék tartály" msgstr[1] "hűtőfolyadék tartály" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -47316,7 +47396,7 @@ msgid_plural "flyers" msgstr[0] "szórólap" msgstr[1] "szórólap" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "Egy darab papír" @@ -47327,7 +47407,7 @@ msgid_plural "survivor's notes" msgstr[0] "túlélő jegyzete" msgstr[1] "túlélő jegyzete" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -47351,7 +47431,7 @@ msgid_plural "score cards" msgstr[0] "" msgstr[1] "" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "" @@ -47362,7 +47442,7 @@ msgid_plural "newspaper pages" msgstr[0] "újságpapír" msgstr[1] "újságpapír" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -47374,7 +47454,7 @@ msgstr "" "szám, még mielőtt New England-et lerohanták. A cikkek nagy része szörnyen " "banális, vagy elavult, de egy dolog megragadja a figyelmedet." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -47386,7 +47466,7 @@ msgstr "" "hogyan maradhatott egyben ennyi ideig. A cikkek nagy része szörnyen banális," " vagy elavult, de egy dolog megragadja a figyelmedet." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -47397,7 +47477,7 @@ msgstr "" "elképesztő, hogy egyben maradt. A cikkek nagy része szörnyen banális, vagy " "elavult, de egy dolog megragadja a figyelmedet." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -47408,7 +47488,7 @@ msgstr "" "nagy része szörnyen banális, vagy elavult, de egy dolog megragadja a " "figyelmedet." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -47419,7 +47499,7 @@ msgstr "" "cikkek nagy része szörnyen banális, vagy elavult, de egy dolog megragadja a " "figyelmedet." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -47436,7 +47516,7 @@ msgid_plural "vault leaflets" msgstr[0] "óvóhely szórólap" msgstr[1] "óvóhely szórólap" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -47999,7 +48079,8 @@ msgid_plural "sets of tiny spidery legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "" @@ -48010,7 +48091,8 @@ msgid_plural "sets of reverse-jointed legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -48022,7 +48104,8 @@ msgid_plural "sets of omni wheels" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "" @@ -48033,7 +48116,7 @@ msgid_plural "sets of rotors" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "" @@ -48044,7 +48127,8 @@ msgid_plural "sets of android legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "" @@ -48055,7 +48139,8 @@ msgid_plural "sets of android arms" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "" @@ -48066,7 +48151,8 @@ msgid_plural "sets of small tank tread" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" @@ -48077,7 +48163,8 @@ msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -48090,7 +48177,8 @@ msgid_plural "police bot chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -48121,7 +48209,7 @@ msgid_plural "misc software" msgstr[0] "egyéb szoftver" msgstr[1] "egyéb szoftver" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "Valamiféle hobbi program. Valószínűleg haszontalan." @@ -48132,7 +48220,7 @@ msgid_plural "hackPRO" msgstr[0] "hackPRO" msgstr[1] "hackPRO" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "Egy hekkelő szoftver." @@ -48165,7 +48253,7 @@ msgid_plural "infection data" msgstr[0] "fertőzési adatok" msgstr[1] "fertőzési adatok" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Orvosi adatok a zombivérről" @@ -48176,7 +48264,7 @@ msgid_plural "lab data" msgstr[0] "laboratóriumi adatok" msgstr[1] "laboratóriumi adatok" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "Egy kormányzati kutatóközpont kutatási archívuma." @@ -48187,7 +48275,7 @@ msgid_plural "train data" msgstr[0] "vasúti adatok" msgstr[1] "vasúti adatok" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "Földalatti vasútvonalak és menetrendek logisztikai adatai" @@ -48198,7 +48286,7 @@ msgid_plural "neural data" msgstr[0] "" msgstr[1] "" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -48212,7 +48300,8 @@ msgid_plural "misc software" msgstr[0] "" msgstr[1] "" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -51232,7 +51321,7 @@ msgid_plural "spare parts" msgstr[0] "alkatrészek" msgstr[1] "alkatrészek" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -51699,17 +51788,20 @@ msgid_plural "expandable batons (extended)" msgstr[0] "teleszkópos gumibot (hosszú)" msgstr[1] "teleszkópos gumibot (hosszú)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "Összecsuk" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Összecsukod a teleszkópos gumibotod." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -51980,7 +52072,8 @@ msgid_plural "ironshod quarterstaves" msgstr[0] "vasalt hosszúbot" msgstr[1] "vasalt hosszúbot" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -52218,7 +52311,7 @@ msgid_plural "quarterstaves" msgstr[0] "hosszúbot" msgstr[1] "hosszúbot" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -52233,7 +52326,7 @@ msgid_plural "rocks in socks" msgstr[0] "köves zokni" msgstr[1] "köves zokni" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "Zokni végébe rakott kő. Az igazi kétségbeesés fegyvere." @@ -52244,7 +52337,8 @@ msgid_plural "sharpened toothbrushes" msgstr[0] "kihegyezett fogkefe" msgstr[1] "kihegyezett fogkefe" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "Személyes higiéniás eszközből készült csuri." @@ -52542,7 +52636,7 @@ msgid_plural "naginata" msgstr[0] "naginata" msgstr[1] "naginata" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52553,7 +52647,7 @@ msgstr "" "pengés fegyverhez hasonló módon készítettek. Alkalmanként a korai időszakban" " a szamurájok is viselték, vagy pedig a háztartás védelmére a feleségük." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52561,7 +52655,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -52575,7 +52669,8 @@ msgid_plural "survivor naginata" msgstr[0] "túlélő naginata" msgstr[1] "túlélő naginata" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -52651,7 +52746,7 @@ msgid_plural "dories" msgstr[0] "dory" msgstr[1] "dory" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "Görög eredetű bronzfejes lándzsa." @@ -52662,7 +52757,7 @@ msgid_plural "ji" msgstr[0] "dzsí" msgstr[1] "dzsí" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -52739,7 +52834,7 @@ msgid_plural "jian" msgstr[0] "csien" msgstr[1] "csien" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -52854,7 +52949,7 @@ msgid_plural "nodachi" msgstr[0] "nodacsi" msgstr[1] "nodacsi" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -52863,7 +52958,7 @@ msgstr "" "Ez egy hatalmas, görbe, kétkezes japán kard életlen és olcsó másolata. " "Méretéhez képest egészen könnyű." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -52992,7 +53087,7 @@ msgid_plural "cutlasses" msgstr[0] "rövid tengerészkard" msgstr[1] "rövid tengerészkard" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -53100,7 +53195,7 @@ msgid_plural "krises" msgstr[0] "kris" msgstr[1] "kris" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -53129,7 +53224,7 @@ msgid_plural "tiger claws" msgstr[0] "tigriskarom" msgstr[1] "tigriskarom" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -53157,7 +53252,8 @@ msgid_plural "pairs of brass knuckles" msgstr[0] "szöges bronzbokszer" msgstr[1] "szöges bronzbokszer" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -53190,7 +53286,8 @@ msgid_plural "pairs of nail knuckles" msgstr[0] "szöges fabokszer" msgstr[1] "szöges fabokszer" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -53205,7 +53302,8 @@ msgid_plural "pairs of steel knuckles" msgstr[0] "szöges acélbokszer" msgstr[1] "szöges acélbokszer" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -53304,7 +53402,7 @@ msgid_plural "throwing knives" msgstr[0] "dobókés" msgstr[1] "dobókés" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -53333,14 +53431,15 @@ msgid_plural "sheets of glass" msgstr[0] "üveglap" msgstr[1] "üveglap" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -53352,7 +53451,8 @@ msgid_plural "sheets of reinforced glass" msgstr[0] "drótüveg lap" msgstr[1] "drótüveg lap" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "Nagyméretű acéldróttal megerősített üveglap." @@ -53363,7 +53463,8 @@ msgid_plural "panes of reinforced glass" msgstr[0] "drótüveg tábla" msgstr[1] "drótüveg tábla" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "Kisméretű acéldróttal megerősített üveglap." @@ -53456,7 +53557,7 @@ msgid_plural "scrap copper" msgstr[0] "réztörmelék" msgstr[1] "réztörmelék" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "" @@ -53519,7 +53620,7 @@ msgid_plural "mattresses" msgstr[0] "" msgstr[1] "" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "" @@ -53530,7 +53631,7 @@ msgid_plural "down mattresses" msgstr[0] "" msgstr[1] "" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "" @@ -53872,21 +53973,28 @@ msgid_plural "sealed jars of eggs" msgstr[0] "szigetelt befőttes üvegnyi tojás" msgstr[1] "szigetelt befőttes üvegnyi tojás" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Befőttes üveg kinyitása" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Kinyitod a befőttes üveget és a tartalmát levegő éri." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -53901,7 +54009,8 @@ msgid_plural "sealed jars of pickles" msgstr[0] "szigetelt befőttes üvegnyi uborka" msgstr[1] "szigetelt befőttes üvegnyi uborka" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -53916,7 +54025,8 @@ msgid_plural "sealed jars of sauerkraut" msgstr[0] "szigetelt befőttes üvegnyi sauerkraut" msgstr[1] "szigetelt befőttes üvegnyi sauerkraut" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -54567,7 +54677,7 @@ msgid_plural "radio car boxes" msgstr[0] "távirányítós autó doboza" msgstr[1] "távirányítós autó doboza" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -54674,7 +54784,8 @@ msgid_plural "sets of ring stand clamps" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -54738,7 +54849,8 @@ msgid_plural "pairs of knitting needles" msgstr[0] "kötőtű" msgstr[1] "kötőtű" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -54835,7 +54947,8 @@ msgid_plural "distaves and spindles" msgstr[0] "guzsaly és orsó" msgstr[1] "guzsaly és orsó" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -54949,7 +55062,7 @@ msgid_plural "storage battery cases" msgstr[0] "tároló akkumulátor keret" msgstr[1] "tároló akkumulátor keret" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -54964,7 +55077,7 @@ msgid_plural "wood boat hulls" msgstr[0] "fa fajótest" msgstr[1] "fa fajótest" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -54980,7 +55093,7 @@ msgid_plural "plastic boat hulls" msgstr[0] "műanyag hajótest" msgstr[1] "műanyag hajótest" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -55014,7 +55127,7 @@ msgid_plural "oars" msgstr[0] "evező" msgstr[1] "evező" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Egy csónak evezője." @@ -55025,7 +55138,7 @@ msgid_plural "sails" msgstr[0] "vitorla" msgstr[1] "vitorla" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "Vitorla egy hajóhoz." @@ -55036,7 +55149,8 @@ msgid_plural "inflatable section" msgstr[0] "felfújható rész" msgstr[1] "felfújható rész" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "Egy felfújható csónak része." @@ -55047,7 +55161,8 @@ msgid_plural "inflatable airbag" msgstr[0] "felfújható légzsák" msgstr[1] "felfújható légzsák" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "Egy felfújható légzsák." @@ -55225,7 +55340,8 @@ msgid_plural "sets of vehicle controls" msgstr[0] "jármű kezelőszervei" msgstr[1] "jármű kezelőszervei" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "Egy gépjármű különböző kezelőszervei. Kézműves projektekhez." @@ -55285,7 +55401,8 @@ msgid_plural "sets of drive by wire controls" msgstr[0] "drive by wire vezérlés" msgstr[1] "drive by wire vezérlés" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -55300,7 +55417,7 @@ msgid_plural "robot driving units" msgstr[0] "robotizált vezérlő egység" msgstr[1] "robotizált vezérlő egység" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -55495,7 +55612,7 @@ msgid_plural "vehicle scoops" msgstr[0] "járműre szerelhető szívószáj" msgstr[1] "járműre szerelhető szívószáj" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -55510,7 +55627,7 @@ msgid_plural "seed drills" msgstr[0] "vetőgép" msgstr[1] "vetőgép" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -55527,7 +55644,7 @@ msgid_plural "reapers" msgstr[0] "aratógép" msgstr[1] "aratógép" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -55575,7 +55692,7 @@ msgid_plural "plows" msgstr[0] "eke" msgstr[1] "eke" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "" @@ -55731,7 +55848,8 @@ msgid_plural "emergency vehicle lights (red)" msgstr[0] "sürgősségi jármű villogója (piros)" msgstr[1] "sürgősségi jármű villogója (piros)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -55746,7 +55864,8 @@ msgid_plural "emergency vehicle lights (blue)" msgstr[0] "sürgősségi jármű villogója (kék)" msgstr[1] "sürgősségi jármű villogója (kék)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -55785,7 +55904,8 @@ msgid_plural "sets of hand rims" msgstr[0] "kerékperem" msgstr[1] "kerékperem" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "Kerekesszék meghajtásához használatos perem." @@ -56461,7 +56581,7 @@ msgid_plural "vehicle coolers" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "" @@ -56472,7 +56592,7 @@ msgid_plural "vehicle heaters" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "" @@ -56842,9 +56962,8 @@ msgstr[1] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -69954,7 +70073,7 @@ msgid_plural "lambs" msgstr[0] "bárány" msgstr[1] "bárány" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -78254,7 +78373,8 @@ msgstr[1] "bányászsisak (be)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -78861,12 +78981,14 @@ msgid_plural "phase immersion suits (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -104852,10 +104974,10 @@ msgid "" msgstr "" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "széna" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "Bálázott szána. Végszükség esetén aludni is lehet rajta." @@ -172136,7 +172258,7 @@ msgid "Clothing Store" msgstr "Ruhabolt" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -172144,7 +172266,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172292,42 +172414,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172403,13 +172525,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172625,14 +172747,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -172803,16 +172925,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "Mit csinálsz itt?" @@ -172884,24 +173006,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "Nem, , nem..." +msgid "Anything to do before I go to sleep?" +msgstr "Kell még valami, mielőtt lefekszem aludni?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "Hagyál már aludni, !" +msgid "Just few minutes more..." +msgstr "Csak egy pár percet még..." #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Gyorsan mondd, szeretnék tovább aludni." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Csak egy pár percet még..." +msgid "Just let me sleep, !" +msgstr "Hagyál már aludni, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "Kell még valami, mielőtt lefekszem aludni?" +msgid "No, just no..." +msgstr "Nem, , nem..." #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -173015,15 +173137,15 @@ msgid "Let's go." msgstr "Menjünk." #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173031,19 +173153,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173051,7 +173169,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -173059,7 +173177,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173067,19 +173185,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173087,7 +173205,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173095,13 +173213,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -173210,13 +173332,12 @@ msgid "Attack anything you want." msgstr "Arra támadj, akire csak akarsz." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173226,11 +173347,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173270,12 +173392,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173285,12 +173407,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173326,19 +173448,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173382,7 +173504,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173390,11 +173512,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173402,7 +173520,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173410,7 +173528,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173418,7 +173536,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173426,7 +173544,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173434,7 +173552,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173442,7 +173560,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -173450,13 +173568,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Ugyanazokat a szabályokat kövesd, mint ő." @@ -173625,14 +173747,14 @@ msgstr "" msgid "Sure thing, I'll make my way there." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -173801,27 +173923,27 @@ msgid "I don't care." msgstr "Nem érdekel." #: 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 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 other jobs for you. Want to hear about them?" +msgid "I have more 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?" +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 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 another job for you. Want to hear about it?" msgstr "" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py @@ -173834,15 +173956,15 @@ msgid "Never mind, I'm not interested." msgstr "Mindegy, nem érdekel." #: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." +msgid "Which job?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Which job?" +msgid "What about it?" 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 @@ -174059,32 +174181,32 @@ msgstr "Hmmm, oké." msgid "Thanks!" msgstr "Köszi!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "Túl szomjas vagyok, adj valamit inni." +msgid "I have some reason for not telling you." +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Túl éhes vagyok, adj valamit enni." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "Túl fáradt vagyok, hadd pihenjek előtte." #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "" +msgid "I'm too hungry, give me something to eat." +msgstr "Túl éhes vagyok, adj valamit enni." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." +msgid "I'm too thirsty, give me something to drink." +msgstr "Túl szomjas vagyok, adj valamit inni." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174092,16 +174214,16 @@ msgid "Ah, okay." msgstr "Ah, oké." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Addig nem, amíg nem kapok antibiotikumot..." +msgid "Why should I travel with you?" +msgstr "És miért pont veled utazzak?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Nemrég kértél erre, majd később." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "És miért pont veled utazzak?" +msgid "Not until I get some antibiotics..." +msgstr "Addig nem, amíg nem kapok antibiotikumot..." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -174192,20 +174314,20 @@ msgid "On second thought, never mind." msgstr "Hát, most, hogy belegondolok, igazából mindegy." #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" +msgid "I can't train you properly while I'm operating a vehicle!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while I'm operating a vehicle!" -msgstr "" +msgid "I have some reason for denying you training." +msgstr "Okom van rá, hogy miért nem tanítalak." #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "Vár egy kicsit, később majd mutatok valami újat..." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "Okom van rá, hogy miért nem tanítalak." +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -174243,14 +174365,14 @@ msgstr "Azt jobban szeretném magamnak megtartani." msgid "I understand…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Most kértél tőlem cuccot, majd később." - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "Miért osztanék én meg veled bármit is?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Most kértél tőlem cuccot, majd később." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "Oké, rendben." @@ -174393,16 +174515,16 @@ msgstr "" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "" @@ -175397,15 +175519,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175413,11 +175535,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -176754,10 +176876,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -176766,7 +176884,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -176777,8 +176896,11 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." msgstr "" #: lang/json/talk_topic_from_json.py @@ -177114,13 +177236,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" @@ -177179,8 +177301,7 @@ msgid "I'm sorry you lost someone." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" #: lang/json/talk_topic_from_json.py @@ -177190,7 +177311,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -177215,34 +177337,34 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." +msgid "All right, fine. I had someone. I lost her." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost her." +msgid "All right, fine. I had someone. I lost him." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" @@ -177294,11 +177416,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -177306,11 +177428,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -177944,6 +178066,16 @@ msgid "" "Hell on Earth. I wish I'd paid more attention in Sunday School." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -177955,16 +178087,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -178040,14 +178162,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." +"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " +"interested in getting attached. You didn't pay me to be your friend." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " -"interested in getting attached. You didn't pay me to be your friend." +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178350,6 +178472,15 @@ msgid "" "help, I'd just be another dripping corpse." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " +"just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancé " @@ -178360,16 +178491,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " -"just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." +msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What were you saying before that?" +msgid "Welcome! You seem new, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178392,10 +178518,6 @@ msgstr "" msgid "How's the weather?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "Mi ez a hely?" @@ -178482,16 +178604,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178538,15 +178660,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178580,15 +178702,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178631,14 +178753,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178707,11 +178829,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178768,11 +178890,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178784,19 +178906,19 @@ msgid "You're disgusting." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178822,9 +178944,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178832,7 +178952,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178907,13 +179029,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179007,7 +179129,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179015,7 +179137,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179313,11 +179435,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179516,7 +179638,9 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." +msgid "" +"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 @@ -179526,9 +179650,7 @@ msgid "" 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 " -"you'll get out while you can." +msgid "Marshal, I hope you're here to assist us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179590,7 +179712,7 @@ 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." +msgid "Ma'am you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179598,7 +179720,7 @@ msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." +msgid "Marshal, I'm rather surprised to see you here." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179636,47 +179758,47 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." +msgid "Hey, citizen… I'm not sure you belong here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." +msgid "You should mind your own business, nothing to see here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." +msgid "If you need something you'll need to talk to someone else." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." +msgid "Ma'am" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, citizen… I'm not sure you belong here." +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 "You should mind your own business, nothing to see here." +msgid "Sir." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "If you need something you'll need to talk to someone else." +msgid "Dude, if you can hold your own you should look into enlisting." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Sir." +msgid "Hello, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Dude, if you can hold your own you should look into enlisting." +msgid "Marshal, I'm afraid I can't talk now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am" +msgid "I'm not in charge here, marshal." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgid "I'm supposed to direct all questions to my leadership, marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179734,14 +179856,13 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" +msgid "Please, help me. I need food." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179750,12 +179871,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179775,14 +179897,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179881,13 +180003,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179931,7 +180053,8 @@ 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 "" +"How's things with you? My cardboard collection is getting quite impressive." msgstr "" #: lang/json/talk_topic_from_json.py @@ -179939,8 +180062,7 @@ msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." +msgid "Have I told you about cardboard, friend? Do you have any?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -179971,16 +180093,16 @@ msgstr "" msgid "Do you need something to eat?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -180072,15 +180194,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. Thanks." +" You've helped me a lot. I'm feeling much more myself with all this to " +"keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. Thanks." -" You've helped me a lot. I'm feeling much more myself with all this to " -"keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -180100,15 +180222,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." +msgid "Don't bother with these assholes." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -180118,18 +180243,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." +msgid "Fuck off, dickwaddle." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180416,16 +180538,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180471,11 +180593,11 @@ msgid "I'll see what I can do." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." +msgid "Hey, are you a big fan of survival of the fittest?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, are you a big fan of survival of the fittest?" +msgid "Thanks again for the grub, my friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180496,14 +180618,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." +"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " +"Help a poor sickly soul out?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " -"Help a poor sickly soul out?" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180527,12 +180649,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180803,19 +180925,19 @@ msgid "What's your take on the situation here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hey, it's you again." +msgid "Oh, uh… hi. You look new. I'm Aleesha." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back, and still alive! Whoa." +msgid "Oh, hey, it's you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Aw hey, look who's back." +msgid "You're back, and still alive! Whoa." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgid "Aw hey, look who's back." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180835,7 +180957,7 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." +msgid "I'm not a kid, okay? I'm fourteen." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180843,7 +180965,7 @@ msgid "I'm not a kid, okay? I'm fifteen." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." +msgid "I'm not a kid, okay? I'm sixteen." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180854,6 +180976,14 @@ msgstr "" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -180863,14 +180993,6 @@ msgid "" " We can hear them at night." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -180908,7 +181030,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180918,8 +181041,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -180949,33 +181071,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -181004,6 +181126,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -181012,8 +181140,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181023,9 +181151,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." +msgid "Ah, another new face. Hello. I am Boris." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181040,10 +181166,6 @@ msgstr "" msgid "It is good to see you again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -181112,13 +181234,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -181129,6 +181244,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -181158,15 +181280,15 @@ msgid "Got any more bread I can trade flour for?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, nice to see you again." +msgid "Hi there. I'm Dana, nice to see a new face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "It's good to see you're still around." +msgid "Hello, nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." +msgid "It's good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181218,8 +181340,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181230,10 +181354,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181255,6 +181377,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -181276,12 +181404,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -181311,10 +181433,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -181322,6 +181440,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -181358,16 +181480,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -181602,12 +181724,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181707,14 +181829,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181766,21 +181888,21 @@ msgid "Is there anything I can do to help you out?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again." +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you're still around." +msgid "Hello again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hi." +msgid "Good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." +msgid "Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181842,15 +181964,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181916,17 +182038,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi." +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey again." +msgid "Hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." +msgid "Hey again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181976,12 +182098,12 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." +msgid "" +"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." +msgid "Nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182132,6 +182254,15 @@ msgid "" "like this before somebody snaps." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -182144,15 +182275,6 @@ msgid "" "want to know?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "" @@ -182218,6 +182340,14 @@ msgid "" "hope that there's a future to be had." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -182230,10 +182360,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182247,10 +182377,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182267,25 +182401,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -182340,11 +182462,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182387,15 +182509,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182596,12 +182718,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182692,17 +182814,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182814,16 +182936,16 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -182860,14 +182982,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -182876,6 +182990,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -183053,15 +183175,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183416,11 +183538,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 @@ -183452,11 +183574,11 @@ msgid "Well, I'd better be going. Bye." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." +msgid "Welcome..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Welcome..." +msgid "Welcome marshal..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183686,11 +183808,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal..." +msgid "Citizen..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Citizen..." +msgid "Marshal..." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183747,14 +183869,14 @@ msgid "" "buy from you. I don't suppose you want to donate?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "Milyen fényes jelvényed van!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Hmm, te fontosnak tűnsz." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "Milyen fényes jelvényed van!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "Én tulajdonképpen most érkeztem." @@ -183821,13 +183943,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Same way you got yours, I bet. Keep quiet about it, some people here look " -"down on people like us." +msgid "Ssh. Some people in here hate… mutations. This was an accident." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgid "" +"Same way you got yours, I bet. Keep quiet about it, some people here look " +"down on people like us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183851,19 +183973,19 @@ msgid "Who needs rebar?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." +msgid "Screw You!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Screw You!" +msgid "As if you're one to talk. Screw You." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh, thought I smelled someone new. Can I help you?" +msgid "I thought I smelled a pig. I jest… please don't arrest me." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184135,6 +184257,16 @@ msgstr "" msgid "Glad to have you aboard." msgstr "Üdv köztünk." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -184215,16 +184347,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -184495,38 +184617,38 @@ msgid "Keep it civil, merc." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Still plenty of outlaws in the roads, perhaps you should tend to your job, " -"marshal..." +msgid "Here to trade, I hope?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You see anything you want, marshal?" +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, a U.S. marshal, how quaint." +msgid "" +"Still plenty of outlaws in the roads, perhaps you should tend to your job, " +"marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" +msgid "You see anything you want, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184741,7 +184863,7 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" +msgid "Morning ma'am, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184749,7 +184871,7 @@ msgid "Morning sir, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" +msgid "Can I help you, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184856,11 +184978,11 @@ msgid "Not now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." +msgid "I can take a look at you or your companions if you are injured." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can take a look at you or your companions if you are injured." +msgid "Come back later, I need to take care of a few things first." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185095,7 +185217,7 @@ msgid "Ok." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185118,9 +185240,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185215,11 +185338,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185231,11 +185354,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -193347,12 +193470,6 @@ msgstr "" msgid "mana weaving" msgstr "" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "nincs" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -200126,16 +200243,18 @@ msgstr "[<] %1$d / %2$d oldal [>]" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s]orrend: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F] szűrő" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R] visszaállít" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -200170,8 +200289,9 @@ msgid "Unsorted (recently added first)" msgstr "Sorrend nélkül (a legújabb van elöl)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] súgót mutat >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -203212,6 +203332,13 @@ msgstr "" msgid " BIONICS " msgstr " BIONIKA " +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -203221,29 +203348,14 @@ msgstr "" "Válaszd ki, hogy melyik bionikát szeretnéd megváltoztatni, vagy a visszavonáshoz nyomd le a Szóközt." #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" -"Aktiválas ! a megtekintéshez, " -"= egy másik betűhöz, TAB a " -"fülváltáshoz, s az üzemanyag-tartalékos üzemmódhoz, " -"A az autókezdési mód ki-/bekapcsolásához." #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" -"Megtekintés ! az " -"aktiváláshoz, = egy másik betűhöz, " -"TAB a fülváltáshoz, s az " -"üzemanyag-tartalékos üzemmódhoz, A az autókezdési mód " -"ki-/bekapcsolásához." #: src/bionics_ui.cpp #, c-format @@ -203345,10 +203457,8 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"Nem aktiválható a(z) %s! \n" -"A(z) %s leírásának elolvasásához nyomd meg a '!' majd a '%c' gombot." #: src/bonuses.cpp msgid "Accuracy" @@ -215612,7 +215722,7 @@ msgid "You can't crack a safe while deaf!" msgstr "Addig nem tudsz feltörni egy széfet amíg süket vagy!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -217875,13 +217985,8 @@ msgstr "Nincsen választható lehetőség" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Szűrő" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Szűrő: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -236600,6 +236705,16 @@ msgstr "" "Unicode-ot. Ezt akkor válaszd, ha a kiválasztott betűkészlet nem tartalmazza" " a szükséges betűket." +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "Grafikát mutasson" @@ -238503,10 +238618,6 @@ msgstr "Pihen:" msgid "Heat :" msgstr "Hő :" -#: src/panels.cpp -msgid "Sound :" -msgstr "" - #: src/panels.cpp msgid "Deaf!" msgstr "Süket!" @@ -243363,8 +243474,9 @@ msgid "Remove attached curtains first." msgstr "Előbb el kell távolítani a rászerelt függönyt." #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "Előbb el kell távolítani a rászerelt alkatrészt." +#, c-format +msgid "Remove the attached %s first." +msgstr "" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/ja.po b/lang/po/ja.po index cd11d62515fc1..b17dd4e0e02a6 100644 --- a/lang/po/ja.po +++ b/lang/po/ja.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Pigmentblue15, 2020\n" "Language-Team: Japanese (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ja/)\n" @@ -666,7 +666,7 @@ msgid "oxygen" msgid_plural "oxygen" msgstr[0] "酸素" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "酸素が入った容器です。" @@ -747,7 +747,7 @@ msgid "nitrox" msgid_plural "nitrox" msgstr[0] "ナイトロックス" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "酸素と窒素を潜水に適した比率で混合した気体です。" @@ -757,7 +757,7 @@ msgid "tinder" msgid_plural "tinder" msgstr[0] "火口" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "燃えやすい素材を細かく削り、より燃焼しやすくしたものです。" @@ -777,7 +777,7 @@ msgid "metal RPG die" msgid_plural "metal RPG dice" msgstr[0] "サイコロ(金属)" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "TRPGで使う金属製のサイコロです。" @@ -810,7 +810,7 @@ msgid "sulfur" msgid_plural "sulfur" msgstr[0] "硫黄" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -849,7 +849,7 @@ msgid "limestone" msgid_plural "limestone" msgstr[0] "石灰岩" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -862,7 +862,7 @@ msgid "quicklime" msgid_plural "quicklime" msgstr[0] "生石灰" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -878,7 +878,7 @@ msgid "sand" msgid_plural "sand" msgstr[0] "砂" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -890,7 +890,7 @@ msgid "soil" msgid_plural "soil" msgstr[0] "土" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -917,7 +917,7 @@ msgid "zinc powder" msgid_plural "zinc powder" msgstr[0] "亜鉛粉末" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -931,7 +931,7 @@ msgid "zinc oxide" msgid_plural "zinc oxide" msgstr[0] "酸化亜鉛" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -943,7 +943,8 @@ msgid "manganese dioxide" msgid_plural "manganese dioxide" msgstr[0] "二酸化マンガン" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -956,7 +957,8 @@ msgid "potassium chloride" msgid_plural "potassium chloride" msgstr[0] "塩化カリウム" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -971,7 +973,8 @@ msgid "potassium hydroxide" msgid_plural "potassium hydroxide" msgstr[0] "水酸化カリウム" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -984,7 +987,7 @@ msgid "sulfuric acid" msgid_plural "sulfuric acid" msgstr[0] "硫酸" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1028,7 +1031,7 @@ msgid "nitric acid" msgid_plural "nitric acid" msgstr[0] "硝酸" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1123,7 +1126,7 @@ msgid "saltpeter" msgid_plural "saltpeter" msgstr[0] "硝酸カリウム" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1136,7 +1139,7 @@ msgid "niter" msgid_plural "niter" msgstr[0] "硝石" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1195,7 +1198,7 @@ msgid "thermite" msgid_plural "thermite" msgstr[0] "テルミット" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1240,7 +1243,8 @@ msgid "match head powder" msgid_plural "match head powder" msgstr[0] "マッチ頭薬粉末" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1304,7 +1308,7 @@ msgid "soap flakes" msgid_plural "soap flakes" msgstr[0] "フレーク石鹸" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "洗濯機での使用に適した、フレーク状にカットされた石鹸です。" @@ -1327,7 +1331,7 @@ msgid "wood ash" msgid_plural "wood ashes" msgstr[0] "木灰" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1430,7 +1434,7 @@ msgid "lamp oil" msgid_plural "lamp oil" msgstr[0] "ランプオイル" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "オイルランプ用に作られた薄く綺麗なオイルです。" @@ -1440,7 +1444,7 @@ msgid "motor oil" msgid_plural "motor oil" msgstr[0] "エンジンオイル" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "自動車に使われるオイルです。" @@ -1450,7 +1454,7 @@ msgid "napalm" msgid_plural "napalm" msgstr[0] "ナパーム" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -4459,7 +4463,7 @@ msgid "red paint" msgid_plural "red paint" msgstr[0] "塗料(赤)" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "塗料(赤)の入った缶です。" @@ -4479,7 +4483,7 @@ msgid "white paint" msgid_plural "white paint" msgstr[0] "塗料(白)" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "塗料(白)の入った缶です。" @@ -4499,7 +4503,7 @@ msgid "purple paint" msgid_plural "purple paint" msgstr[0] "塗料(紫)" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "塗料(紫)の入った缶です。" @@ -4509,7 +4513,7 @@ msgid "yellow paint" msgid_plural "yellow paint" msgstr[0] "塗料(黄)" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "塗料(黄)の入った缶です。" @@ -4577,7 +4581,7 @@ msgid_plural "gold" msgstr[0] "金" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -4594,7 +4598,7 @@ msgid "zinc" msgid_plural "zinc" msgstr[0] "亜鉛" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -4609,7 +4613,7 @@ msgid "lead" msgid_plural "lead" msgstr[0] "鉛" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -4621,7 +4625,7 @@ msgid "magnesium powder" msgid_plural "magnesium powder" msgstr[0] "マグネシウム粉末" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -4633,7 +4637,7 @@ msgid "silver" msgid_plural "silver" msgstr[0] "銀" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -4808,7 +4812,7 @@ msgid "leather scraps" msgid_plural "leather scraps" msgstr[0] "布屑(革)" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -4820,7 +4824,7 @@ msgid "lycra scraps" msgid_plural "lycra scraps" msgstr[0] "布屑(ライクラ)" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -4832,7 +4836,7 @@ msgid "neoprene scraps" msgid_plural "neoprene scraps" msgstr[0] "布屑(ネオプレン)" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -4844,7 +4848,8 @@ msgid "synthetic fabric scraps" msgid_plural "synthetic fabric scraps" msgstr[0] "布屑(合成繊維)" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -4880,7 +4885,8 @@ msgid "patchwork cotton clothing parts" msgid_plural "patchwork cotton clothing parts" msgstr[0] "パッチワーク生地(綿)" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -4903,7 +4909,8 @@ msgid "patchwork faux fur clothing parts" msgid_plural "patchwork faux fur clothing parts" msgstr[0] "パッチワーク生地(フェイクファー)" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -4926,7 +4933,8 @@ msgid "patchwork felt clothing parts" msgid_plural "patchwork felt clothing parts" msgstr[0] "パッチワーク生地(フェルト)" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -4962,7 +4970,8 @@ msgid "patchwork lycra clothing parts" msgid_plural "patchwork lycra clothing parts" msgstr[0] "パッチワーク生地(ライクラ)" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -4988,7 +4997,8 @@ msgid "patchwork neoprene clothing parts" msgid_plural "patchwork neoprene clothing parts" msgstr[0] "パッチワーク生地(ネオプレン)" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5014,7 +5024,8 @@ msgid "patchwork Nomex clothing parts" msgid_plural "patchwork Nomex clothing parts" msgstr[0] "パッチワーク生地(ノーメックス)" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5037,7 +5048,8 @@ msgid "patchwork synthetic fabric clothing parts" msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "パッチワーク生地(合成繊維)" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -6800,12 +6812,14 @@ msgid_plural "ammo satchels" msgstr[0] "弾倉鞄" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -6820,7 +6834,8 @@ msgstr[0] "弾倉鞄" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -6829,11 +6844,14 @@ msgid "You stash your %s." msgstr "%sを収納しました。" #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -6865,7 +6883,8 @@ msgid "chest ammo pouch" msgid_plural "chest ammo pouches" msgstr[0] "弾倉ポーチ(胸)" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -6877,7 +6896,7 @@ msgid "chest rig" msgid_plural "chest rig" msgstr[0] "チェストリグ" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -6892,12 +6911,13 @@ msgid "javelin bag" msgid_plural "javelin bags" msgstr[0] "ジャベリンバッグ" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "ジャベリンを収納する" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -6921,7 +6941,7 @@ msgid "leg ammo pouch" msgid_plural "leg ammo pouches" msgstr[0] "弾倉ポーチ(脚)" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -7099,7 +7119,8 @@ msgid "pair of 2-by-arm guards" msgid_plural "pairs of 2-by-arm guards" msgstr[0] "アームガード(木)" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -7367,7 +7388,7 @@ msgid "grenade pouch" msgid_plural "grenade pouches" msgstr[0] "擲弾ポーチ" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -7391,12 +7412,14 @@ msgid "large grenade pouch" msgid_plural "large grenade pouches" msgstr[0] "手榴弾ポーチ" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "手榴弾を収納する" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "様々なタイプの手榴弾を4つまで収納できるポーチです。" @@ -7782,6 +7805,8 @@ msgid "pair of armored boots" msgid_plural "pairs of armored boots" msgstr[0] "プレートアーマーブーツ" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -7872,6 +7897,8 @@ msgid "pair of XL survivor boots" msgid_plural "pairs of XL survivor boots" msgstr[0] "サバイバーブーツ(XL)" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -8273,7 +8300,8 @@ msgid "pair of ankle socks" msgid_plural "pairs of ankle socks" msgstr[0] "くるぶし靴下" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -9460,7 +9488,8 @@ msgid "pair of armored fingerless gloves" msgid_plural "pairs of armored fingerless gloves" msgstr[0] "補強指貫グローブ" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -9736,7 +9765,8 @@ msgid "pair of XL survivor gloves" msgid_plural "pairs of XL survivor gloves" msgstr[0] "サバイバーグローブ(XL)" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -10058,7 +10088,7 @@ msgid "kippah" msgid_plural "kippahs" msgstr[0] "キッパー" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "皿のような形をした小さくて薄い帽子です。ユダヤ教の伝統的な民族帽子です。" @@ -10068,7 +10098,7 @@ msgid "kufi cap" msgid_plural "kufi caps" msgstr[0] "クフィ" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "緑のない短く丸みを帯びた帽子です。" @@ -10342,7 +10372,7 @@ msgid "galea" msgid_plural "galeae" msgstr[0] "ガレアヘルム" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -10954,7 +10984,7 @@ msgid "diver's watch" msgid_plural "diver's watches" msgstr[0] "潜水腕時計" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -14542,7 +14572,8 @@ msgid "pair of 2-by-shin guards" msgid_plural "pairs of 2-by-shin guards" msgstr[0] "レッグガード(木)" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -14567,7 +14598,8 @@ msgid "chainmail leggings" msgid_plural "pairs of chainmail leggings" msgstr[0] "チェインメイルレギンス" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -14580,7 +14612,7 @@ msgid "leather chaps" msgid_plural "leather chaps" msgstr[0] "レザーチャップス" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -14592,7 +14624,7 @@ msgid "fencing pants" msgid_plural "fencing pants" msgstr[0] "フェンシングパンツ" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "怪我防止の為にフェンシングの選手が使う補強されたズボンです。" @@ -14677,7 +14709,8 @@ msgid "light survivor cargo pants" msgid_plural "light survivor cargo pants" msgstr[0] "軽量型サバイバーカーゴパンツ" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -14689,7 +14722,8 @@ msgid "motorcycle pants" msgid_plural "pairs of motorcycle pants" msgstr[0] "バイクパンツ" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "ダートバイクなどに乗る際に使用するパンツです。" @@ -14723,7 +14757,7 @@ msgid "breeches" msgid_plural "breeches" msgstr[0] "ブリーチェス" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -14745,7 +14779,7 @@ msgid "hot pants" msgid_plural "hot pants" msgstr[0] "ホットパンツ" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "シンプルなショートパンツです。" @@ -14755,7 +14789,7 @@ msgid "fur hot pants" msgid_plural "fur hot pants" msgstr[0] "ホットパンツ(毛皮)" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "毛皮製のシンプルなショートパンツです。" @@ -14765,7 +14799,8 @@ msgid "leather hot pants" msgid_plural "leather hot pants" msgstr[0] "ホットパンツ(革)" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "革製のシンプルなショートパンツです。" @@ -14775,7 +14810,7 @@ msgid "jeans" msgid_plural "jeans" msgstr[0] "ジーンズ" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "2つの深いポケットが付いた青色のジーンズです。" @@ -14811,7 +14846,7 @@ msgid "leggings" msgid_plural "leggings" msgstr[0] "レギンス" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -14921,7 +14956,7 @@ msgid "fur pants" msgid_plural "fur pants" msgstr[0] "ファーパンツ" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "裏地に毛皮を用いた丈夫なパンツです。" @@ -14941,7 +14976,7 @@ msgid "leather pants" msgid_plural "leather pants" msgstr[0] "レザーパンツ" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -14963,7 +14998,8 @@ msgid "mail carrier shorts" msgid_plural "mail carrier shorts" msgstr[0] "郵便配達員ボトムス" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "郵便局員が着用するダークブルーのショートパンツです。" @@ -14983,7 +15019,7 @@ msgid "cargo shorts" msgid_plural "cargo shorts" msgstr[0] "ハーフカーゴパンツ" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "複数のポケットが付いた丈の短いパンツです。ある程度の収納容積を備えています。" @@ -14993,7 +15029,7 @@ msgid "denim shorts" msgid_plural "denim shorts" msgstr[0] "デニムパンツ" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -15123,17 +15159,20 @@ msgid "bondage mask (zipped)" msgid_plural "bondage masks (zipped)" msgstr[0] "ボンデージマスク(閉)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "ジッパーを開く" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "ボンデージマスクの目元と口元のジッパーを開きました。" -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -15958,7 +15997,7 @@ msgid "leather pouch" msgid_plural "leather pouches" msgstr[0] "ポーチ(革)" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -16984,7 +17023,8 @@ msgid "lorica segmentata" msgid_plural "lorica segmentata" msgstr[0] "ロリカセグメンタタ" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -17030,7 +17070,7 @@ msgid "cuirass" msgid_plural "cuirasses" msgstr[0] "キュイラス" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -17658,7 +17698,8 @@ msgid "pair of arm warmers" msgid_plural "pairs of arm warmers" msgstr[0] "アームウォーマー" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "ぴったりとした付け心地で、柔らかい布のスリーブが腕の体温を維持してくれます。" @@ -17739,7 +17780,7 @@ msgid "boy shorts" msgid_plural "boy shorts" msgstr[0] "ボーイレッグパンティー" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -17761,7 +17802,7 @@ msgid "briefs" msgid_plural "briefs" msgstr[0] "ブリーフ" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "ブリーフは男性が身に付ける快適な下着です。" @@ -17865,7 +17906,8 @@ msgid "pair of XL leg warmers" msgid_plural "pairs of XL leg warmers" msgstr[0] "レッグウォーマー(XL)" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "大きく柔らかで心地よい生地は風変わりなあなたを優しく暖めてくれます。" @@ -17975,7 +18017,8 @@ msgid "compression shorts" msgid_plural "compression shorts" msgstr[0] "コンプレッションパンツ" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -19207,7 +19250,7 @@ msgid "test battery" msgid_plural "test batteries" msgstr[0] "テストバッテリー" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -20040,7 +20083,8 @@ msgid "Power Storage CBM Mk. II" msgid_plural "Power Storage CBM Mk. II" msgstr[0] "CBM: 蓄電装置Mk.II " -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -21791,19 +21835,19 @@ msgstr[0] "本(学習/開発概要)" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -25789,7 +25833,8 @@ msgid "commercial fertilizer" msgid_plural "commercial fertilizer" msgstr[0] "化学肥料" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "植物に必要な栄養を豊富に含んだ粒剤です。" @@ -25867,7 +25912,8 @@ msgid "concentrated acid" msgid_plural "concentrated acid" msgstr[0] "濃酸" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "高濃度の酸です。絶対に飲まないで下さい。" @@ -26529,7 +26575,7 @@ msgid "cheap whiskey" msgid_plural "cheap whiskey" msgstr[0] "ウイスキー(安物)" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "非常に安価なブレンデッドウイスキーです。" @@ -26978,7 +27024,7 @@ msgid "cooked fish" msgid_plural "cooked fish" msgstr[0] "魚(調理済)" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "調理を施した新鮮な魚です。栄養価が高いです。" @@ -27060,7 +27106,7 @@ msgid "chunk of meat" msgid_plural "chunks of meat" msgstr[0] "肉塊" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -27083,7 +27129,8 @@ msgid "chunk of mutant meat" msgid_plural "chunks of mutant meat" msgstr[0] "変異肉塊" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -27200,7 +27247,7 @@ msgid "cooked offal" msgid_plural "cooked offal" msgstr[0] "臓物(調理済)" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -27345,7 +27392,8 @@ msgid "cooked piece of lung" msgid_plural "cooked pieces of lung" msgstr[0] "肺(調理済)" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -27393,7 +27441,7 @@ msgid "cooked brains" msgid_plural "cooked brains" msgstr[0] "脳(調理済)" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -27492,7 +27540,8 @@ msgid "chunk of mutant fat" msgid_plural "chunks of mutant fat" msgstr[0] "変異脂肪塊" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -27563,7 +27612,8 @@ msgid "chunk of tainted meat" msgid_plural "chunks of tainted meat" msgstr[0] "汚染肉塊" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -28067,7 +28117,7 @@ msgid "chamomile tea" msgid_plural "chamomile tea" msgstr[0] "カモミールティー" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -28090,7 +28140,7 @@ msgid "coffee" msgid_plural "coffee" msgstr[0] "コーヒー" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -28104,7 +28154,8 @@ msgid "coffee substitute" msgid_plural "coffee substitute" msgstr[0] "代用コーヒー" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -28118,7 +28169,7 @@ msgid "chicory brew" msgid_plural "chicory brew" msgstr[0] "チコリコーヒー" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -28477,7 +28528,7 @@ msgid "clean water" msgid_plural "clean water" msgstr[0] "飲料水" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "新鮮で清潔な水は喉の渇きを癒すのにぴったりです。" @@ -28926,7 +28977,8 @@ msgid "cooked strawberry" msgid_plural "cooked strawberries" msgstr[0] "イチゴ(調理済)" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "砂糖抜きのイチゴジャムのようなものです。" @@ -28945,7 +28997,8 @@ msgid "cooked blueberry" msgid_plural "cooked blueberries" msgstr[0] "ブルーベリー(調理済)" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "砂糖抜きのブルーベリージャムのようなものです。" @@ -29677,17 +29730,17 @@ msgid "chocolate candy" msgid_plural "chocolate candies" msgstr[0] "飴(チョコレート)" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "カラフルなチョコレートをキャンディでコーティングしたお菓子です。" #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "飴(果物)" +msgid_plural "chewy candy" +msgstr[0] "飴(フルーツ)" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "フルーツ味のカラフルなチューイングキャンディです。" @@ -29899,7 +29952,7 @@ msgid "cheese nachos" msgid_plural "cheese nachos" msgstr[0] "ナチョス(チーズ)" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -30014,7 +30067,7 @@ msgid "chili dogs" msgid_plural "chili dogs" msgstr[0] "チリドッグ" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "ホットドッグにトッピングとしてチリコンカルネを添えました。旨い！" @@ -30047,7 +30100,8 @@ msgid "chocolate pancake" msgid_plural "chocolate pancakes" msgstr[0] "チョコレートパンケーキ" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -30079,7 +30133,7 @@ msgid "cheese fries" msgid_plural "cheese fries" msgstr[0] "チーズフライドポテト" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "美味しいチーズがかかったフライドポテトです。" @@ -30118,10 +30172,9 @@ msgstr "ホットドッグ用のソーセージを直火で炙ったものです #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "ホットドッグ(調理済)" +msgstr "ホットドッグ(調理済)" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -30595,19 +30648,21 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "チリコンカルネ" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "チリコン人肉" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "チリコン変異肉" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "スパイシーなシチューです。チリペッパー、肉、トマト、豆などが入っています。" @@ -31420,7 +31475,7 @@ msgid "cocaine" msgid_plural "cocaine" msgstr[0] "コカイン" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -31569,7 +31624,7 @@ msgid "chewing gum" msgid_plural "chewing gum" msgstr[0] "チューインガム" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "ピンク色のチューインガムです。とても甘く、歯には良くありません。" @@ -33500,7 +33555,7 @@ msgid "chitin powder" msgid_plural "chitin powder" msgstr[0] "キチン粉末" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -33553,7 +33608,7 @@ msgid "cooked beans" msgid_plural "cooked beans" msgstr[0] "豆(調理済)" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "茹でた白インゲン豆です。ボリューム満点。" @@ -33625,7 +33680,7 @@ msgid "cooked lentils" msgid_plural "cooked lentils" msgstr[0] "レンズ豆(調理済)" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "質素ながら栄養豊富な、美味しく調理したレンズ豆です。" @@ -33635,7 +33690,7 @@ msgid "coffee powder" msgid_plural "coffee powder" msgstr[0] "コーヒー粉末" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -35146,7 +35201,7 @@ msgid "chicory seeds" msgid_plural "chicory seeds" msgstr[0] "種(チコリ)" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "チコリの種です。" @@ -35225,7 +35280,8 @@ msgid "chili pepper seeds" msgid_plural "chili pepper seeds" msgstr[0] "種(トウガラシ)" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "トウガラシの種です。" @@ -35561,7 +35617,7 @@ msgid "coffee beans" msgid_plural "coffee beans" msgstr[0] "コーヒー豆" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "焙煎していないコーヒー豆です。" @@ -35581,7 +35637,7 @@ msgid "chamomile seeds" msgid_plural "chamomile seeds" msgstr[0] "種(カモミール)" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "カモミールの種です。" @@ -35868,10 +35924,9 @@ msgstr "タイムの茎です。美味しそうな芳香を放っています。 #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "ガマ(調理済)" +msgstr "ガマ(調理済)" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -35895,7 +35950,8 @@ msgid "cooked dandelion greens" msgid_plural "cooked dandelion greens" msgstr[0] "タンポポの葉(調理済)" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "調理した野生のタンポポの葉です。美味しくて栄養が豊富です。" @@ -35926,7 +35982,8 @@ msgid "cooked wild vegetables" msgid_plural "cooked wild vegetables" msgstr[0] "山菜(調理済)" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "食べられる野草を調理したものです。色々な食材が混ざった風変わりな味です。" @@ -35946,7 +36003,7 @@ msgid "cooked buckwheat" msgid_plural "cooked buckwheat" msgstr[0] "蕎麦(調理済)" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -35994,7 +36051,7 @@ msgid "cooked rice" msgid_plural "cooked rice" msgstr[0] "米(調理済)" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "炊き上がった長粒種の白米です。ボリューム満点。" @@ -36543,9 +36600,10 @@ msgstr "美味しいチーズのピザです。溶けたチーズで生地が見 #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "グラノーラ" +msgid_plural "granola" +msgstr[0] "グラノーラ" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -39042,7 +39100,7 @@ msgid "rock salt" msgid_plural "rock salt" msgstr[0] "岩塩" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "少量の岩塩です。精製して食塩に出来ます。" @@ -39052,7 +39110,7 @@ msgid "rhodonite" msgid_plural "rhodonite" msgstr[0] "ロードナイト" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -39064,7 +39122,7 @@ msgid "zincite" msgid_plural "zincite" msgstr[0] "ジンカイト" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -39251,7 +39309,8 @@ msgid "semi ground grains" msgid_plural "semi ground grains" msgstr[0] "粗挽穀粉" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "まだ完全に粉砕されていない、粒の粗い穀粉です。" @@ -39261,7 +39320,8 @@ msgid "smoldering embers" msgid_plural "smoldering embers" msgstr[0] "燻る残り火" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -39290,7 +39350,7 @@ msgid "coin" msgid_plural "coins" msgstr[0] "硬貨" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -39316,19 +39376,23 @@ msgstr[0] "動物" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "火の傍" +msgid_plural "none" +msgstr[0] "火の傍" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "筋肉" +msgid_plural "none" +msgstr[0] "筋肉" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "風" +msgid_plural "none" +msgstr[0] "風" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "太陽光" +msgid_plural "none" +msgstr[0] "日光" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -39340,6 +39404,14 @@ msgid "a smoking device and a source of flame" msgid_plural "none" msgstr[0] "喫煙道具と火" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "0" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -39423,7 +39495,7 @@ msgid "leather patch" msgid_plural "leather patches" msgstr[0] "端切れ(革)" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "革の小さな端切れです。頑丈な衣類を作るために使用することができます。" @@ -39433,7 +39505,7 @@ msgid "felt patch" msgid_plural "felt patches" msgstr[0] "端切れ(フェルト)" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "フェルトの小さな切れ端です。分解して羊毛の織糸にすることができます。" @@ -39509,7 +39581,8 @@ msgid "set of 100 ceramic disk" msgid_plural "ceramic disks" msgstr[0] "セラミックディスク" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -39772,7 +39845,7 @@ msgid "concrete" msgid_plural "concrete" msgstr[0] "コンクリート" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "いつでも建築に使えるよう調整されたコンクリートです。" @@ -39806,7 +39879,7 @@ msgid "dead flare" msgid_plural "dead flares" msgstr[0] "発炎筒(使用済)" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "使用済みのマグネシウム照明です。使い道のないゴミですね。" @@ -40279,7 +40352,8 @@ msgid "high-quality lens" msgid_plural "high-quality lenses" msgstr[0] "高性能レンズ" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -40291,7 +40365,8 @@ msgid "small high-quality lens" msgid_plural "small high-quality lenses" msgstr[0] "小型高性能レンズ" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -40303,7 +40378,8 @@ msgid "pair of tinted glass" msgid_plural "pairs of tinted glass" msgstr[0] "色付きレンズ" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -40436,7 +40512,7 @@ msgid "fish bowl" msgid_plural "fish bowls" msgstr[0] "金魚鉢" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -40726,7 +40802,7 @@ msgid "lump of clay" msgid_plural "lumps of clay" msgstr[0] "粘土の塊" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "湿り気のある粘度の塊です。いくつかの製作レシピの材料になります。" @@ -40746,7 +40822,7 @@ msgid "mortar" msgid_plural "mortar" msgstr[0] "モルタル" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "いつでも建築に使えるよう調整されたモルタルです。" @@ -40756,17 +40832,17 @@ msgid "soft adobe brick" msgid_plural "soft adobe bricks" msgstr[0] "日干しレンガ(未乾燥)" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "レンガを確認すると、十分に硬くなっているようです。" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "レンガはまだ湿っており、耐久性が不十分です。" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -40974,7 +41050,7 @@ msgid "cured hide" msgid_plural "cured hides" msgstr[0] "粗皮(乾燥)" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -40987,7 +41063,7 @@ msgid "tanned hide" msgid_plural "tanned hides" msgstr[0] "鞣革" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -40999,7 +41075,7 @@ msgid "cured pelt" msgid_plural "cured pelts" msgstr[0] "粗毛皮(乾燥)" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -41012,7 +41088,7 @@ msgid "tanned pelt" msgid_plural "tanned pelts" msgstr[0] "鞣毛皮" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -41024,7 +41100,7 @@ msgid "pile of straw" msgid_plural "piles of straw" msgstr[0] "藁束" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -41036,7 +41112,7 @@ msgid "straw doll" msgid_plural "straw dolls" msgstr[0] "藁人形" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "古い藁人形です。ドレスを着た女性を表現しています。" @@ -41185,7 +41261,7 @@ msgid "joint roach" msgid_plural "joint roaches" msgstr[0] "吸殻(ジョイント)" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -41347,7 +41423,7 @@ msgid "refrigerant tank" msgid_plural "refrigerant tanks" msgstr[0] "冷媒タンク" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -41554,7 +41630,7 @@ msgid "flyer" msgid_plural "flyers" msgstr[0] "チラシ" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "紙切れです。" @@ -41564,7 +41640,7 @@ msgid "survivor's note" msgid_plural "survivor's notes" msgstr[0] "生存者のメモ" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -41586,7 +41662,7 @@ msgid "score card" msgid_plural "score cards" msgstr[0] "スコアカード" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "カラフルなスコアカードです。" @@ -41596,7 +41672,7 @@ msgid "newspaper page" msgid_plural "newspaper pages" msgstr[0] "新聞紙" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -41606,7 +41682,7 @@ msgid "" msgstr "" "1枚刷の新聞紙です。恐らく、ニューイングランドが平和だった頃に印刷された最後の休刊号でしょう。記事の大部分は取るに足らない上に、古い情報ばかりです。しかし、ある記事の1文があなたの目を引きました。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -41616,7 +41692,7 @@ msgid "" msgstr "" "1枚刷の新聞紙です。数年前の記事のようで、どれだけこの話題が続いたかについては今となっては知る由もありません。記事の大部分は取るに足らない上に、古い情報ばかりです。しかし、ある記事の1文があなたの目を引きました。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -41625,7 +41701,7 @@ msgid "" msgstr "" "1枚刷の新聞紙です。数年前の記事のようで、ある話題について長文で書かれています。記事の大部分は取るに足らない上に、古い情報ばかりです。しかし、ある記事の1文があなたの目を引きました。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -41634,7 +41710,7 @@ msgid "" msgstr "" "1枚刷の新聞紙です。日付を見ると1年以上前に印刷された物のようです。記事の大部分は取るに足らない上に、古い情報ばかりです。しかし、ある記事の1文があなたの目を引きました。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -41643,7 +41719,7 @@ msgid "" msgstr "" "1枚刷の新聞紙です。日付を見ると大変動の数ヶ月前に印刷された物のようです。記事の大部分は取るに足らない上に、古い情報ばかりです。しかし、ある記事の1文があなたの目を引きました。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -41657,7 +41733,7 @@ msgid "vault leaflet" msgid_plural "vault leaflets" msgstr[0] "地下シェルターの広告" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -42164,7 +42240,8 @@ msgid "set of tiny spidery legs" msgid_plural "sets of tiny spidery legs" msgstr[0] "小型スパイダーレッグ" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "高速ロボットなどの脚として使われている、先端が尖った小型の脚部パーツです。" @@ -42174,7 +42251,8 @@ msgid "set of reverse-jointed legs" msgid_plural "sets of reverse-jointed legs" msgstr[0] "逆関節脚部" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -42185,7 +42263,8 @@ msgid "set of omni wheels" msgid_plural "sets of omni wheels" msgstr[0] "オムニホイール" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "警官ロボットなどの脚として使われている、全方向移動型の車輪です。" @@ -42195,7 +42274,7 @@ msgid "set of rotors" msgid_plural "sets of rotors" msgstr[0] "回転翼" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "小型のドローンを浮遊させる回転翼です。" @@ -42205,7 +42284,8 @@ msgid "set of android legs" msgid_plural "sets of android legs" msgstr[0] "人型脚部" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "人間の脚に似た脚部パーツです。" @@ -42215,7 +42295,8 @@ msgid "set of android arms" msgid_plural "sets of android arms" msgstr[0] "人型腕部" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "人間の腕に似た腕部パーツです。" @@ -42225,7 +42306,8 @@ msgid "set of small tank tread" msgid_plural "sets of small tank tread" msgstr[0] "キャタピラ(小型戦車用)" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "小型無人戦車などで使われている小型戦車用の履帯です。" @@ -42235,7 +42317,8 @@ msgid "turret interior chassis" msgid_plural "turret interior chassis" msgstr[0] "シャシー(タレット)" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -42247,7 +42330,8 @@ msgid "police bot chassis" msgid_plural "police bot chassis" msgstr[0] "シャシー(警官ロボット)" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -42275,7 +42359,7 @@ msgid "misc software" msgid_plural "misc software" msgstr[0] "色々なソフトウェア" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "多数存在する娯楽用ソフトウェアの1つです。多分、今となっては何の役にも立たないでしょう。" @@ -42285,7 +42369,7 @@ msgid "hackPRO" msgid_plural "hackPRO" msgstr[0] "ハックプロ" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "ハッキング用ソフトウェアの1つです。" @@ -42315,7 +42399,7 @@ msgid "infection data" msgid_plural "infection data" msgstr[0] "感染データ" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "ゾンビ血液の医療データです。" @@ -42325,7 +42409,7 @@ msgid "lab data" msgid_plural "lab data" msgstr[0] "実験記録" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "政府機関の研究所で行われた研究の記録です。" @@ -42335,7 +42419,7 @@ msgid "train data" msgid_plural "train data" msgstr[0] "列車運行記録" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "地下鉄路線の運行経路とスケジュールについての記録です。" @@ -42345,7 +42429,7 @@ msgid "neural data" msgid_plural "neural data" msgstr[0] "ニューロンデータ" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -42361,7 +42445,8 @@ msgid "integrated circuit datasheet archives" msgid_plural "misc software" msgstr[0] "集積回路データアーカイブ" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -45081,7 +45166,7 @@ msgid "spare parts" msgid_plural "spare parts" msgstr[0] "予備部品" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -45485,17 +45570,20 @@ msgid "expandable baton (extended)" msgid_plural "expandable batons (extended)" msgstr[0] "特殊警棒(伸長)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "折り畳む" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "警棒を折り畳みました。" -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -45727,7 +45815,8 @@ msgid "ironshod quarterstaff" msgid_plural "ironshod quarterstaves" msgstr[0] "鉄張り六尺棒" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -45940,7 +46029,7 @@ msgid "quarterstaff" msgid_plural "quarterstaves" msgstr[0] "六尺棒" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -45952,7 +46041,7 @@ msgid "rock in a sock" msgid_plural "rocks in socks" msgstr[0] "石入り靴下" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "石をたっぷり詰めた靴下です。絶望的な状況で真価を発揮する武器です。" @@ -45962,7 +46051,8 @@ msgid "sharpened toothbrush" msgid_plural "sharpened toothbrushes" msgstr[0] "刺突用歯ブラシ" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "歯の衛生を保持する道具は、武器に生まれ変わりました。" @@ -46218,7 +46308,7 @@ msgid "naginata" msgid_plural "naginata" msgstr[0] "薙刀" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -46226,7 +46316,7 @@ msgid "" "or by their wives in defense of the household." msgstr "刀をはじめとする日本の刀剣と同じ流れを汲む長柄武器です。侍によって戦場で、あるいはその妻女によって御家を守るために使われました。" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -46234,7 +46324,7 @@ msgid "" "feels a bit shoddily made." msgstr "刀をはじめとする日本の刀剣と同じ手法で作られた、湾曲した刃を持つ頑丈な長柄武器です。刃が少しガタついており、作りが雑な気がします。" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -46247,7 +46337,8 @@ msgid "survivor naginata" msgid_plural "survivor naginata" msgstr[0] "サバイバー薙刀" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -46314,7 +46405,7 @@ msgid "dory" msgid_plural "dories" msgstr[0] "ドリ" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "全長2m強、青銅製の穂先を持つ古代ギリシア発祥の頑丈な槍です。" @@ -46324,7 +46415,7 @@ msgid "ji" msgid_plural "ji" msgstr[0] "戟(ji)" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -46388,7 +46479,7 @@ msgid "jian" msgid_plural "jian" msgstr[0] "劍(jian)" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -46488,14 +46579,14 @@ msgid "nodachi" msgid_plural "nodachi" msgstr[0] "野太刀" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " "from Japan. It is surprisingly light for its size." msgstr "反りの入った長大な太刀...の安価で刃が鈍いレプリカです。大きさの割には軽量です。" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -46615,7 +46706,7 @@ msgid "cutlass" msgid_plural "cutlasses" msgstr[0] "カトラス" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -46704,7 +46795,7 @@ msgid "kris" msgid_plural "krises" msgstr[0] "クリス" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -46728,7 +46819,7 @@ msgid "tiger claws" msgid_plural "tiger claws" msgstr[0] "タイガークロー" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -46752,7 +46843,8 @@ msgid "pair of brass knuckles" msgid_plural "pairs of brass knuckles" msgstr[0] "ブラスナックル" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -46778,7 +46870,8 @@ msgid "pair of nail knuckles" msgid_plural "pairs of nail knuckles" msgstr[0] "ネイルナックル" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -46790,7 +46883,8 @@ msgid "pair of steel knuckles" msgid_plural "pairs of steel knuckles" msgstr[0] "スチールナックル" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -46871,7 +46965,7 @@ msgid "throwing knife" msgid_plural "throwing knives" msgstr[0] "投げナイフ" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -46897,14 +46991,15 @@ msgid "sheet of glass" msgid_plural "sheets of glass" msgstr[0] "ガラス板" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "踏んだ際に音を立てて割れるように、窓ガラスを割って破片を敷き詰めました。" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -46915,7 +47010,8 @@ msgid "sheet of reinforced glass" msgid_plural "sheets of reinforced glass" msgstr[0] "強化ガラス" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "鉄のワイヤーで強化された大きなガラス板です。" @@ -46925,7 +47021,8 @@ msgid "pane of reinforced glass" msgid_plural "panes of reinforced glass" msgstr[0] "強化窓ガラス" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "鉄のワイヤーで強化された大きな窓ガラスです。" @@ -47006,7 +47103,7 @@ msgid "scrap copper" msgid_plural "scrap copper" msgstr[0] "銅屑" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "小さな銅の欠片です。修復やアイテム製作に使います。" @@ -47059,7 +47156,7 @@ msgid "mattress" msgid_plural "mattresses" msgstr[0] "マットレス" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "シングルまたはツインサイズのマットレスです。" @@ -47069,7 +47166,7 @@ msgid "down mattress" msgid_plural "down mattresses" msgstr[0] "マットレス(羽毛)" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "シングルまたはツインサイズの、羽毛が入ったマットレスです。" @@ -47374,21 +47471,28 @@ msgid "sealed jar of eggs" msgid_plural "sealed jars of eggs" msgstr[0] "密封瓶(卵)" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "瓶を開ける" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "密封瓶の蓋を開けて、中身を空気に晒しました。" -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -47400,7 +47504,8 @@ msgid "sealed jar of pickles" msgid_plural "sealed jars of pickles" msgstr[0] "密封瓶(ピクルス)" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -47412,7 +47517,8 @@ msgid "sealed jar of sauerkraut" msgid_plural "sealed jars of sauerkraut" msgstr[0] "密封瓶(ザワークラウト)" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -47999,7 +48105,7 @@ msgid "radio car box" msgid_plural "radio car boxes" msgstr[0] "ラジコンカーセット" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -48093,7 +48199,8 @@ msgid "set of ring stand clamps" msgid_plural "sets of ring stand clamps" msgstr[0] "実験用クランプセット" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -48154,7 +48261,8 @@ msgid "knitting needles" msgid_plural "pairs of knitting needles" msgstr[0] "編針" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -48238,7 +48346,8 @@ msgid "distaff and spindle" msgid_plural "distaves and spindles" msgstr[0] "糸巻き棒と紡錘" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -48335,7 +48444,7 @@ msgid "storage battery case" msgid_plural "storage battery cases" msgstr[0] "蓄電池ケース" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -48348,7 +48457,7 @@ msgid "wood boat hull" msgid_plural "wood boat hulls" msgstr[0] "船体(木)" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -48360,7 +48469,7 @@ msgid "plastic boat hull" msgid_plural "plastic boat hulls" msgstr[0] "船体(ﾌﾟﾗｽﾁｯｸ)" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -48388,7 +48497,7 @@ msgid "oars" msgid_plural "oars" msgstr[0] "オール" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "ボート用のオールです。" @@ -48398,7 +48507,7 @@ msgid "sail" msgid_plural "sails" msgstr[0] "帆" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "ボート用の帆です。" @@ -48408,7 +48517,8 @@ msgid "inflatable section" msgid_plural "inflatable section" msgstr[0] "膨張式空気袋" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "空気で膨らむ膨張式ボートです。" @@ -48418,7 +48528,8 @@ msgid "inflatable airbag" msgid_plural "inflatable airbag" msgstr[0] "エアバッグ" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "膨張式エアバッグです。" @@ -48571,7 +48682,8 @@ msgid "vehicle controls" msgid_plural "sets of vehicle controls" msgstr[0] "車両制御装置" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "色々な車両制御装置の一式です。アイテム製作に使います。" @@ -48622,7 +48734,8 @@ msgid "drive by wire controls" msgid_plural "sets of drive by wire controls" msgstr[0] "電子制御スロットル" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -48634,7 +48747,7 @@ msgid "robot driving unit" msgid_plural "robot driving units" msgstr[0] "ロボット操縦ユニット" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -48792,7 +48905,7 @@ msgid "vehicle scoop" msgid_plural "vehicle scoops" msgstr[0] "車両用スコップ" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -48804,7 +48917,7 @@ msgid "seed drill" msgid_plural "seed drills" msgstr[0] "播種機" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -48817,7 +48930,7 @@ msgid "reaper" msgid_plural "reapers" msgstr[0] "刈取機" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -48855,7 +48968,7 @@ msgid "plow" msgid_plural "plows" msgstr[0] "耕耘爪" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "地面を耕運する鉄製の刃が組み込まれた重量のある機構です。" @@ -48992,7 +49105,8 @@ msgid "emergency vehicle light (red)" msgid_plural "emergency vehicle lights (red)" msgstr[0] "回転灯(赤)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -49004,7 +49118,8 @@ msgid "emergency vehicle light (blue)" msgid_plural "emergency vehicle lights (blue)" msgstr[0] "回転灯(青)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -49038,7 +49153,8 @@ msgid "set of hand rims" msgid_plural "sets of hand rims" msgstr[0] "ハンドリムセット" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "車椅子に使用するハンドリムです。" @@ -49611,7 +49727,7 @@ msgid "vehicle cooler" msgid_plural "vehicle coolers" msgstr[0] "車載クーラー" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "車内を冷やすクーラーです。" @@ -49621,7 +49737,7 @@ msgid "vehicle heater" msgid_plural "vehicle heaters" msgstr[0] "車両用ヒーター" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "車内を暖めるヒーターです。" @@ -49960,11 +50076,10 @@ msgstr[0] "暗号通貨" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" -"PrepNetと呼ばれる集団は、追跡不可能なネットワーク貨幣を利用した租税回避に深く関わっていました。この行為がエスカレートすれば米国の税基盤が損なわれる可能性もありましたが、それより先に大変動が訪れました。表面に乱数列がエンボス加工された、物理的に存在する硬貨です。" +"PrepNetと呼ばれる人々は、追跡不可能なネットワーク貨幣を利用した租税回避に深く関わっていました。この硬貨は、表面に乱数列がエンボス加工された、物理的に存在する暗号通貨です。" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py msgid "vehicle refrigerator" @@ -61629,7 +61744,7 @@ msgid "lamb" msgid_plural "lambs" msgstr[0] "ヒツジ(幼体)" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -69189,7 +69304,8 @@ msgstr[0] "採掘ヘルメット(オン)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -69339,7 +69455,7 @@ msgstr[0] "電熱靴下" #: src/bionics.cpp src/iuse_actor.cpp src/mutation_ui.cpp #, c-format, no-python-format msgid "You activate your %s." -msgstr "%sを稼働させました。" +msgstr "%sを有効化しました。" #. ~ Use action need_charges_msg for {'str': 'pair of thermal electric socks', #. 'str_pl': 'pairs of thermal electric socks'}. @@ -69731,12 +69847,14 @@ msgid "phase immersion suit (on)" msgid_plural "phase immersion suits (on)" msgstr[0] "次元潜入スーツ(オン)" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "スーツをシャットダウンしています。" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -76363,7 +76481,7 @@ msgid "" "provide a controlled airflow. An ember is smoldering inside it, and can be " "used to start a campfire." msgstr "" -"火口を収納する小さな容器です。空気の供給量を調整するための小さな穴がいくつか空いています。中で火口がくすぶっています。いつでもキャンプファイヤーができます。" +"空気の流れを調整するための小さな穴が複数空いた、火口を収納する小さな容器です。中で火口がくすぶっており、いつでもキャンプファイヤーを始められます。" #: lang/json/TOOL_from_json.py msgid "crash axe" @@ -93080,10 +93198,10 @@ msgid "" msgstr "風力を利用してタービンが回転し、屋根裏に溜まった高温多湿の空気を排出します。" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "干し草" +msgid "bale of hay" +msgstr "干し草の山" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "束ねられた干し草です。非常時にはベッドとして使えます。" @@ -139969,7 +140087,7 @@ msgctxt "scen_desc_male" msgid "" "The building you had chosen to reside in has suddenly caught fire! You " "might want to leave." -msgstr "立て篭もった建物から急に火の手が上がりました。早く立ち去るべきでしょう。" +msgstr "立て篭もっていた建物から急に火の手が上がりました！急いで逃げましょう。" #. ~ Description for scenario 'Burning Building' for a female character. #: lang/json/scenario_from_json.py @@ -139977,7 +140095,7 @@ msgctxt "scen_desc_female" msgid "" "The building you had chosen to reside in has suddenly caught fire! You " "might want to leave." -msgstr "立て篭もった建物から急に火の手が上がりました。早く立ち去るべきでしょう。" +msgstr "立て篭もっていた建物から急に火の手が上がりました！急いで逃げましょう。" #. ~ Name for scenario 'Challenge - Really Bad Day' for a male character #: lang/json/scenario_from_json.py @@ -140034,8 +140152,7 @@ msgctxt "scen_desc_male" msgid "" "Som nigromancie hath brought yow hidder! Ye have only the hoose on youre " "legges and the knyf at youre syde and youre prayeres to Marie moder of God." -msgstr "" -"(※中世の言葉で:ネクロマンシーか何かによってここに運ばれた！持ち物はズボンと、ナイフと、あとは聖母マリアに捧げる祈りの言葉ぐらいのものだ。) " +msgstr "何らかの魔術によって現代に連れて来られました！脚にはズボン、腰にはナイフ、他に持っているのは聖母マリアへの祈りの言葉程度です。" #. ~ Description for scenario 'Challenge - Medieval Peasant' for a female #. character. @@ -140044,8 +140161,7 @@ msgctxt "scen_desc_female" msgid "" "Som nigromancie hath brought yow hidder! Ye have only the hoose on youre " "legges and the knyf at youre syde and youre prayeres to Marie moder of God." -msgstr "" -"(※中世の言葉で:ネクロマンシーか何かによってここに運ばれた！持ち物はズボンと、ナイフと、あとは聖母マリアに捧げる祈りの言葉ぐらいのものだ。) " +msgstr "何らかの魔術によって現代に連れて来られました！脚にはズボン、腰にはナイフ、他に持っているのは聖母マリアへの祈りの言葉程度です。" #. ~ Starting location for scenario 'Challenge - Medieval Peasant'. #. ~ Starting location for scenario 'Experiment'. @@ -140580,7 +140696,7 @@ msgid "" "desperate people with little to lose could get you what you wanted. If you " "went too deep, however, your augmentation may have come at a price..." msgstr "" -"滅亡前の世界では、CBMは富裕層と著名人の物でしたが、あなたは望むべくもないものを渇望していました。地下の隠しオフィス、病院から不正入手した麻酔薬、失うものなど何もない人々のお陰で、あなたは欲しい物を手に入れました。しかし、あまり深入りしすぎると、高い代償を支払うことになるかもしれません..." +"滅亡前の世界のCBMは富裕層と著名人の物でしたが、つい分不相応な願望を持ってしまいました。地下の隠しオフィス、病院から不正入手した麻酔薬、失うものなど何もない人々のお陰で欲しい物を手に入れましたが、あまり深入りしすぎると、高い代償を支払うことになるかもしれません..." " " #. ~ Description for scenario 'High Tech, Low Life' for a female character. @@ -140593,7 +140709,7 @@ msgid "" "desperate people with little to lose could get you what you wanted. If you " "went too deep, however, your augmentation may have come at a price..." msgstr "" -"滅亡前の世界では、CBMは富裕層と著名人の物でしたが、あなたは望むべくもないものを渇望していました。地下の隠しオフィス、病院から不正入手した麻酔薬、失うものなど何もない人々のお陰で、あなたは欲しい物を手に入れました。しかし、あまり深入りしすぎると、高い代償を支払うことになるかもしれません..." +"滅亡前の世界のCBMは富裕層と著名人の物でしたが、つい分不相応な願望を持ってしまいました。地下の隠しオフィス、病院から不正入手した麻酔薬、失うものなど何もない人々のお陰で欲しい物を手に入れましたが、あまり深入りしすぎると、高い代償を支払うことになるかもしれません..." " " #. ~ Starting location for scenario 'High Tech, Low Life'. @@ -157713,16 +157829,16 @@ msgid "Clothing Store" msgstr "衣料品店" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." -msgstr "修行者よ。" +msgid "You there. Quiet down. Can you hear it? The song?" +msgstr "そこのお前。静かに。この歌が聞こえるか？" #: lang/json/talk_topic_from_json.py msgid "You're back. Have you come to listen to the song?" msgstr "戻ってきたな。歌を聞きに来たのか？" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" -msgstr "そこのお前。静かに。この歌が聞こえるか？" +msgid "Acolyte." +msgstr "修行者よ。" #: lang/json/talk_topic_from_json.py msgid "What? What do you mean? What song?" @@ -157875,21 +157991,18 @@ msgid "Yeah, alright." msgstr "ああ、そりゃいいや。" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." -msgstr "お前が望むなら、歌うこともできるだろう。" +msgid "An acolyte should not take on too many songs at once." +msgstr "修行者は一度に多くの歌を歌うべきではない。" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." -msgstr "必要があれば、もっと歌を用意しよう。" +msgid "That is all for now." +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." -msgstr "もっと知りたいのなら、役に立つかもしれない骨について心当たりがある。" - -#: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" -msgstr "彫る骨と、奏でる歌がある。我らに加わるか？" +"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 "Do you wish to take on more songs?" @@ -157900,18 +158013,21 @@ msgid "Do you believe you can take on the burden of additional bones?" 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." -msgstr "歌は...今のところ聞こえないな。恐らく時間が経てば、この世界の骨にもっと多くの記録が刻まれることだろう。" +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." -msgstr "修行者は一度に多くの歌を歌うべきではない。" +msgid "There is an additional song you could take on, if you'd like." +msgstr "必要があれば、もっと歌を用意しよう。" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." -msgstr "今は話すことはない。" +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." +msgstr "お前が望むなら、歌うこともできるだろう。" #: lang/json/talk_topic_from_json.py msgid "I see." @@ -157984,16 +158100,16 @@ msgstr "悟りへの道はお前自身で歩め。私の助けはお前の歩み msgid "I see. Very well then." msgstr "なるほど。よく分かったよ。" +#: lang/json/talk_topic_from_json.py +msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgstr "私の力を示せるのは、私が印を与えた者だけだ。" + #: lang/json/talk_topic_from_json.py msgid "" "You bear my mark, meaning I believe you have potential to learn to truly " "listen to the Song. Yes, I will lend my skills to you, for now." msgstr "私はお前に印を与えた。つまり、お前が歌を聞く方法を学び取れるかもしれないという事だ。そうだな、私の力を貸し与えよう。" -#: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." -msgstr "私の力を示せるのは、私が印を与えた者だけだ。" - #: lang/json/talk_topic_from_json.py msgid "I am glad to hear it. Let's go then." msgstr "そう言ってもらえると嬉しいよ。さあ行こう。" @@ -158234,18 +158350,18 @@ msgstr "" " それと、私たちは友達だから、何の断りも入れずに私の所持品を持っていっても大丈夫だ。\n" " 他には、そうだな、空腹だったり喉が乾いた時に食べ物を所持していたら、美味しくいただくよ。CBMの充電が切れて、ちょうどいい燃料を所持している場合も同じだ。だから、渡すものは事前に確認した方がいいかもな？" -#: lang/json/talk_topic_from_json.py -msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." -msgstr "私は医者だよ！外傷の治療法は知っているさ。包帯や消毒薬を渡しておいてくれ。もし君がケガをしたら処置してあげよう。" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I can perform first aid. You give me some bandages or a bottle of " "antiseptic, I'll treat your wounds as best I can." msgstr "私は医者だよ！包帯や消毒薬を渡しておいてくれ。もし君がケガをしたらできる限り処置するよ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +msgstr "私は医者だよ！外傷の治療法は知っているさ。包帯や消毒薬を渡しておいてくれ。もし君がケガをしたら処置してあげよう。" + #: lang/json/talk_topic_from_json.py msgid "" " But remember, I like you, but I like me more - so I'm going to use those " @@ -158459,16 +158575,16 @@ msgstr "説明してくれてありがとう。他にも知りたいことがあ msgid "Thanks. I have some things for you to do." msgstr "ありがとう。他の話をしよう。" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "やあ、。" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "止まれ、両手を上にあげろ！ああ、驚かせてしまったな...もう法律なんて無いのに..." +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "やあ、。" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "ここで何をしているんだ？" @@ -158542,24 +158658,24 @@ msgstr "" "ああ、私のように街で立て籠もってる奴がいる。何度か取引をしたが...たまに知らない放浪者も来て、自分が置き去りにしたものより良い商品がないかとチェックしているな。" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "やめろ、おい やめろ..." +msgid "Anything to do before I go to sleep?" +msgstr "寝入る前にやっておくことでもあるのか？" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "眠らせてくれよ、 !" +msgid "Just few minutes more..." +msgstr "あと5分..." #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "まだ眠いんだ、すぐにでも寝直したいよ。" #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "あと5分..." +msgid "Just let me sleep, !" +msgstr "眠らせてくれよ、 !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "寝入る前にやっておくことでもあるのか？" +msgid "No, just no..." +msgstr "やめろ、おい やめろ..." #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -158674,93 +158790,93 @@ msgid "Let's go." msgstr "行こう。" #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." -msgstr "*は敵を攻撃しません。" +msgid "*will engage all enemies." +msgstr "*は全ての敵を攻撃します。" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." -msgstr "*は付近の敵を攻撃します。" +msgid "*will engage enemies close enough to attack without moving." +msgstr "*は移動せずに付近の敵を攻撃します。" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." -msgstr "*は弱い敵を攻撃します。" +msgid "*will engage distant enemies without moving." +msgstr "*は移動せずに遠距離武器で敵を攻撃します。" #: lang/json/talk_topic_from_json.py msgid "*will engage enemies you attack." msgstr "*はあなたが攻撃した敵を攻撃します。" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "*は移動せずに遠距離武器で敵を攻撃します。" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." -msgstr "*は移動せずに付近の敵を攻撃します。" +msgid "*will engage weak enemies." +msgstr "*は弱い敵を攻撃します。" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." -msgstr "*は全ての敵を攻撃します。" +msgid "*will engage nearby enemies." +msgstr "*は付近の敵を攻撃します。" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " -msgstr " 上書き: " +msgid "*will not engage enemies." +msgstr "*は敵を攻撃しません。" #: lang/json/talk_topic_from_json.py msgid " " msgstr " " #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid " OVERRIDE: " +msgstr " 上書き: " #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "にどのような指示を出しますか？" @@ -158869,14 +158985,13 @@ msgid "Attack anything you want." msgstr "自由に敵を攻撃してくれ。" #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." -msgstr "*は総電力の100%を防御または多目的CBMのために温存します。" +msgid "*will not reserve any power for defense or utility CBMs." +msgstr "*は電力を防御または多目的CBMのために温存しません。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." -msgstr "*は総電力の75%を防御または多目的CBMのために温存します。" +msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgstr "*は総電力の25%を防御または多目的CBMのために温存します。" #: lang/json/talk_topic_from_json.py #, no-python-format @@ -158885,12 +159000,13 @@ msgstr "*は総電力の50%を防御または多目的CBMのために温存し #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." -msgstr "*は総電力の25%を防御または多目的CBMのために温存します。" +msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgstr "*は総電力の75%を防御または多目的CBMのために温存します。" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." -msgstr "*は電力を防御または多目的CBMのために温存しません。" +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgstr "*は総電力の100%を防御または多目的CBMのために温存します。" #: lang/json/talk_topic_from_json.py msgid "" @@ -158929,13 +159045,13 @@ msgstr "攻撃用CBMをどんどん使用しろ。防御や多目的CBMのため #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." -msgstr "*はの総電力が90%を切ったら充電を開始します。" +msgid "*will recharge power CBMs until has 10% of total power." +msgstr "*はの総電力が10%を切ったら充電を開始します。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." -msgstr "*はの総電力が75%を切ったら充電を開始します。" +msgid "*will recharge power CBMs until has 25% of total power." +msgstr "*はの総電力が25%を切ったら充電を開始します。" #: lang/json/talk_topic_from_json.py #, no-python-format @@ -158944,13 +159060,13 @@ msgstr "*はの総電力が50%を切ったら充電を開始します #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." -msgstr "*はの総電力が25%を切ったら充電を開始します。" +msgid "*will recharge power CBMs until has 75% of total power." +msgstr "*はの総電力が75%を切ったら充電を開始します。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." -msgstr "*はの総電力が10%を切ったら充電を開始します。" +msgid "*will recharge power CBMs until has 90% of total power." +msgstr "*はの総電力が90%を切ったら充電を開始します。" #: lang/json/talk_topic_from_json.py msgid " When should consume supplies to recharge power CBMs?" @@ -158985,20 +159101,20 @@ msgid "" msgstr "物資が底を尽きそうだ。総電力の10%を切ったら充電を始めろ。" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." -msgstr "*は適度に照準を合わせてから射撃します。" - -#: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." -msgstr "*は完璧に照準を合わせてから射撃します。" +msgid "*will not bother to aim at all." +msgstr "*は照準を合わせずに射撃します。" #: lang/json/talk_topic_from_json.py msgid "*will take time and aim carefully." msgstr "*は慎重に照準を合わせてから射撃します。" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." -msgstr "*は照準を合わせずに射撃します。" +msgid "*will only shoot after taking a long time to aim." +msgstr "*は完璧に照準を合わせてから射撃します。" + +#: lang/json/talk_topic_from_json.py +msgid "*will aim when it's convenient." +msgstr "*は適度に照準を合わせてから射撃します。" #: lang/json/talk_topic_from_json.py msgid " How should aim?" @@ -159041,81 +159157,81 @@ msgid "OVERRIDE: " msgstr "上書き: " #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "この同行者と同じ規則に従ってくれ。" @@ -159284,14 +159400,14 @@ msgstr "...ザザザザ...了解、指定された場所へ向かう、どうぞ msgid "Sure thing, I'll make my way there." msgstr "分かった、指定された場所へ向かう。" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -159460,28 +159576,28 @@ msgid "I don't care." msgstr "どうでもいいね。" #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -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 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 "一つ頼みたい事があるんだ。聞いてくれるか？" +msgid "I don't have any jobs for you." +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 don't have any jobs for you." -msgstr "特に頼みたい事はないね。" +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 more jobs for you." -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?" +msgstr "一つ頼みたい事があるんだ。聞いてくれるか？" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -159492,10 +159608,6 @@ msgstr "ああ、分かったよ。" msgid "Never mind, I'm not interested." msgstr "いいや、興味ないね。" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "頼んでいる仕事は今のところ何もないよ。" - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "どの依頼の話だ？" @@ -159504,6 +159616,10 @@ msgstr "どの依頼の話だ？" msgid "What about it?" msgstr "何だ？" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "頼んでいる仕事は今のところ何もないよ。" + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "いいだろう、引き受けたよ！" @@ -159712,49 +159828,49 @@ msgstr "ふーん、分かった。" msgid "Thanks!" msgstr "ありがとう！" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "すごく喉が渇いたよ。何か飲みたいな。" +msgid "I have some reason for not telling you." +msgstr "ちょっと理由があって話せないんだ。" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "すごくお腹が空いたよ。何か食べたいな。" +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "今は何も思いつかないな。後でまた聞いてくれる？" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "すごく疲れたよ。休ませてほしいな。" #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "今は何も思いつかないな。後でまた聞いてくれる？" +msgid "I'm too hungry, give me something to eat." +msgstr "すごくお腹が空いたよ。何か食べたいな。" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." -msgstr "ちょっと理由があって話せないんだ。" +msgid "I'm too thirsty, give me something to drink." +msgstr "すごく喉が渇いたよ。何か飲みたいな。" + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "相棒、運転に集中してくれ！" #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "あぁ、分かった。" #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "抗生物質さえあれば..." +msgid "Why should I travel with you?" +msgstr "何故、君と一緒に旅をする必要があるんだ？" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "さっき言ったはずだけど...またいつか誘ってくれよ。" #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "何故、君と一緒に旅をする必要があるんだ？" +msgid "Not until I get some antibiotics..." +msgstr "抗生物質さえあれば..." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -159845,20 +159961,20 @@ msgid "On second thought, never mind." msgstr "ただの思い付きだ、気にしないでくれ。" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" +msgid "I can't train you properly while I'm operating a vehicle!" msgstr "車両を運転している間は、ちゃんと訓練できないよ！" #: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while I'm operating a vehicle!" -msgstr "車両を運転している間は、ちゃんと訓練できないよ！" +msgid "I have some reason for denying you training." +msgstr "ちょっと理由があって訓練はできないんだ。" #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "少し時間をくれないか。後で話をしよう。" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "ちょっと理由があって訓練はできないんだ。" +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "車両を運転している間は、ちゃんと訓練できないよ！" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -159896,14 +160012,14 @@ msgstr "自分について語りたくはないんだ。" msgid "I understand…" msgstr "そうか..." -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "今はもう何もないんだ。また今度にしてくれ。" - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "どうして持ち物をあげないといけないんだ？" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "今はもう何もないんだ。また今度にしてくれ。" + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "そうだな、分かったよ。" @@ -160046,16 +160162,16 @@ msgstr "これからもよろしく頼むよ！" msgid "You might be seeing more of me…" msgstr "これからもよろしく..." -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "また会ったな。*ザザザザ*" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "ワ...私は自由だ。*ザザザザ* 自由なんだ！*ブブブ* 久しぶりに人と会えたよ。" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "また会ったな。*ザザザザ*" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "やあ。少し話をしようか。" @@ -161108,28 +161224,28 @@ msgid "This is a low driving test response." msgstr "運転(スキルレベル低)のテスト用返答です。" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." -msgstr "やあ、友よ。会えて嬉しいよ。" +msgid "Greeting citizen, what brings you to the FoodLair?" +msgstr "ごきげんよう、どうやってフードパーソンの隠れ家にたどり着いたのかな？" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" -msgstr "戻ってきたな...説明してもらおうか！" +msgid "Still here? Take your time, it's rough out there." +msgstr "まだいたの？ごゆっくり。外は危ないからね。" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" -msgstr "これはどんな魔法なんだ？" +msgid "Greetings friend, it's nice to see you." +msgstr "やあ、友よ。会えて嬉しいよ。" #: lang/json/talk_topic_from_json.py msgid "Welcome home Foodkid!" msgstr "おかえりなさい、フードキッド！" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." -msgstr "まだいたの？ごゆっくり。外は危ないからね。" +msgid "What sorcery is this?" +msgstr "これはどんな魔法なんだ？" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" -msgstr "ごきげんよう、どうやってフードパーソンの隠れ家にたどり着いたのかな？" +msgid "So you're back… Explain yourself!" +msgstr "戻ってきたな...説明してもらおうか！" #: lang/json/talk_topic_from_json.py msgid "Greetings… Foodperson?" @@ -162536,10 +162652,6 @@ msgid "" msgstr "" "軍隊さ。軍人がやってきて、私の土地を徴発して前進基地を作り、私にはFEMAキャンプへ避難するよう求めたんだ。私は何も言い返さなかった。私は父の古い狩猟用ライフルを持っていたけど、相手は最新装備だからね。軍人の一人が、FEMAキャンプはアウシュビッツだなんて冗談を言っているのを聞いた。私は移送車両から逃げ出して、姉が住んでいる北部へ向かったんだ。理屈の上では、まだ北部へ進めていると思うんだけど、正直なところ、今は生き延びるのに必死なんだ。" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "無理だ。今は話せないよ。" - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -162548,9 +162660,10 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" -"事が起こった時、私は病院で働いていたんだ。まだ記憶がぼんやりしているな。死んだ患者が蘇るなんて突拍子もない報告が届いたりしたが、それ以外はいつも通り仕事をしていたよ。でも事態は終わりに向かって急転したんだ。中国から攻撃されたと思った。前から噂はあったからな。患者たちは正気を失っていて、全身が銃創や咬傷まみれだった。シフトの中頃で、私は...そう、壊れてしまったんだ。" +"事が起こった時、私は病院で働いていたんだ。まだ記憶がぼんやりしているな。死んだ患者が蘇るなんて突拍子もない報告が届いたりしたが、それ以外はいつも通り仕事をしていたよ。でも事態は終わりに向かって急転したんだ。中国から攻撃されたと思った。前から噂はあったからな。患者たちは正気を失っていて、全身が銃創や咬傷まみれだった。シフトの中ほどで、私は...そう、壊れた。今までに見たこともないような怪我ばかりだったし、それに...！これ以上は話せないよ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -162560,10 +162673,13 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" -"事が起こった時、私は病院で働いていたんだ。まだ記憶がぼんやりしているな。死んだ患者が蘇るなんて突拍子もない報告が届いたりしたが、それ以外はいつも通り仕事をしていたよ。でも事態は終わりに向かって急転したんだ。中国から攻撃されたと思った。前から噂はあったからな。患者たちは正気を失っていて、全身が銃創や咬傷まみれだった。シフトの中ほどで、私は...そう、壊れた。今までに見たこともないような怪我ばかりだったし、それに...！これ以上は話せないよ。" +"事が起こった時、私は病院で働いていたんだ。まだ記憶がぼんやりしているな。死んだ患者が蘇るなんて突拍子もない報告が届いたりしたが、それ以外はいつも通り仕事をしていたよ。でも事態は終わりに向かって急転したんだ。中国から攻撃されたと思った。前から噂はあったからな。患者たちは正気を失っていて、全身が銃創や咬傷まみれだった。シフトの中頃で、私は...そう、壊れてしまったんだ。" + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "無理だ。今は話せないよ。" #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." @@ -162919,17 +163035,17 @@ msgstr "詳しく教えてくれてありがとう。" #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"夫は私と共に避難していたんだけど、君に会う数日前に、、植物のような化け物に食われたよ。あんなに衝撃を受けたのは生まれて初めてだ。" +"妻は私と共に避難していたんだけど、君に会う数日前に、、植物のような化け物に食われたよ。あんなに衝撃を受けたのは生まれて初めてだ。" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"妻は私と共に避難していたんだけど、君に会う数日前に、、植物のような化け物に食われたよ。あんなに衝撃を受けたのは生まれて初めてだ。" +"夫は私と共に避難していたんだけど、君に会う数日前に、、植物のような化け物に食われたよ。あんなに衝撃を受けたのは生まれて初めてだ。" #: lang/json/talk_topic_from_json.py msgid "I'm sorry to hear it." @@ -162990,9 +163106,8 @@ msgid "I'm sorry you lost someone." msgstr "人を亡くしていたんだったな、すまない。" #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" -msgstr "言ったよな、話したくないって。どうして分かってくれないんだ？" +msgid "Just another tale of love and loss. Not one I like to tell." +msgstr "ありきたりな愛と喪失の物語だよ。その話はしたくないんだ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -163001,8 +163116,9 @@ msgid "" msgstr "さっきも言ったが、これは話だ。でも、語ったからと言って私が死ぬことはないだろう。" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." -msgstr "ありきたりな愛と喪失の物語だよ。その話はしたくないんだ。" +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" +msgstr "言ったよな、話したくないって。どうして分かってくれないんだ？" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -163025,39 +163141,39 @@ msgid "" "Oh, . This doesn't have anything to do with you, or with us." msgstr "おい、。この話は君や私たちの協力とは関係ないだろう。" -#: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." -msgstr "分かった、話すよ。大事な男がいた。そいつを失った。" - #: lang/json/talk_topic_from_json.py msgid "All right, fine. I had someone. I lost her." msgstr "分かった、話すよ。大事な女がいた。そいつを失った。" +#: lang/json/talk_topic_from_json.py +msgid "All right, fine. I had someone. I lost him." +msgstr "分かった、話すよ。大事な男がいた。そいつを失った。" + #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"爆弾が投下されて地表が地獄になった時、彼は家にいて、私は仕事中だった。家に帰ろうとしたけど、市街地は交戦区域になっていた。得体のしれない怪物が通りをのろのろ進み、車を破壊していた。軍隊はそいつらを止めようとしていたが、十字砲火で市民も被害を受けた。巻き添えの被害者が蘇り、敵の群れに加わった。夫を家に残していなかったら、私もすぐに逃げただろう。できる限りの事はしたが、手遅れだった。結局、、私は生き残った。" +"爆弾が投下されて地表が地獄になった時、彼女は家にいて、私は仕事中だった。家に帰ろうとしたけど、市街地は交戦区域になっていた。得体のしれない怪物が通りをのろのろ進み、車を破壊していた。軍隊はそいつらを止めようとしていたが、十字砲火で市民も被害を受けた。巻き添えの被害者が蘇り、敵の群れに加わった。妻を家に残していなかったら、私もすぐに逃げただろう。できる限りの事はしたが、手遅れだった。結局、、私は生き残った。" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"爆弾が投下されて地表が地獄になった時、彼女は家にいて、私は仕事中だった。家に帰ろうとしたけど、市街地は交戦区域になっていた。得体のしれない怪物が通りをのろのろ進み、車を破壊していた。軍隊はそいつらを止めようとしていたが、十字砲火で市民も被害を受けた。巻き添えの被害者が蘇り、敵の群れに加わった。妻を家に残していなかったら、私もすぐに逃げただろう。できる限りの事はしたが、手遅れだった。結局、、私は生き残った。" +"爆弾が投下されて地表が地獄になった時、彼は家にいて、私は仕事中だった。家に帰ろうとしたけど、市街地は交戦区域になっていた。得体のしれない怪物が通りをのろのろ進み、車を破壊していた。軍隊はそいつらを止めようとしていたが、十字砲火で市民も被害を受けた。巻き添えの被害者が蘇り、敵の群れに加わった。夫を家に残していなかったら、私もすぐに逃げただろう。できる限りの事はしたが、手遅れだった。結局、、私は生き残った。" #: lang/json/talk_topic_from_json.py msgid "You must have seen some shit." @@ -163109,28 +163225,28 @@ msgstr "家の中には入ったのか？" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" -"ああ。入る隙を見つけるのに数時間粘ったよ。どんな酷いことがあったか知りたいか？全部話そうか？夫は生きていた。地下室で、倒壊した床の下敷きになったままでね。酷い失血だった。私が見つけた時には既にもうろうとしていた。救出は無理だったから、彼に食べ物と水をあげて、ずっと一緒にいた。死ぬときまで手を握っていた。それから...うん、今の状況で、死者に対してやっておかないといけない処置をした。思い出になりそうな品をいくつか拾って、そこでの出来事は決して振り返らないと決めたんだ。" +"ああ。入る隙を見つけるのに数時間粘ったよ。どんな酷いことがあったか知りたいか？全部話そうか？妻は生きていた。地下室で、倒壊した床の下敷きになったままでね。酷い失血だった。私が見つけた時には既にもうろうとしていた。救出は無理だったから、彼女に食べ物と水をあげて、ずっと一緒にいた。死ぬときまで手を握っていた。それから...うん、今の状況で、死者に対してやっておかないといけない処置をした。思い出になりそうな品をいくつか拾って、そこでの出来事は決して振り返らないと決めたんだ。" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" -"ああ。入る隙を見つけるのに数時間粘ったよ。どんな酷いことがあったか知りたいか？全部話そうか？妻は生きていた。地下室で、倒壊した床の下敷きになったままでね。酷い失血だった。私が見つけた時には既にもうろうとしていた。救出は無理だったから、彼女に食べ物と水をあげて、ずっと一緒にいた。死ぬときまで手を握っていた。それから...うん、今の状況で、死者に対してやっておかないといけない処置をした。思い出になりそうな品をいくつか拾って、そこでの出来事は決して振り返らないと決めたんだ。" +"ああ。入る隙を見つけるのに数時間粘ったよ。どんな酷いことがあったか知りたいか？全部話そうか？夫は生きていた。地下室で、倒壊した床の下敷きになったままでね。酷い失血だった。私が見つけた時には既にもうろうとしていた。救出は無理だったから、彼に食べ物と水をあげて、ずっと一緒にいた。死ぬときまで手を握っていた。それから...うん、今の状況で、死者に対してやっておかないといけない処置をした。思い出になりそうな品をいくつか拾って、そこでの出来事は決して振り返らないと決めたんだ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -163800,6 +163916,17 @@ msgid "" msgstr "" "他のみんなと同じさ。神様から目を背けて、その代償を支払ってるところだよ。携挙が訪れたけど、私は取り残された。そして今、地上の地獄を彷徨っているんだ。もっと真面目に日曜学校へ行っておけばよかったな。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" +"私は郊外の古い家に一人で住んでいたんだ。妻は、こんなことが起こる1か月くらい前に死んだ...ガンだった。結果的にそれが最善だったのだとしても、彼女はあまりにも早く旅立ってしまった。そういうことがあって、私はしばらく引きこもっていたんだ。テレビのニュースでは中国の生体兵器や潜伏スパイ、ボストンや各地で起こる暴動の話題が流れていたけど、チャンネルを変えて、缶詰のスープを抱えながら縮こまっていた。" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -163812,17 +163939,6 @@ msgid "" msgstr "" "私は郊外の古い家に一人で住んでいたんだ。夫は、こんなことが起こる1か月くらい前に死んだ...ガンだった。結果的にそれが最善だったのだとしても、彼はあまりにも早く旅立ってしまった。そういうことがあって、私はしばらく引きこもっていたんだ。テレビのニュースでは中国の生体兵器や潜伏スパイ、ボストンや各地で起こる暴動の話題が流れていたけど、チャンネルを変えて、缶詰のスープを抱えながら縮こまっていた。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" -"私は郊外の古い家に一人で住んでいたんだ。妻は、こんなことが起こる1か月くらい前に死んだ...ガンだった。結果的にそれが最善だったのだとしても、彼女はあまりにも早く旅立ってしまった。そういうことがあって、私はしばらく引きこもっていたんだ。テレビのニュースでは中国の生体兵器や潜伏スパイ、ボストンや各地で起こる暴動の話題が流れていたけど、チャンネルを変えて、缶詰のスープを抱えながら縮こまっていた。" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -163901,18 +164017,18 @@ msgstr "バックは気の毒だったな。" msgid "I'm sorry about Buck. " msgstr "バックは気の毒だったな。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "さっき言った通り、話をしてほしいなら、ウイスキーを奢るんだな。ひと瓶すべてだ、頼んだよ。" - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " "interested in getting attached. You didn't pay me to be your friend." msgstr "よく聞け。もうこの話は終わりだ。私はお前のために働く、文句ないだろ？馴れ合いはごめんだ。友人になるために金を払ったわけじゃないだろう。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "さっき言った通り、話をしてほしいなら、ウイスキーを奢るんだな。ひと瓶すべてだ、頼んだよ。" + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -164231,16 +164347,6 @@ msgid "" msgstr "" "それを見た後、私はUターンして逃げ出したんだ。前にゾンビ映画で見たからね。家に帰って荷物をまとめて、事態がさらに悪化する前に街を出たよ。その時は自分がひどい臆病者だと思ったけど、他人を助けるために残っても、自分が死体の仲間入りするだけだからね。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm" -" just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." -msgstr "" -"まぁ、変な話だけど希望が消えてないからね。馬鹿げた話だけど、婚約者と彼の姉が教会から軽トラックで逃げ出すのを確かに見たんだ。だから、機会があればまた会えると信じて、それまで生き延びようと思ってる。これが大きな希望になっているんだ。" - #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancée " @@ -164251,10 +164357,24 @@ msgid "" msgstr "" "まぁ、変な話だけど希望が消えてないからね。馬鹿げた話だけど、婚約者と彼女の兄が教会から軽トラックで逃げ出すのを確かに見たんだ。だから、機会があればまた会えると信じて、それまで生き延びようと思ってる。これが大きな希望になっているんだ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm" +" just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" +"まぁ、変な話だけど希望が消えてないからね。馬鹿げた話だけど、婚約者と彼の姉が教会から軽トラックで逃げ出すのを確かに見たんだ。だから、機会があればまた会えると信じて、それまで生き延びようと思ってる。これが大きな希望になっているんだ。" + #: lang/json/talk_topic_from_json.py msgid "What were you saying before that?" msgstr "前の話をもう一度聞かせてもらえないかな？" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "ようこそ！見ない顔だが、何か用か？" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "こんにちは。" @@ -164275,10 +164395,6 @@ msgstr "ようこそ？" msgid "How's the weather?" msgstr "今日の天気はどうだろうな？" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "ようこそ！見ない顔だが、何か用か？" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "この場所は何？" @@ -164366,19 +164482,19 @@ msgstr "聞いてみただけだ。" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" -"まずはリーダーのヘレナに聞いてくれ。是非を決めるのは彼女だ。でも、可能性は低いと思うよ。もっと早くここへ来ていたら、今よりチャンスがあったのに。ほんの少し前に新人が入ったばかりなんだ。" +"まずはリーダーのヘレナに聞いてくれ。是非を決めるのは彼女だ。でも、可能性は低いと思うよ。もっと早くここへ来ていたら、今よりチャンスがあったのに。数日前に新人が入ったばかりなんだ。" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" -"まずはリーダーのヘレナに聞いてくれ。是非を決めるのは彼女だ。でも、可能性は低いと思うよ。もっと早くここへ来ていたら、今よりチャンスがあったのに。数日前に新人が入ったばかりなんだ。" +"まずはリーダーのヘレナに聞いてくれ。是非を決めるのは彼女だ。でも、可能性は低いと思うよ。もっと早くここへ来ていたら、今よりチャンスがあったのに。ほんの少し前に新人が入ったばかりなんだ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -164427,6 +164543,10 @@ msgid "" msgstr "" "聖画カードを通貨として使っているんだ。前に作られたもので、裏面にここのコミュニティの名前が書いてある。旧世界のドルよりはるかに便利だよ。ドル紙幣はここでは焚き付けにしかならないね。" +#: lang/json/talk_topic_from_json.py +msgid "Hey! What are you doing up here? You are not allowed to come here." +msgstr "おい！何をしているんだ？ここは立ち入り禁止だ。" + #: lang/json/talk_topic_from_json.py msgid "You're back." msgstr "また来たのか。" @@ -164435,10 +164555,6 @@ msgstr "また来たのか。" msgid "So…?" msgstr "何だ...？" -#: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." -msgstr "おい！何をしているんだ？ここは立ち入り禁止だ。" - #: lang/json/talk_topic_from_json.py msgid "How much food do you have in storage?" msgstr "貯蔵庫にはどれくらいの食料があるんだ？" @@ -164468,6 +164584,12 @@ msgstr "備蓄を貸してもらえないか？" msgid "Has anyone stolen from here?" msgstr "食料を盗む人間がいるのか？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." +msgstr "悪いけど、ここから分けてやることはできないよ。助けたいのは山々だけど、ここの住人の分しか確保できていないんだ。" + #: lang/json/talk_topic_from_json.py msgid "" "I am afraid you can't. Look, we are running low on our rations, and we " @@ -164476,12 +164598,6 @@ msgid "" msgstr "" "悪いけど無理だよ。見ての通り食料不足で、浪費はできない。単に「貸す」だけでもな。もう少し早くここへ来ていたら、助けられたかもしれないんだけどな。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." -msgstr "悪いけど、ここから分けてやることはできないよ。助けたいのは山々だけど、ここの住人の分しか確保できていないんだ。" - #: lang/json/talk_topic_from_json.py msgid "I have money." msgstr "金なら払う。" @@ -164520,18 +164636,18 @@ msgstr "申し訳ないが、君の家族を助けることはできない。こ msgid "I think I'll be going." msgstr "そろそろ行くよ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." -msgstr "さあね。かつては木箱20個分の生鮮食品があったんだけどな。もう数か月前の話さ。食料は不足している。" - #: lang/json/talk_topic_from_json.py msgid "" "That information is a bit private, but you can see for yourself. We have " "about 20 crates full of non-perishables." msgstr "それは教えられないが、自分で見てみたらいい。木箱が約20個、中には生鮮食品がたっぷり入ってる。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." +msgstr "さあね。かつては木箱20個分の生鮮食品があったんだけどな。もう数か月前の話さ。食料は不足している。" + #: lang/json/talk_topic_from_json.py msgid "Where did all this food come from?" msgstr "この食べ物はどこから調達したんだ？" @@ -164600,14 +164716,14 @@ msgstr "" msgid "That's good to hear." msgstr "それは良かった。" -#: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" -msgstr "私たちを守ってくれるのか？" - #: lang/json/talk_topic_from_json.py msgid "Pleased to meet you." msgstr "お目にかかれて嬉しいよ。" +#: lang/json/talk_topic_from_json.py +msgid "Are you here to protect us?" +msgstr "私たちを守ってくれるのか？" + #: lang/json/talk_topic_from_json.py msgid "I'm just trying to get by." msgstr "何とかやっているよ。" @@ -164661,14 +164777,14 @@ msgstr "ウサギの飼い方を100人の人に教えれば、教わった人が msgid "That's the most hopeful thing I've heard so far." msgstr "希望が湧いてくる話だ。" -#: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." -msgstr "君と同じく、私も賭けをしたのさ。" - #: lang/json/talk_topic_from_json.py msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "遺伝子の問題だろうか？それとも被曝？悪い水を飲んだから？ウサギっぽくなってしまったよ。" +#: lang/json/talk_topic_from_json.py +msgid "Same way you got yours, I bet." +msgstr "君と同じく、私も賭けをしたのさ。" + #: lang/json/talk_topic_from_json.py msgid "So it goes." msgstr "そういうものか。" @@ -164677,22 +164793,22 @@ msgstr "そういうものか。" msgid "You're disgusting." msgstr "気持ち悪いな。" -#: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." -msgstr "悪いけど、鏡を見てみた方が良いんじゃないか。" - #: lang/json/talk_topic_from_json.py msgid "Insulting people who could help you is unlikely to aid survival." msgstr "助けられる人から侮辱されては、助けようとも思えないな。" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." -msgstr "やあ、。" +msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgstr "悪いけど、鏡を見てみた方が良いんじゃないか。" #: lang/json/talk_topic_from_json.py msgid "I can't believe my eyes. Please get me outta here…" msgstr "幻覚じゃないよな。ここから出してくれ..." +#: lang/json/talk_topic_from_json.py +msgid "Hey, ." +msgstr "やあ、。" + #: lang/json/talk_topic_from_json.py msgid "I've come to take you home, lets go." msgstr "あなたを家に連れ帰りに来たんだ、行こう。" @@ -164716,18 +164832,18 @@ msgid "Sounds good, Barry." msgstr "それもそうだな、バリー。" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." -msgstr "バッジを着けているな。ここの土地には入らず、そのまま去った方がいい。" +msgid "Hello Ma'am, what brings you here?" +msgstr "やあお客さん、何しに来たんだ？" #: lang/json/talk_topic_from_json.py msgid "Hello Sir, what brings you here?" msgstr "やあお客さん、何しに来たんだ？" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" -msgstr "やあお客さん、何しに来たんだ？" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." +msgstr "バッジを着けているな。ここの土地には入らず、そのまま去った方がいい。" #: lang/json/talk_topic_from_json.py msgid "Yeah, I'm a Marshal, what are you going to do about it?" @@ -164802,16 +164918,16 @@ msgstr "鍛冶場は稼働しているのか？" msgid "Where can I find Chris?" msgstr "クリスにはどこで会える？" +#: lang/json/talk_topic_from_json.py +msgid "Hi, what's up?" +msgstr "やあ、調子はどう？" + #: lang/json/talk_topic_from_json.py msgid "" "I see that badge. You need to leave our land, my relatives have no fondness" " for Marshals." msgstr "バッジを着けているな。この土地から出て行った方がいい。うちの家族は執行官が嫌いなんだ。" -#: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" -msgstr "やあ、調子はどう？" - #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " @@ -164908,16 +165024,16 @@ msgid "" msgstr "さっきルークから聞いたんだけど、世界の崩壊について興味深い考えを持っているようだな。" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" -msgstr "あなたが着けているのは、合衆国執行官のバッジ？" +msgid "Hi, what brings you here?" +msgstr "やあ、何しに来たんだ？" #: lang/json/talk_topic_from_json.py msgid "Hello, what brings you here?" msgstr "ごきげんよう、何しに来たんだ？" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" -msgstr "やあ、何しに来たんだ？" +msgid "Is that a U.S. Marshal's badge you're wearing?" +msgstr "あなたが着けているのは、合衆国執行官のバッジ？" #: lang/json/talk_topic_from_json.py msgid "Yes, I'm a marshal." @@ -165223,14 +165339,14 @@ msgstr "これで全部だ。他のことを聞いてもいいか？" msgid "That's all for now. I'd best get going." msgstr "これで全部だ。そろそろ行くよ。" -#: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." -msgstr "執行官、うちの土地から出て行け。" - #: lang/json/talk_topic_from_json.py msgid "Hello, We don't see many people these days." msgstr "ごきげんよう、最近はあまり人を見かけないな。" +#: lang/json/talk_topic_from_json.py +msgid "Leave our property, Marshal." +msgstr "執行官、うちの土地から出て行け。" + #: lang/json/talk_topic_from_json.py msgid "Hi, it looks like you are doing well here." msgstr "やあ、ここで上手くやっているようだな。" @@ -165432,8 +165548,10 @@ msgid "Tell me about your dad." msgstr "あなたの父について聞きたい。" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "執行官、手伝いに来てくれたんだな。" +msgid "" +"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 "" @@ -165442,10 +165560,8 @@ msgid "" 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 " -"you'll get out while you can." -msgstr "執行官、どうやってここまで来たのか知らんが、身動きが取れるうちにここを脱出した方がいいぞ。" +msgid "Marshal, I hope you're here to assist us." +msgstr "執行官、手伝いに来てくれたんだな。" #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -165508,16 +165624,16 @@ 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." -msgstr "執行官、こんなところで会うとは驚いた。" +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "あなたにここでの指揮権は無い... 他に行く場所があるのでは？" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "あなたにここでの指揮権は無い... 他に行く場所があるのでは？" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "あなたにここでの指揮権は無い... 他に行く場所があるのでは？" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "執行官、こんなところで会うとは驚いた。" #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -165554,22 +165670,6 @@ msgid "" msgstr "" "大尉が使いを送ってくれるのを待っていた。これが目当ての品だ。このままでは周波数しか分からないし、通信内容のほとんどはここの設備を修理するか交換しないと解読できない。万が一施設を放棄しなければならなくなった時、連邦の機密を守り完全な通信網を保つための手続きとして、暗号化装置は破壊されるんだ。ほんの少しでもメッセージ内容を取り出せれば良いのだが。" -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "やあ、執行官。" - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "執行官、悪いですが今はお話できません。" - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "私はここの担当者ではないよ、執行官。" - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "ご質問は上の者にどうぞ、執行官。" - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "よう... ここで何してるんだ。" @@ -165582,6 +165682,14 @@ msgstr "こっちをジロジロ見るな。ここには何も無いよ。" msgid "If you need something you'll need to talk to someone else." msgstr "何が欲しいのか知らんが他を当たりな。" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "お嬢さん。" + +#: lang/json/talk_topic_from_json.py +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 "Sir." msgstr "よお旦那。" @@ -165591,12 +165699,20 @@ msgid "Dude, if you can hold your own you should look into enlisting." msgstr "お前、自分の能力に自信があるなら、新人採用の担当を探してみたらどうだ。" #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "お嬢さん。" +msgid "Hello, marshal." +msgstr "やあ、執行官。" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" -msgstr "お嬢さん、俺と一緒に居たほうが安全だとは思わないか？" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "執行官、悪いですが今はお話できません。" + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "私はここの担当者ではないよ、執行官。" + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." +msgstr "ご質問は上の者にどうぞ、執行官。" #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -165653,15 +165769,14 @@ msgid "I've no use for weaklings. Run. Now." msgstr "弱者は不要だ。さっさと逃げろ。" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "他の人も説得して、愉快な仲間に加えられたか？" +msgid "Please, help me. I need food." +msgstr "頼む、助けてくれ。食料が必要なんだ。" #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" -msgstr "こんな事を言ってしまうのは申し訳ないが...あなたが十分な食料を持っているとは思えないな？" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" +msgstr "頼む、助けてくれ。食料が必要なんだ。執行官なんだろう？手伝ってもらえないか？" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -165669,13 +165784,14 @@ msgstr "いつもありがとう。本当に感謝しているよ。" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" -msgstr "頼む、助けてくれ。食料が必要なんだ。執行官なんだろう？手伝ってもらえないか？" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" +msgstr "こんな事を言ってしまうのは申し訳ないが...あなたが十分な食料を持っているとは思えないな？" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "頼む、助けてくれ。食料が必要なんだ。" +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "他の人も説得して、愉快な仲間に加えられたか？" #: lang/json/talk_topic_from_json.py msgid "" @@ -165694,16 +165810,16 @@ msgstr "近寄るな。" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." -msgstr "中には入れてもらえないよ。もう満員だそうだ。きちんと清潔にして騒ぎを起こさないことを条件に、ここで寝泊まりを許されているんだ。" +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +msgstr "" +"中に入れてもらえないんだ。もう満員だって言われてさ。ここを汚さず大騒ぎしないなら、寝泊りしていいとは言われたんだ。でも、ものすごくお腹が空いてるんだよ。" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." -msgstr "" -"中に入れてもらえないんだ。もう満員だって言われてさ。ここを汚さず大騒ぎしないなら、寝泊りしていいとは言われたんだ。でも、ものすごくお腹が空いてるんだよ。" +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." +msgstr "中には入れてもらえないよ。もう満員だそうだ。きちんと清潔にして騒ぎを起こさないことを条件に、ここで寝泊まりを許されているんだ。" #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -165805,16 +165921,16 @@ msgid "" msgstr "" "親切な申し出はありがたいが、また危険な目に遭うよりは、ここでチャンスを待ち続けていたいんだ。の光景が忘れられない、あんなのはもうたくさんだ。" +#: lang/json/talk_topic_from_json.py +msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgstr "悪いけど、腹が減っていて正常な判断ができそうにないよ。" + #: lang/json/talk_topic_from_json.py msgid "" "That's quite the offer, but I don't think I'd survive the trip. I don't " "think you realize how useless I am in this world." msgstr "ありがたい申し出だけど、私はきっと旅を続けられない。私がどれだけ役立たずなのか分かっていないようだな。" -#: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." -msgstr "悪いけど、腹が減っていて正常な判断ができそうにないよ。" - #: lang/json/talk_topic_from_json.py msgid "I can keep you safe. I'll take you there myself." msgstr "安全は保障する。目的地までちゃんと連れて行くよ。" @@ -165858,17 +165974,17 @@ 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?" -msgstr "段ボールの事は話したっけ？君、段ボール持ってる？" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "調子はどう？私の段ボールコレクションはかなり良い感じだよ。" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "やった！リストが全部埋まった！" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "調子はどう？私の段ボールコレクションはかなり良い感じだよ。" +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…" @@ -165898,16 +166014,16 @@ msgstr "その恐竜の着ぐるみは何かの冗談か？" msgid "Do you need something to eat?" msgstr "何か食べる物が必要か？" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "それはありがたい。ぜひいただくよ。いいね、すごく良い。" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "ああ、すごくお腹が空いていたけど、奴らは大抵の食べ物に毒を入れているからな。君はそんなことしないって信じているよ。" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "それはありがたい。ぜひいただくよ。いいね、すごく良い。" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "他のことを聞いてもいいか？" @@ -165999,13 +166115,6 @@ msgid "" "have shields up, to protect ourselves." msgstr "君は私の格好について尋ねてきたが、私は君の格好について尋ねたりしない。私たちは時に、自分自身を守るために隠れなければならないんだ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" -msgstr "" -"そうだな...欲しいものは全部揃ったが、他の人は去ってしまったし、ここに聖域を作ることは禁止されたんだ。私が安らげる場所を探すのを手伝ってくれないか？" - #: lang/json/talk_topic_from_json.py msgid "" "That's it! I'm just gonna need a little time to get it all set up. Thanks." @@ -166013,6 +166122,13 @@ msgid "" "keep me going." msgstr "いい質問だ！組み立て終わるまで少し時間がかかる。ありがとう。君は何度も私を助けてくれた。お陰で、ここで生き延びられそうだ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" +msgstr "" +"そうだな...欲しいものは全部揃ったが、他の人は去ってしまったし、ここに聖域を作ることは禁止されたんだ。私が安らげる場所を探すのを手伝ってくれないか？" + #: lang/json/talk_topic_from_json.py msgid "" "Why don't you leave this place? Come with me, I could use some help out " @@ -166030,16 +166146,20 @@ msgid "" msgstr "嫌だ！せっかく準備が整ったのに。ここを出て行かないよ、まだその時じゃない。全部揃ったんだ！" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "失せろ、クソったれ。" +msgid "Don't bother with these assholes." +msgstr "そこのろくでなし共は放っておけ。" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" -msgstr "よぉ。ここのバス停からあんたのテント街に引っ越したがる奴は見つかったか？" +msgid "Hey there, not-asshole. Good to see you again." +msgstr "やぁ、クソったれじゃない奴。また会えて嬉しいよ。" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." -msgstr "やあ、また会えて嬉しいよ。" +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" +msgstr "" +"おい、前はキレてしまって申し訳ない。あんたはクソったれかも知れんが、誤解があったのかもしれない。血糖値がどん底なんだ。キレやすくなってる。分かったか？" #: lang/json/talk_topic_from_json.py msgid "" @@ -166048,20 +166168,16 @@ msgid "" msgstr "気をつけろ、また腹が減ってきた。自分の行動に責任が持てそうにない状況だ。" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" -msgstr "" -"おい、前はキレてしまって申し訳ない。あんたはクソったれかも知れんが、誤解があったのかもしれない。血糖値がどん底なんだ。キレやすくなってる。分かったか？" +msgid "Hey there. Good to see you again." +msgstr "やあ、また会えて嬉しいよ。" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." -msgstr "やぁ、クソったれじゃない奴。また会えて嬉しいよ。" +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgstr "よぉ。ここのバス停からあんたのテント街に引っ越したがる奴は見つかったか？" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "そこのろくでなし共は放っておけ。" +msgid "Fuck off, dickwaddle." +msgstr "失せろ、クソったれ。" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -166361,6 +166477,12 @@ msgid "" "that?" msgstr "危険だ。そんなリスクを冒しても、何の得もないだろう？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." +msgstr "さあね、科学的関心が満たされることか？別に何も持ってこなくても、私は困らない。見ての通り、ここらには興味深いものがたくさんあるからな。" + #: lang/json/talk_topic_from_json.py msgid "" "If you get me a sample, I'll join your crazy camp expedition. Hell, if you " @@ -166370,12 +166492,6 @@ msgid "" msgstr "" "もし組織片を持ってきたら、あんたの愉快なキャンプ遠征隊に参加するよ。それと、ゾンビのことを調べる研究室の建設も手伝おう。多分大丈夫だとは思うが、危険だと思ったら、胞子を形成しない個体を選んだ方がいい。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." -msgstr "さあね、科学的関心が満たされることか？別に何も持ってこなくても、私は困らない。見ての通り、ここらには興味深いものがたくさんあるからな。" - #: lang/json/talk_topic_from_json.py msgid "It just so happens I have a chunk of fungal matter on me right now." msgstr "ちょうど真菌の組織片を持っていたんだ。" @@ -166424,14 +166540,14 @@ msgstr "良いね。行こう。イカレたキノコをもっと観察したい msgid "I'll see what I can do." msgstr "できる限りのことをやってみるよ。" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "友よ、食べ物をまた持ってきてくれて助かるよ。" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "よぉ、適者生存って言葉は好きか？" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "友よ、食べ物をまた持ってきてくれて助かるよ。" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "どうしてそんな事を聞くんだ？" @@ -166448,18 +166564,18 @@ msgstr "ごきげんよう、調子はどう？" msgid "Nice to see you. I gotta be going though." msgstr "ごきげんよう。悪いけどもう行くよ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "ああ、いつも通りさ。死にたくなるまでここに座って、デイブとトランプで遊ぶんだ。" - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " "Help a poor sickly soul out?" msgstr "私は自分が適者じゃないと分かっているから、餓死するまでここでじっとしてるんだ。貧しく病弱な人間を助けてもらえないか？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "ああ、いつも通りさ。死にたくなるまでここに座って、デイブとトランプで遊ぶんだ。" + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "助けになればいいんだけど...何か食べる物が必要か？" @@ -166480,15 +166596,15 @@ msgstr "体調が悪いのに、どうやってここまで来たんだ？" msgid "Why are you camped out here if they won't let you in?" msgstr "中に入れてもらえないにしても、どうしてここで寝泊りしているんだ？" -#: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." -msgstr "それは素晴らしい提案だ。本当に親切な人だな。" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "おいおい！本当に親切な人だな？気持ちだけで十分だよ。" +#: lang/json/talk_topic_from_json.py +msgid "That's awful kind of you, you really are a wonderful person." +msgstr "それは素晴らしい提案だ。本当に親切な人だな。" + #: lang/json/talk_topic_from_json.py msgid "" "It's good to know there are still people like you in the world, it really " @@ -166772,6 +166888,10 @@ msgstr "そうだな。行こう。" msgid "What's your take on the situation here?" msgstr "ここでの境遇はどうだ？" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "あっ、えぇと...こんにちは。はじめまして。私はアリーシャ。" + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "ああ、また会ったね。" @@ -166784,10 +166904,6 @@ msgstr "わぁ、よく無事に戻ってきたね！" msgid "Aw hey, look who's back." msgstr "やあ、また会えたね。" -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "あっ、えぇと...こんにちは。はじめまして。私はアリーシャ。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "ごきげんよう、お嬢ちゃん。調子はどう？" @@ -166805,16 +166921,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "やあアリーシャ。話は後にしよう。" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "お嬢ちゃんは止めてくれる？もう16歳なんだから。" +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "お嬢ちゃんは止めてくれる？もう14歳なんだから。" #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "お嬢ちゃんは止めてくれる？もう15歳なんだから。" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "お嬢ちゃんは止めてくれる？もう14歳なんだから。" +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "お嬢ちゃんは止めてくれる？もう16歳なんだから。" #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -166824,6 +166940,15 @@ msgstr "ごめん、悪気はなかったんだ。調子はどう？" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "ごめん、悪気はなかったんだ。そろそろ行くよ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" +"調子なんて分からないよ。ここで何をしてるのかもよく分からない。下の階の避難場所に移動できるまで待てって言われたけど、もう何日もここにいるし、どれだけ待てばいいのかも言われてない。全部ばかみたい、誰も何も教えてくれない。" + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -166834,15 +166959,6 @@ msgid "" msgstr "" "ここでバカみたいにぼんやり立ってるだけだよ。下の階の避難所に行けるのをもう1か月以上も待ってる。信じられない。こんな所で何してるんだろう。全部の本を読んじゃったし、外にはゾンビがいるから出られない。夜になると奴らの声が聞こえるんだ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" -"調子なんて分からないよ。ここで何をしてるのかもよく分からない。下の階の避難場所に移動できるまで待てって言われたけど、もう何日もここにいるし、どれだけ待てばいいのかも言われてない。全部ばかみたい、誰も何も教えてくれない。" - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -166883,8 +166999,9 @@ msgid "" msgstr "[感覚10] どうしたんだ？発音も話し方もどこか変じゃないか？" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" -msgstr "また会ったね、お洒落さん。" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgstr "ああ、何と麗しいレディだろう、お会いできて光栄です。皆は私をアロンソと呼んでいるよ。" #: lang/json/talk_topic_from_json.py msgid "" @@ -166893,9 +167010,8 @@ msgid "" msgstr "何てことだ、私のように強くハンサムな人間が他にもいたとは。皆は私をアロンソと呼んでいるよ。" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." -msgstr "ああ、何と麗しいレディだろう、お会いできて光栄です。皆は私をアロンソと呼んでいるよ。" +msgid "Hello again, gorgeous" +msgstr "また会ったね、お洒落さん。" #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Alonso." @@ -166922,11 +167038,6 @@ msgstr "こちらこそ。本当に嬉しいよ。センターでの生活はと msgid "Actually I'm just heading out." msgstr "そろそろ行くよ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." -msgstr "うん、あなたが来てからは調子が良くなってきた。また会えて嬉しいよ。" - #: lang/json/talk_topic_from_json.py msgid "" "Now that you are here, everything. Is there anything Alonso can… *do for " @@ -166934,16 +167045,21 @@ msgid "" msgstr "今、あなたがここにいる、それが全てだ。*君のためになること*...それ以外アロンソにできることはないよ？" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" -msgstr "私と君とは顔見知りだ。今更そんな話か？" +msgid "" +"Well, it's a lot better now that you're here. Nice to see a familiar face." +msgstr "うん、あなたが来てからは調子が良くなってきた。また会えて嬉しいよ。" #: lang/json/talk_topic_from_json.py msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "アロンソは、君のような素敵な人の前では体が言う事を聞かないんだ。" +#: lang/json/talk_topic_from_json.py +msgid "You know me, I gotta be me, right?" +msgstr "私と君とは顔見知りだ。今更そんな話か？" + #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -166951,7 +167067,7 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -166981,6 +167097,13 @@ msgstr "よし。お望みとあらば、ブルックリンから来た男にな msgid "Thanks. I'd better get going." msgstr "ありがとう。もう行くよ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" +"アロンソは過去について話さない。未来の事だけを話す。これから先も暗い日々が待ち受けているだろうが、一緒に居れば少しでも光明が見えてくると思わないか？" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -166989,10 +167112,9 @@ msgstr "そんな話は忘れた方がいいだろう？過去について考え #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" -msgstr "" -"アロンソは過去について話さない。未来の事だけを話す。これから先も暗い日々が待ち受けているだろうが、一緒に居れば少しでも光明が見えてくると思わないか？" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." +msgstr "センターの中では、アロンソは少し孤独だ。君のような勇敢で強い旅人に会えると、アロンソの心も晴れる。" #: lang/json/talk_topic_from_json.py msgid "" @@ -167001,10 +167123,8 @@ msgid "" msgstr "これから良くなっていくだろう。ここには友人もいないが、君のような旅人に会うことで私の心も晴れるんだ。" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." -msgstr "センターの中では、アロンソは少し孤独だ。君のような勇敢で強い旅人に会えると、アロンソの心も晴れる。" +msgid "Ah, another new face. Hello. I am Boris." +msgstr "あぁ、また見ない顔だ。こんにちは。私の名はボリスだ。" #: lang/json/talk_topic_from_json.py msgid "Well, well. I'm glad you are back." @@ -167018,10 +167138,6 @@ msgstr "また会ったな、友よ。" msgid "It is good to see you again." msgstr "また会えて良かったよ。" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "あぁ、また見ない顔だ。こんにちは。私の名はボリスだ。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "はじめまして、ボリス。" @@ -167092,13 +167208,6 @@ msgstr "悪いけど、前の話をもう一度聞かせてもらえる？" msgid "I'm sorry. I'd better get going." msgstr "辛いことを尋ねて悪かった。もう行くよ。" -#: lang/json/talk_topic_from_json.py -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 "ああ、その話なら、センターの裏手の区画が片付いたら私も仕事を始められるらしい。計画は立てておくから、準備ができたらまた話そう。" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -167110,6 +167219,13 @@ msgid "" msgstr "" "屋内ではハンマーやのこぎりを使った作業はあまりない。屋外での作業は危険だ。家具を動かせるほど広いスペースを確保できれば、目隠し用の壁を設置できそうだな。貯蔵庫にちょっとした店を開こうとしたんだけど、荷物の積み下ろしをする場所が欲しいって隊商が言うものだから、そちらを優先したんだ。隊商は食料を運んでくるのだから優遇すべきだし、口出しはできないよ。" +#: lang/json/talk_topic_from_json.py +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 "ああ、その話なら、センターの裏手の区画が片付いたら私も仕事を始められるらしい。計画は立てておくから、準備ができたらまた話そう。" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -167139,6 +167255,10 @@ msgstr "探してほしいと言っていたサワー種スターターについ msgid "Got any more bread I can trade flour for?" msgstr "穀粉とパンを交換してもらえないか？" +#: lang/json/talk_topic_from_json.py +msgid "Hi there. I'm Dana, nice to see a new face." +msgstr "こんにちは、私はダナ。よろしくね、新入りさん。" + #: lang/json/talk_topic_from_json.py msgid "Hello, nice to see you again." msgstr "こんにちは、また会えて嬉しいよ。" @@ -167147,10 +167267,6 @@ msgstr "こんにちは、また会えて嬉しいよ。" msgid "It's good to see you're still around." msgstr "君がまだ生きていて安心したよ。" -#: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." -msgstr "こんにちは、私はダナ。よろしくね、新入りさん。" - #: lang/json/talk_topic_from_json.py msgid "Dana, hey? Nice to meet you." msgstr "やあ、ダナ。会えて嬉しいよ。" @@ -167201,9 +167317,12 @@ msgstr "それは辛かっただろうな。" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." -msgstr "悪いけど、まだ出来上がっていないんだ。ちゃんと取っておくけど、腐りやすいものだから１日か2日経ったらまた来てくれ。" +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." +msgstr "" +"たまにね。到着してすぐサワー種スターターを手に入れて、まずまずのパンを焼いているよ。昨日もパンを焼いてみたんだ。8袋分の穀粉を持ってきてくれたら、焼き立てのパンと交換してあげよう。" #: lang/json/talk_topic_from_json.py msgid "" @@ -167213,12 +167332,9 @@ msgstr "8袋分の穀粉を持ってきてくれたら、パンと交換する #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." -msgstr "" -"たまにね。到着してすぐサワー種スターターを手に入れて、まずまずのパンを焼いているよ。昨日もパンを焼いてみたんだ。8袋分の穀粉を持ってきてくれたら、焼き立てのパンと交換してあげよう。" +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." +msgstr "悪いけど、まだ出来上がっていないんだ。ちゃんと取っておくけど、腐りやすいものだから１日か2日経ったらまた来てくれ。" #: lang/json/talk_topic_from_json.py msgid "That sounds like a great deal, here's some flour for you." @@ -167240,6 +167356,12 @@ msgid "" msgstr "" "そう言ってくれると気が休まるよ。私は先に進めるよう精一杯頑張っている...辛いことだけど、世界規模で起きてることを考えれば、まだマシか。パブロと私は今も一緒に過ごせる。本当にありがたいことさ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "ありがとう。うちの地元で有名な、未成熟のサワードウで作ったパンだ。正直、まあまあって感じの味だな。ここの人たちは気に入ってるみたい。" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -167262,12 +167384,6 @@ msgid "" "now." msgstr "世界で一番素晴らしいパンだ。あなたも私と同じくらい上機嫌になれることを願っているよ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "ありがとう。うちの地元で有名な、未成熟のサワードウで作ったパンだ。正直、まあまあって感じの味だな。ここの人たちは気に入ってるみたい。" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -167299,10 +167415,6 @@ msgid "" msgstr "" "空気が張り詰めてるよ。望んで集まったわけじゃないから、実際に生活してみると気に入らない事もある。ジェニーとファティマは好きだし3人で仲良く過ごせることは嬉しいけど、狭いスペースに赤の他人が詰め込まれてるストレスが消えるわけじゃない。見てな、そのうち殺し合いでも起きるんじゃないかな。" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "農園から戻ってきた人から仕事について聞いたか？" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -167311,6 +167423,10 @@ msgid "" msgstr "" "ああ。ここで何人か友達はできたけど、下の階の誰かが死んで代わりに私が入れることを願ってばかりじゃ将来の展望もないし、ずっと居座ることもないね。労働者を募集してるなら、手を上げてみようかな。" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "農園から戻ってきた人から仕事について聞いたか？" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -167349,16 +167465,16 @@ msgid "" msgstr "" "パブロは私より先に決断したんだ。実は、子供を作ろうと思っててね？こんな状況で常識外れかもしれないけど、一度決めたことは変えないよ。もしあなたの作る拠点に医者や医療施設があるなら、私が実際にまた妊娠できた時は、そちらに移住を申し込もうかと思っているんだ。" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "友よ、また会えて嬉しいぞ。" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "おや、新人に会えて嬉しいぞ！友よ、センターへようこそ。私はドラコだ。" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "友よ、また会えて嬉しいぞ。" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "はじめまして、ドラコ。" @@ -167599,15 +167715,15 @@ msgstr "何か手伝おうか？" msgid "Well then, I'll leave you here where it's safe." msgstr "それなら、安全なところに居続ければいい。" +#: lang/json/talk_topic_from_json.py +msgid "Man, just imagine what I could do with a new guitar." +msgstr "なぁ、新しいギターがあればどんな楽しいことが起こるか想像してみなよ。" + #: lang/json/talk_topic_from_json.py msgid "" "My savior! My patron of the arts! You're always welcome here, friend." msgstr "我が救世主よ！我が芸術のパトロンよ！いつでも歓迎するよ。" -#: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." -msgstr "なぁ、新しいギターがあればどんな楽しいことが起こるか想像してみなよ。" - #: lang/json/talk_topic_from_json.py msgid "Let's talk about getting you that guitar." msgstr "ギターが欲しいって事について話そう。" @@ -167705,18 +167821,18 @@ msgstr "手伝おう。" msgid "Find somebody else, dude." msgstr "他の人を当たることにするよ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." -msgstr "ああ、でも心配しないで。今のところは大丈夫だ。もう少し資金を集めておくから、後でまた来てくれ。" - #: lang/json/talk_topic_from_json.py msgid "" "Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " "up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "素晴らしい！今日はツイてるな。さてと。取り引きできるのは...ジョイント5個かそれと同等のブツを渡してくれたら、マーチをいくらか支払おう。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." +msgstr "ああ、でも心配しないで。今のところは大丈夫だ。もう少し資金を集めておくから、後でまた来てくれ。" + #: lang/json/talk_topic_from_json.py msgid "You have yourself a deal. Here's the marijuana." msgstr "よし乗った。マリファナを渡すよ。" @@ -167765,6 +167881,12 @@ msgstr "どうやってこのセンターにたどり着いたんだ？" msgid "Is there anything I can do to help you out?" msgstr "何か手伝えることはあるか？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "おっ、よぉ、新顔だな。私はファティマだ。ここには立ち寄っただけだよな？新たな出会いは嬉しいけど、ベッドはもうないよ。" + #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "また会ったな。" @@ -167777,12 +167899,6 @@ msgstr "無事なようで安心したよ。" msgid "Oh, hi." msgstr "おや、どうも。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "おっ、よぉ、新顔だな。私はファティマだ。ここには立ち寄っただけだよな？新たな出会いは嬉しいけど、ベッドはもうないよ。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "こちらこそよろしく、ファティマ。私はただの通りすがりだ。" @@ -167849,6 +167965,10 @@ msgid "" msgstr "" "緊張してる。自分の技能を活かせる仕事が見つかるか、静かに祈る場所があれば、もう少し穏やかに過ごせるんだけどね。公共のスペースで祈るのはちょっと照れ臭いんだ。ジェニーが私の技能を役立てられるプロジェクトがあるって話してくれたけど、外に出るのはどうしても緊張するな。" +#: lang/json/talk_topic_from_json.py +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgstr "やあ、やあ。私はギャリー、ギャリー・ビルヌーブだ。" + #: lang/json/talk_topic_from_json.py msgid "Well, hello." msgstr "ああ、こんにちは。" @@ -167857,10 +167977,6 @@ msgstr "ああ、こんにちは。" msgid "Good to see you again." msgstr "また会えて嬉しいよ。" -#: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." -msgstr "やあ、やあ。私はギャリー、ギャリー・ビルヌーブだ。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Garry." msgstr "はじめまして、ギャリー。" @@ -167926,6 +168042,12 @@ msgid "" msgstr "" "緊張した空気だが、よく分からない。スタンとボリスと私の3人で固まっているからね。他の人達とも交流した方が良いとは思うんだけどね。センターでの滞在は一時的なものだと思っていたが、もっと長く過ごすことになる気がしてきているんだ。まぁ、長生きできればの話だけど。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." +msgstr "おや、こんにちは。初めて会う人だな。私はグニート、皆からはガニーと呼ばれているよ。" + #: lang/json/talk_topic_from_json.py msgid "Hi." msgstr "やあ。" @@ -167934,12 +168056,6 @@ msgstr "やあ。" msgid "Hey again." msgstr "やあ、また会ったな。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." -msgstr "おや、こんにちは。初めて会う人だな。私はグニート、皆からはガニーと呼ばれているよ。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "はじめまして、ガニー。" @@ -167988,15 +168104,15 @@ msgid "" msgstr "" "ここに閉じ込められてる、そうとしか言いようがないよ。ターバンを巻いて内輪で仲良くしてる私たちには、誰も話しかけようとしない。複数で固まってるから、大丈夫だと思ってるんだろうね。パパも同じ考え。ママは決めかねてる感じかな。" -#: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." -msgstr "また会えて嬉しいよ。" - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "こんにちは。あなたと喋るのは初めてかな。私はジェニー、ジェニー・フォセッテだ。" +#: lang/json/talk_topic_from_json.py +msgid "Nice to see you again." +msgstr "また会えて嬉しいよ。" + #: lang/json/talk_topic_from_json.py msgid "Nice meeting you. What are you doing on that computer?" msgstr "初めまして。ノートPCで何をしているんだ？" @@ -168155,6 +168271,16 @@ msgid "" msgstr "" "状況は悪くなってる。何か月もここにいるけど、何も変わらないし、改善していない。外に出られないし、十分な食料もないし、お互いに話もしない。どれだけこの状態で過ごせるのか、いつ誰かが耐えきれなくなるのか、私には分からないよ。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" +"うーん、仲良くはなってきたかな。共同体ができ始めた気がする。ファティマとはよく仕事をするし、ダナ、ドラコ、アリーシャとは一緒に過ごすことが多いね。ボリシェンコ一家やシン一家の人たち、ヴァネッサ、ホェン、ライサーは良く知らないけど、話くらいはするかな。何か知りたいことはある？" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -168168,16 +168294,6 @@ msgid "" msgstr "" "良くも悪くも、共同体が出来上がってきたよ。ファティマとは頻繁に仕事をするようになったし、ダナ、ドラコ、アリーシャとは友達になった。もちろんダナのご主人のペドロもね。ボリシェンコ一家は、この混乱で心に傷を負ってるみたい。ここにいる皆がそうだけどね。シン一家とも交流はあるけど、家族だけで過ごしてることが多いかな。ヴァネッサとは目も合わせないけど、今もここにいてくれて嬉しいと思ってる。ホェンとライサーは聞こえよがしにどちらがリーダーに相応しいか言い争ってる。何か聞きたいことはある？" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" -"うーん、仲良くはなってきたかな。共同体ができ始めた気がする。ファティマとはよく仕事をするし、ダナ、ドラコ、アリーシャとは一緒に過ごすことが多いね。ボリシェンコ一家やシン一家の人たち、ヴァネッサ、ホェン、ライサーは良く知らないけど、話くらいはするかな。何か知りたいことはある？" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "自由商人について教えて？" @@ -168246,6 +168362,15 @@ msgid "" msgstr "" "ええと、ダナはの直後に、バスの横転事故に遭って、自分自身は運よく生還できたけど赤ちゃんを亡くされたの。彼女とペドロのここでの暮らしは大変なものだったと思うよ。意気投合して友人になれたのは、私にとってもすごく嬉しい事だった。ご主人のペドロは今も塞ぎ込んでる。ペドロは無口だけど良い人だし、打ち解けるとすごく陽気な人だよ。ドラコは気難しい意地悪爺さんだけど、実際はそんなにいい年じゃなくて、あと20年は生きるだろうね。気難しい人は嫌いじゃないよ。音楽の好みも似てるし。アリーシャは素敵な子。皆と仲良くなってたけど、彼女と一番仲が良いのは私かダナかな。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" +"ボリスとギャリーは確か結婚してたと思う。3人はいつも一緒にいて、何と言うか、ちょっと孤立してるみたいだな。スタンとボリスは兄弟だと思うけど、はっきりとは分からないや。良い人だとは思うけど、口数は少ないね。3人のことはよく分からない。無暗に詮索しない方がいいと思ってるよ。" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -168259,12 +168384,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" -"ボリスとギャリーは確か結婚してたと思う。3人はいつも一緒にいて、何と言うか、ちょっと孤立してるみたいだな。スタンとボリスは兄弟だと思うけど、はっきりとは分からないや。良い人だとは思うけど、口数は少ないね。3人のことはよく分からない。無暗に詮索しない方がいいと思ってるよ。" +"あの一家とは全然親しくなれないんだ。家族以外の人間としっかり話すことは決してないし、いつも定位置に座ってパンジャーブ語で会話している。いつも楽しそうにしているし、与えられた仕事はこなすけど、社会的な繋がりはないんだよね。" #: lang/json/talk_topic_from_json.py msgid "" @@ -168278,12 +168403,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" -"あの一家とは全然親しくなれないんだ。家族以外の人間としっかり話すことは決してないし、いつも定位置に座ってパンジャーブ語で会話している。いつも楽しそうにしているし、与えられた仕事はこなすけど、社会的な繋がりはないんだよね。" +"ヴァネッサは...そう、良い人、だと思う。私をキレさせることはあるけど、一緒に生活してるんだから、あまり苛つかないように気を付けてる。ホェンとライサーはここの運営をやりたがってるみたいだけど、私は政治的な話に関わらず建築資材の事だけ考えるようにしてる。政治の話で何かが改善するとは思えないからね。アロンソは良い人だけど、明らかに私に好意を寄せてる。ここにいる他のあらゆる独身女性にも。こんな小さな集団だと、ちょっと遠慮したいね。ジョンは偏見の塊。彼にも色々あるんだとは思うけど、まだ詳しくは知らないな。" #: lang/json/talk_topic_from_json.py msgid "" @@ -168300,26 +168429,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." -msgstr "" -"ヴァネッサは...そう、良い人、だと思う。私をキレさせることはあるけど、一緒に生活してるんだから、あまり苛つかないように気を付けてる。ホェンとライサーはここの運営をやりたがってるみたいだけど、私は政治的な話に関わらず建築資材の事だけ考えるようにしてる。政治の話で何かが改善するとは思えないからね。アロンソは良い人だけど、明らかに私に好意を寄せてる。ここにいる他のあらゆる独身女性にも。こんな小さな集団だと、ちょっと遠慮したいね。ジョンは偏見の塊。彼にも色々あるんだとは思うけど、まだ詳しくは知らないな。" +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." +msgstr "やぁ友よ。私はクレメンス、ジョン・クレメンスだ。くたびれたカウボーイさ。" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "やぁ友よ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "やぁ友よ。私はクレメンス、ジョン・クレメンスだ。くたびれたカウボーイさ。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "はじめまして、ジョン。" @@ -168376,11 +168492,11 @@ msgstr "" "人間ってのは、青空を見られない日がずっと続くと嫌になってくるもんだ。牛舎のウシみたいに窮屈で...自由に駆け回れる牧草地が必要だ、言ってる意味分かるだろ。このままだと、空気が緊張するばかりだ。" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "こんにちは。私はマンディープ・シンです。" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "こんにちは。私はマンディープ・シンです。" #: lang/json/talk_topic_from_json.py @@ -168424,6 +168540,10 @@ msgid "" msgstr "" "何とも言えないね。ここに幸福な人はいない。私とその家族が無傷で危機を脱したことに不満を感じている者すらいる。そんな雰囲気になっているから、ここで親友を作り辛いんだろうな。" +#: lang/json/talk_topic_from_json.py +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgstr "あら！見ない顔ね。失礼、私はマンガルプリートです。" + #: lang/json/talk_topic_from_json.py msgid "Hi there." msgstr "やあ。" @@ -168432,10 +168552,6 @@ msgstr "やあ。" msgid "Oh, hello there." msgstr "おっ、やあ。" -#: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." -msgstr "あら！見ない顔ね。失礼、私はマンガルプリートです。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Mangalpreet." msgstr "はじめまして、マンガルプリート。" @@ -168641,15 +168757,15 @@ msgstr "" msgid "What brings you around here? We don't see a lot of new faces." msgstr "どうやってここへ来たんだ？新顔なんて珍しいな。" -#: lang/json/talk_topic_from_json.py -msgid "Need to talk?" -msgstr "話す必要があるのか？" - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "やあ。初めて会う人だな。私はライサー、皆からはライと呼ばれているよ。" +#: lang/json/talk_topic_from_json.py +msgid "Need to talk?" +msgstr "話す必要があるのか？" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Rhy." msgstr "はじめまして、ライ。" @@ -168742,6 +168858,12 @@ msgstr "" msgid "Do you want to talk about your story?" msgstr "あなたの話を聞かせてもらえるか？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." +msgstr "こんにちは。すまない、前から知り合いだったとしても、まったく覚えていないんだ。私の名前はスタンだ。" + #: lang/json/talk_topic_from_json.py msgid "Hm? Oh, hi." msgstr "うん？おや、どうも。" @@ -168750,12 +168872,6 @@ msgstr "うん？おや、どうも。" msgid "...Hi." msgstr "...やあ。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." -msgstr "こんにちは。すまない、前から知り合いだったとしても、まったく覚えていないんだ。私の名前はスタンだ。" - #: lang/json/talk_topic_from_json.py msgid "Stan, hey? Nice to meet you." msgstr "スタンっていうのか？会えて嬉しいよ。" @@ -168869,16 +168985,16 @@ msgstr "ううん、ちょっと髪型をかえてもらえるかな？" msgid "Hmm, can we change this shave a little please?" msgstr "ううん、ちょっと顔剃りをしてもらえるかな？" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "ああ、戻ってきたのか。" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "おいおい。また新入りが飯を求めてやって来たのか？こっちもギリギリなんだよ。ああ、私はヴァネッサ。" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "ああ、戻ってきたのか。" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "食料が目的ではないが、会えて嬉しいよ。" @@ -168915,15 +169031,6 @@ msgstr "このふざけた状態になる前の話はしたくないんだ。慰 msgid "Could you give me a haircut?" msgstr "散髪してもらえるかな？" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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ダースもの見知らぬ人が住むレンガ造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。少なくとも私は忙しく働いていられるし、マーチに余裕が出たら十分な食料も確保できる。人間は散髪が好きだからね。" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -168933,6 +169040,15 @@ msgid "" msgstr "" "皮肉を込めた言い方と、皮肉をたっぷり込めた言い方、どっちがいい？私は2ダースもの見知らぬ人が住むレンガ造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。このクソな状況を理解できないの？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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ダースもの見知らぬ人が住むレンガ造りの劣悪な建物で立ち往生しており、世界中で死人がうろつき、周りに十分な食料はない。少なくとも私は忙しく働いていられるし、マーチに余裕が出たら十分な食料も確保できる。人間は散髪が好きだからね。" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -169116,12 +169232,6 @@ msgid "" msgstr "" "ああ、状況は厳しい。ここへ最初に来たときは監督者が誰もおらず、私たちが世話できる以上の人員を受け入れることになった。事態がいくらか収集して我々が小さなグループを形成した頃には、落ち着く場所も確保できない避難民たちが全員階上で順番を待っていた。多少の空間は用意したが、理想には程遠い。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." -msgstr "そうしよう。どんな手を使って彼らに退去を認めさせたのか知らないが、自由商人も私自身も、感謝しているよ。" - #: lang/json/talk_topic_from_json.py msgid "" "Even once we got things sorted out, there weren't enough beds for everyone, " @@ -169130,6 +169240,12 @@ msgid "" msgstr "" "いくら事態が片付いても、全員分のベッドも足りないし、物資も不十分だ。耐えるしかない。私たちもできる限りのことはしている...少なくとも避難場所は提供した。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." +msgstr "そうしよう。どんな手を使って彼らに退去を認めさせたのか知らないが、自由商人も私自身も、感謝しているよ。" + #: lang/json/talk_topic_from_json.py msgid "" "Well, there's the downstairs section, we can't fit more people down there so" @@ -169488,14 +169604,14 @@ msgstr "痛い目に遭うのが嫌なら大人しくしていろ。" 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." -msgstr "お嬢さん、外をうろつくは止めた方が身の為だよ。" - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "外は大混乱のようだな？" +#: lang/json/talk_topic_from_json.py +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 "ここが避難センターだと聞いたんだが..." @@ -169524,14 +169640,14 @@ msgstr "人手が必要なようだな..." msgid "Well, I'd better be going. Bye." msgstr "ええと、そろそろ行くよ。さようなら。" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "ようこそ、執行官..." - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "ようこそ..." +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "ようこそ、執行官..." + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -169772,14 +169888,14 @@ msgid "" msgstr "" "残念ながら、無理だ。農園へ行った人の大部分は上階で待機していた避難民だ。安全な寝床を待つよりもリスクが少ないからな。地下から出ていったのはほんの少しだし、元から混雑した状態だったからな。もっとたくさんの人が太陽や新鮮な空気、重労働を求めて牧場に向かってくれるといいが...知ってるだろうが、みんなゾンビの大群に襲われるのが怖いんだ。" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "執行官..." - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "市民..." +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "執行官..." + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "物資の取引はできる？" @@ -169837,14 +169953,14 @@ msgid "" "buy from you. I don't suppose you want to donate?" msgstr "できないよ。物を売れるほど余裕はないし、何かを買う予算もない。寄付だったら受け付けてるよ？" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "ピカピカのバッジを手に入れたようだな！" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "ふん、ただ者ではないらしいな。" +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "ピカピカのバッジを手に入れたようだな！" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "新入りだ。" @@ -169908,16 +170024,16 @@ msgid "" msgstr "" "さあね。仕事を手伝える人間なら大丈夫なんじゃないか。でも今じゃ確実なことなんて一つもないからな。人によって言うことは違う。例えばそこの商人、売り物がないなら出て行けという態度だったが...そうじゃない奴もいるようだ。" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "シー。ここの連中の中にはよく思っていないやつもいるんだ... 変異をな。これは事故だったんだ。" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " "down on people like us." msgstr "君と同じ、自業自得ってやつさ。このことは口外するなよ、ここの連中の中には我々のような人間を見下す者もいる。" -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "シー。ここの連中の中にはよく思っていないやつもいるんだ... 変異をな。これは事故だったんだ。" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "悪いことを尋ねてしまったな。" @@ -169939,22 +170055,22 @@ msgstr "買うよ。" msgid "Who needs rebar?" msgstr "誰が鉄筋を欲しがるんだ？" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "口のきき方を考えろ。くたばれ。" - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "くたばりやがれ！" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "なんか豚くせぇな。冗談だよ...逮捕しないでくれ。" +msgid "As if you're one to talk. Screw You." +msgstr "口のきき方を考えろ。くたばれ。" #: lang/json/talk_topic_from_json.py msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "はん、新入り臭いのがいるな。何か助けが必要か？" +#: lang/json/talk_topic_from_json.py +msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "なんか豚くせぇな。冗談だよ...逮捕しないでくれ。" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "...臭うかい？" @@ -170237,6 +170353,16 @@ msgstr "よろしい、あんたがボスだ。" msgid "Glad to have you aboard." msgstr "よろしくな。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "動くな。どうやってここに入ったのか知らないが、それ以上近づくな。帰ってくれ。" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "考えは変わらない。帰ってくれ。" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "なんだ、何か用か？" @@ -170317,16 +170443,6 @@ msgstr "もう一回言って？" msgid "If/you speak to/understand… you/me. Yes?" msgstr "もし...あなたの話...理解する...あなた...わたし。分かる？" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "考えは変わらない。帰ってくれ。" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "動くな。どうやってここに入ったのか知らないが、それ以上近づくな。帰ってくれ。" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "待って！何だって？？" @@ -170608,6 +170724,14 @@ msgstr "悪いけど、そんな暇はないんだ。" msgid "Keep it civil, merc." msgstr "大人しくしていろよ。" +#: lang/json/talk_topic_from_json.py +msgid "Here to trade, I hope?" +msgstr "取り引きするかい？" + +#: lang/json/talk_topic_from_json.py +msgid "Safe travels, scavenger." +msgstr "お気を付けて、スカベンジャー。" + #: lang/json/talk_topic_from_json.py msgid "" "Still plenty of outlaws in the roads, perhaps you should tend to your job, " @@ -170622,20 +170746,6 @@ msgstr "執行官、何か欲しいものがありますか？" msgid "Oh, a U.S. marshal, how quaint." msgstr "ああ、連邦執行官か。乙だねぇ。" -#: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" -msgstr "取り引きするかい？" - -#: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." -msgstr "お気を付けて、スカベンジャー。" - -#: lang/json/talk_topic_from_json.py -msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" -msgstr "私は私の仕事を続け、あなたはあなたの仕事を続ける。執行官、これは公正な取り引きでしょう？" - #: lang/json/talk_topic_from_json.py msgid "" "We have been supplying this lab here with food from a few hunting and " @@ -170644,6 +170754,12 @@ msgid "" msgstr "" "私たちは、研究所の近くにあるハンターや農家のコミュニティから食料の供給を受けてきた。路上は危険だが、金になる物はあるし、都市部でガラクタを集めて回るよりもいい。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" +msgstr "私は私の仕事を続け、あなたはあなたの仕事を続ける。執行官、これは公正な取り引きでしょう？" + #: lang/json/talk_topic_from_json.py msgid "Keep safe, then." msgstr "では、おたっしゃで。" @@ -170862,16 +170978,16 @@ msgid "I'll talk with them then…" msgstr "じゃあ彼らと話してみるよ..." #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "御用ですか？ 執行官。" +msgid "Morning ma'am, how can I help you?" +msgstr "どうも、お嬢さん。何か用かい？" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "どうも、旦那。何か用かい？" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "どうも、お嬢さん。何か用かい？" +msgid "Can I help you, marshal?" +msgstr "御用ですか？ 執行官。" #: lang/json/talk_topic_from_json.py msgid "" @@ -170978,14 +171094,14 @@ msgstr "何か頼みたい仕事はあるか？" msgid "Not now." msgstr "今はいい。" -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "出直してくれるか、今は手が離せないんだ。" - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "あなたやお仲間が怪我をしているなら私が診るよ。" +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "出直してくれるか、今は手が離せないんだ。" + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$200, 30分] 手当てしてくれ。" @@ -171224,8 +171340,8 @@ msgid "Ok." msgstr "分かった。" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" -msgstr "暗号通貨とは何だ？" +msgid "Crypto coins? Are you insane, there isn't any global internet now." +msgstr "暗号通貨？ネット回線なんてもう存在しないよ、気でも狂ったんだな。" #: lang/json/talk_topic_from_json.py msgid "" @@ -171249,11 +171365,12 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" -"ここでは取り引きに暗号通貨を使う。大変動前から電子的な通貨を作っていて、将来的には仮想通貨を流通させるつもりだったんだ。私たちは今でも使い続けている。欲しいなら、物々交換だ。" +"ここでは取り引きに暗号通貨を使う。私たちは大変動前から電子的な通貨を作っていて、将来的には仮想通貨を流通させるつもりだったんだ。今使ってるこれは物理的な硬貨、一種のジョークだ。いつの日か、インターネットを取り戻してみせるよ。" #: lang/json/talk_topic_from_json.py msgid "Heya, scav." @@ -171347,14 +171464,14 @@ msgstr "祝福あれ。平穏を妨げるものは一掃しよう。" msgid "I must purge this place before I can move on." msgstr "他の場所へ行く前に、この場所を清めなければ。" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you again." -msgstr "ああ、またお前か。" - #: lang/json/talk_topic_from_json.py msgid "Huh? *mumble mumble* … Who are you?" msgstr "あ？*モゴモゴ*...誰だ？" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you again." +msgstr "ああ、またお前か。" + #: lang/json/talk_topic_from_json.py msgid "I'm busy, what is it?" msgstr "忙しいのだ、何か用か？" @@ -171363,14 +171480,14 @@ msgstr "忙しいのだ、何か用か？" msgid "And leave my tower and all my research? I think not." msgstr "我が塔と我が研究を置いてか？そうはいかない。" -#: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." -msgstr "ああ、また会ったな。" - #: lang/json/talk_topic_from_json.py msgid "Do you seek power as well?" msgstr "君も力を求めているのか？" +#: lang/json/talk_topic_from_json.py +msgid "Ah, hello again." +msgstr "ああ、また会ったな。" + #: lang/json/talk_topic_from_json.py msgid "Yes, yes… *electrical crackling* Isn't it beautiful?" msgstr "やあ、やあ...*電気が爆ぜる音*...美しいだろう？" @@ -179561,12 +179678,6 @@ msgstr "マナ注入" msgid "mana weaving" msgstr "マナ織込" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "なし" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -185972,16 +186083,18 @@ msgstr "[<] ページ %1$d / %2$d [>]" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s] 整列: %s >" +msgid "< [%s] Sort: %s >" +msgstr "< [%s] 整列: %s >" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F] フィルタ" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "[%s] フィルタ" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R] 消去" +#, c-format +msgid "[%s] Reset" +msgstr "[%s] リセット" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -186009,15 +186122,16 @@ msgstr "中身が溢れてしまうため、満杯の容器は飛ばします。 #: src/advanced_inv.cpp msgid "Sort by…" -msgstr "並び替え..." +msgstr "整列..." #: src/advanced_inv.cpp msgid "Unsorted (recently added first)" msgstr "並び無し(入手順)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] ヘルプ >" +#, c-format +msgid "< [%s] Show help >" +msgstr "< [%s] ヘルプ >" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -188996,6 +189110,13 @@ msgstr "CBM電力: %s/.%ikJ" msgid " BIONICS " msgstr "生体部品" +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "[%s] キー割当、[%s] タブ切替、[%s] 切替/節約モード、[%s] 自動起動モード" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -189005,24 +189126,14 @@ msgstr "" "対象の生体部品を選んでください。(SPACEで取消)" #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." -msgstr "" -"有効 " -"!説明=キー割当TABタブ切替s切替/節約モードA切替/自動起動モード" +#, c-format +msgid "Activating [%s] Examine, %s" +msgstr "起動/停止 [%s] 説明表示、%s" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." -msgstr "" -"説明 " -"!有効=キー割当TABタブ切替s切替/節約モードA切替/自動起動モード" +#, c-format +msgid "Examining [%s] Activate, %s" +msgstr "説明表示 [%s] 起動/停止、%s" #: src/bionics_ui.cpp #, c-format @@ -189095,7 +189206,7 @@ msgstr "生体部品(パッシブ)が移植されていません。" #: src/bionics_ui.cpp #, c-format msgid "%s; enter new letter. Space to clear. Esc to cancel." -msgstr "%s; 新しいキーを入力、SPACEでキー削除、ESCAPEでキャンセル" +msgstr "%s; 割り当てるキーを入力、SPACEでキー削除、ESCAPEでキャンセル" #: src/bionics_ui.cpp #, c-format @@ -189110,20 +189221,20 @@ msgstr "" #: src/bionics_ui.cpp msgid "You can't toggle fuel saving mode on a non-fueled CBM." -msgstr "電力を消費しないCBMでは節約モードを切り替えられません。" +msgstr "電力を消費しないCBMは節約モードを切り替えられません。" #: src/bionics_ui.cpp msgid "You can't toggle auto start mode on a non-fueled CBM." -msgstr "電力を消費しないCBMでは自動起動モードを切り替えられません。" +msgstr "電力を消費しないCBMは自動起動モードを切り替えられません。" #: src/bionics_ui.cpp #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"%sを起動出来ません！\n" -"%sの説明を見るには'!'の後に'%c'を押して下さい。" +"%sを起動できません！\n" +"%sの説明を表示するには、'%s'を押した後に'%c'を押してください。" #: src/bonuses.cpp msgid "Accuracy" @@ -201455,8 +201566,8 @@ msgid "You can't crack a safe while deaf!" msgstr "耳が聞こえないと金庫破りはできません！" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" -msgstr "イヤホンをつけたまま金庫破りはできません！" +msgid "You can't crack a safe while listening to music!" +msgstr "音楽を聴きながら金庫破りはできません！" #: src/iexamine.cpp msgid "Attempt to crack the safe?" @@ -203680,13 +203791,8 @@ msgstr "選択できるアイテムがない" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]フィルタ" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]フィルタ: " +msgid "[%s] Filter: " +msgstr "[%s] フィルタ: " #: src/inventory_ui.cpp msgid "Next column" @@ -204139,7 +204245,7 @@ msgstr "容量: " #: src/item.cpp msgid " moves per round" -msgstr "コスト/1発" +msgstr "/1発" #: src/item.cpp msgid "Reload time: " @@ -204235,7 +204341,7 @@ msgstr "" #: src/item.cpp msgid " moves " -msgstr "コスト" +msgstr "" #: src/item.cpp msgid "Time to reach aim level: " @@ -218959,30 +219065,30 @@ msgstr "キーを割り当てます。" msgid "" "Select a mutation to reassign or press SPACE to " "cancel. " -msgstr "対象の変異を選ぶかSPACEで取消)" +msgstr "対象の変異を選んでください。(SPACEで取消)" #: src/mutation_ui.cpp msgid "Activating" -msgstr "有効化" +msgstr "有効化/無効化" #: src/mutation_ui.cpp #, c-format msgid "%s to examine mutation, " -msgstr "%sを押して有効化する変異を選択" +msgstr "%sを押して説明を表示、" #: src/mutation_ui.cpp msgid "Examining" -msgstr "無効化" +msgstr "説明表示" #: src/mutation_ui.cpp #, c-format msgid "%s to activate mutation, " -msgstr "%sを押して無効化する変異を選択" +msgstr "%sを押して有効化/無効化の変更、" #: src/mutation_ui.cpp #, c-format msgid "%s to reassign invlet, " -msgstr "%sでキー割り当て" +msgstr "%sでキー割当、" #: src/mutation_ui.cpp #, c-format @@ -219003,7 +219109,7 @@ msgstr "アクティブ: " #: src/mutation_ui.cpp src/options.cpp msgid "None" -msgstr "無し" +msgstr "なし" #. ~ RU means Resource Units #: src/mutation_ui.cpp @@ -219050,13 +219156,13 @@ msgstr "%sの使用をやめました。" #: src/mutation_ui.cpp #, c-format msgid "You don't have enough in you to activate your %s!" -msgstr "%sを起動するものが足りません！" +msgstr "%sを有効化する条件を満たしていません！" #: src/mutation_ui.cpp #, c-format msgid "" "You cannot activate %s! To read a description of %s, press '!', then '%c'." -msgstr "%sを起動出来ません！%sの説明を見るには'!'の後に'%c'を押して下さい。" +msgstr "%sは有効化できません！%sの説明を表示するには'!'を押した後に'%c'を押してください。" #: src/name.cpp msgid "Tom" @@ -222303,6 +222409,16 @@ msgstr "" "Unicode罫線の代わりにSDL " "ASCII罫線を使用して表示します。選択しているフォントに必要な記号が入っていない場合は、この設定を利用してください。" +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "アイテムのアスキーアート表示" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "アスキーアートで図示できるアイテムを説明欄に表示します。" + #: src/options.cpp msgid "Use tiles" msgstr "タイル使用" @@ -224114,10 +224230,6 @@ msgstr "休息:" msgid "Heat :" msgstr "寒暖:" -#: src/panels.cpp -msgid "Sound :" -msgstr "音 :" - #: src/panels.cpp msgid "Deaf!" msgstr "難聴！" @@ -226772,7 +226884,7 @@ msgstr "必要な道具: " #. %2$s is the word "NONE" #: src/requirements.cpp src/veh_interact.cpp msgid "NONE" -msgstr "無し" +msgstr "なし" #: src/safemode_ui.cpp msgid " SAFE MODE MANAGER " @@ -228940,8 +229052,9 @@ msgid "Remove attached curtains first." msgstr "先にカーテンを取り外す必要がある" #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "先に同一箇所の車両部品を取り外す必要がある" +#, c-format +msgid "Remove the attached %s first." +msgstr "先に%sを取り外す必要があります。" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/pl.po b/lang/po/pl.po index 0df2421d81c8c..ecdab5b9b7db5 100644 --- a/lang/po/pl.po +++ b/lang/po/pl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Aleksander Sienkiewicz , 2020\n" "Language-Team: Polish (https://www.transifex.com/cataclysm-dda-translators/teams/2217/pl/)\n" @@ -742,7 +742,7 @@ msgstr[1] "cząsteczki tlenu" msgstr[2] "cząsteczek tlenu" msgstr[3] "cząsteczek tlenu" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Zbiornik z tlenem." @@ -826,7 +826,7 @@ msgstr[1] "nitrox" msgstr[2] "nitrox" msgstr[3] "nitrox" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "Mieszanka tlenu i azotu w proporcjach odpowiednich do nurkowania." @@ -839,7 +839,7 @@ msgstr[1] "rozpałka" msgstr[2] "rozpałka" msgstr[3] "rozpałka" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "Palny materiał, drobno rozdrobniony, dla łatwego rozpalenia." @@ -865,7 +865,7 @@ msgstr[1] "metalowe kostki RPG" msgstr[2] "metalowych kości RPG" msgstr[3] "metalowych kości RPG" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "Metalowa kostka używana do grania w różne gry fabularne." @@ -903,7 +903,7 @@ msgstr[1] "jedn. siarki" msgstr[2] "jedn. siarki" msgstr[3] "siarka" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -956,7 +956,7 @@ msgstr[1] "wapień" msgstr[2] "wapień" msgstr[3] "wapień" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -974,7 +974,7 @@ msgstr[1] "wapno palone" msgstr[2] "wapno palone" msgstr[3] "wapno palone" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -996,7 +996,7 @@ msgstr[1] "piasek" msgstr[2] "piasek" msgstr[3] "piasek" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -1013,7 +1013,7 @@ msgstr[1] "gleb" msgstr[2] "gleb" msgstr[3] "gleba" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1052,7 +1052,7 @@ msgstr[1] "sproszkowany cynk" msgstr[2] "sproszkowany cynk" msgstr[3] "sproszkowany cynk" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1071,7 +1071,7 @@ msgstr[1] "tlenki cynku" msgstr[2] "tlenków cynku" msgstr[3] "tlenków cynku" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1088,7 +1088,8 @@ msgstr[1] "dwutlenki manganu" msgstr[2] "dwutlenków manganu" msgstr[3] "dwutlenków manganu" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1107,7 +1108,8 @@ msgstr[1] "chlorki potasu" msgstr[2] "chlorków potasu" msgstr[3] "chlorków potasu" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1128,7 +1130,8 @@ msgstr[1] "wodorotlenki potasu" msgstr[2] "wodorotlenków potasu" msgstr[3] "wodorotlenków potasu" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1148,7 +1151,7 @@ msgstr[1] "kwas siarkowy" msgstr[2] "kwas siarkowy" msgstr[3] "kwas siarkowy" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1208,7 +1211,7 @@ msgstr[1] "kwas azotowy" msgstr[2] "kwas azotowy" msgstr[3] "kwas azotowy" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1341,7 +1344,7 @@ msgstr[1] "azotan potasu" msgstr[2] "azotan potasu" msgstr[3] "azotan potasu" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1359,7 +1362,7 @@ msgstr[1] "saletra potasowa" msgstr[2] "saletra potasowa" msgstr[3] "saletra potasowa" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1442,7 +1445,7 @@ msgstr[1] "termit" msgstr[2] "termit" msgstr[3] "termit" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1507,7 +1510,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1594,7 +1598,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "" @@ -1622,7 +1626,7 @@ msgstr[1] "popiół z drewna" msgstr[2] "popiół z drewna" msgstr[3] "popiół z drewna" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1757,7 +1761,7 @@ msgstr[1] "nafta" msgstr[2] "nafta" msgstr[3] "nafta" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Lekkie, płonące czystym płomieniem paliwo do lamp." @@ -1770,7 +1774,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "" @@ -1783,7 +1787,7 @@ msgstr[1] "napalm" msgstr[2] "napalm" msgstr[3] "napalm" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -5129,7 +5133,7 @@ msgstr[1] "czerwona farba" msgstr[2] "czerwona farba" msgstr[3] "czerwona farba" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Puszka czerwonej farby." @@ -5155,7 +5159,7 @@ msgstr[1] "biała farba " msgstr[2] "biała farba " msgstr[3] "biała farba " -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Puszka białej farby." @@ -5181,7 +5185,7 @@ msgstr[1] "fioletowa farba" msgstr[2] "fioletowa farba" msgstr[3] "fioletowa farba" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Puszka fioletowej farby." @@ -5194,7 +5198,7 @@ msgstr[1] "żółta farba" msgstr[2] "żółta farba" msgstr[3] "żółta farba" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Puszka żółtej farby." @@ -5270,7 +5274,7 @@ msgstr[2] "złoto" msgstr[3] "złoto" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5295,7 +5299,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5312,7 +5316,7 @@ msgstr[1] "ołów" msgstr[2] "ołów" msgstr[3] "ołów" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5329,7 +5333,7 @@ msgstr[1] "sproszkowany magnez" msgstr[2] "sproszkowany magnez" msgstr[3] "sproszkowany magnez" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5346,7 +5350,7 @@ msgstr[1] "srebro" msgstr[2] "srebro" msgstr[3] "srebro" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5549,7 +5553,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5564,7 +5568,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5579,7 +5583,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5594,7 +5598,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5635,7 +5640,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5660,7 +5666,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5685,7 +5692,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5723,7 +5731,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5754,7 +5763,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5782,7 +5792,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5807,7 +5818,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -7956,12 +7968,14 @@ msgstr[2] "ładownica" msgstr[3] "ładownica" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -7976,7 +7990,8 @@ msgstr[3] "ładownica" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -7985,11 +8000,14 @@ msgid "You stash your %s." msgstr "Chowasz swój %s." #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -8026,7 +8044,8 @@ msgstr[1] "piersiowa ładownica" msgstr[2] "piersiowa ładownica" msgstr[3] "piersiowa ładownica" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -8043,7 +8062,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -8060,12 +8079,13 @@ msgstr[1] "torba na oszczepy" msgstr[2] "torba na oszczepy" msgstr[3] "torba na oszczepy" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "Włóż oszczepy" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -8099,7 +8119,7 @@ msgstr[1] "ładownica na nogę" msgstr[2] "ładownica na nogę" msgstr[3] "ładownica na nogę" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -8344,7 +8364,8 @@ msgstr[1] "improwizowane ochraniacze ramion" msgstr[2] "improwizowane ochraniacze ramion" msgstr[3] "improwizowane ochraniacze ramion" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -8707,7 +8728,7 @@ msgstr[1] "ładownica na granat" msgstr[2] "ładownica na granat" msgstr[3] "ładownica na granat" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -8739,12 +8760,14 @@ msgstr[1] "duża ładownica na granaty" msgstr[2] "duża ładownica na granaty" msgstr[3] "duże ładownice na granaty" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "Umieść granaty" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "Sakwa na maksymalnie cztery pełnowymiarowe granaty różnych rodzajów." @@ -9251,6 +9274,8 @@ msgstr[1] "opancerzone buty" msgstr[2] "opancerzone buty" msgstr[3] "opancerzone buty" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -9374,6 +9399,8 @@ msgstr[1] "buty ocalonych XL" msgstr[2] "buty ocalonych XL" msgstr[3] "buty ocalonych XL" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -9914,7 +9941,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -11545,7 +11573,8 @@ msgstr[1] "opancerzone bezpalcowe rękawice" msgstr[2] "opancerzone bezpalcowe rękawice" msgstr[3] "opancerzone bezpalcowe rękawice" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -11925,7 +11954,8 @@ msgstr[1] "rękawice ocalonych XL" msgstr[2] "rękawice ocalonych XL" msgstr[3] "rękawice ocalonych XL" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -12366,7 +12396,7 @@ msgstr[1] "jarmułka" msgstr[2] "jarmułka" msgstr[3] "jarmułka" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "" @@ -12381,7 +12411,7 @@ msgstr[1] "czapka kufi" msgstr[2] "czapka kufi" msgstr[3] "czapka kufi" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Krótka okrągła czapka bez daszku." @@ -12752,7 +12782,7 @@ msgstr[1] "galea" msgstr[2] "galea" msgstr[3] "galea" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -13573,7 +13603,7 @@ msgstr[1] "zegar nurka" msgstr[2] "zegar nurka" msgstr[3] "zegar nurka" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -18157,7 +18187,8 @@ msgstr[1] "improwizowane ochraniacze nóg" msgstr[2] "improwizowane ochraniacze nóg" msgstr[3] "improwizowane ochraniacze nóg" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -18192,7 +18223,8 @@ msgstr[1] "nogawice kolcze" msgstr[2] "nogawice kolcze" msgstr[3] "nogawice kolcze" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -18207,7 +18239,7 @@ msgstr[1] "skórzane nogawice" msgstr[2] "skórzane nogawice" msgstr[3] "skórzane nogawice" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -18223,7 +18255,7 @@ msgstr[1] "spodnie szermiercze" msgstr[2] "spodnie szermiercze" msgstr[3] "spodnie szermiercze" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" @@ -18338,7 +18370,8 @@ msgstr[1] "lekkie spodnie z kieszeniami ocalonych" msgstr[2] "lekkie spodnie z kieszeniami ocalonych" msgstr[3] "lekkie spodnie z kieszeniami ocalonych" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -18355,7 +18388,8 @@ msgstr[1] "spodnie motocyklowe" msgstr[2] "spodnie motocyklowe" msgstr[3] "spodnie motocyklowe" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "" @@ -18402,7 +18436,7 @@ msgstr[1] "bryczesy" msgstr[2] "bryczesy" msgstr[3] "bryczesy" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -18433,7 +18467,7 @@ msgstr[1] "krótkie szorty" msgstr[2] "krótkie szorty" msgstr[3] "krótkie szorty" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "Proste bardzo krótkie szorty, które niewiele zakrywają." @@ -18446,7 +18480,7 @@ msgstr[1] "futrzane krótkie szorty" msgstr[2] "futrzane krótkie szorty" msgstr[3] "futrzane krótkie szorty" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "Proste bardzo krótkie futrzane szorty, które niewiele zakrywają." @@ -18459,7 +18493,8 @@ msgstr[1] "skórzane krótkie szorty" msgstr[2] "skórzane krótkie szorty" msgstr[3] "skórzane krótkie szorty" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "Proste bardzo krótkie skórzane szorty, które niewiele zakrywają." @@ -18472,7 +18507,7 @@ msgstr[1] "dżinsy" msgstr[2] "dżinsy" msgstr[3] "dżinsy" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "Niebieskie dżinsy z dwiema głębokimi kieszeniami." @@ -18522,7 +18557,7 @@ msgstr[1] "legginsy" msgstr[2] "legginsy" msgstr[3] "legginsy" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -18674,7 +18709,7 @@ msgstr[1] "futrzane spodnie" msgstr[2] "futrzane spodnie" msgstr[3] "futrzane spodnie" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Masywne spodnie podbite miękkim ciepłym futrem." @@ -18700,7 +18735,7 @@ msgstr[1] "skórzane spodnie" msgstr[2] "skórzane spodnie" msgstr[3] "skórzane spodnie" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -18732,7 +18767,8 @@ msgstr[1] "szorty pocztowe" msgstr[2] "szorty pocztowe" msgstr[3] "szorty pocztowe" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "Ciemnoniebieskie szorty noszone często przez listonoszy i kurierów." @@ -18758,7 +18794,7 @@ msgstr[1] "szorty z kieszeniami" msgstr[2] "szorty z kieszeniami" msgstr[3] "szorty z kieszeniami" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "Szorty typu cargo z wieloma kieszeniami o przyzwoitej pojemności." @@ -18771,7 +18807,7 @@ msgstr[1] "szorty dżinsowe" msgstr[2] "szorty dżinsowe" msgstr[3] "szorty dżinsowe" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -18940,17 +18976,20 @@ msgstr[1] "maski niewoli (zapięte)" msgstr[2] "masek niewoli (zapięte)" msgstr[3] "maski niewoli (zapięte)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Rozepnij" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "Rozpinasz otwory oczu i ust maski niewoli." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -20022,7 +20061,7 @@ msgstr[1] "skórzana sakwa" msgstr[2] "skórzana sakwa" msgstr[3] "skórzana sakwa" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -21408,7 +21447,8 @@ msgstr[1] "lorica segmentata" msgstr[2] "lorica segmentata" msgstr[3] "lorica segmentata" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -21470,7 +21510,7 @@ msgstr[1] "kirys" msgstr[2] "kirys" msgstr[3] "kirys" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -22272,7 +22312,8 @@ msgstr[1] "para ogrzewaczy ramion" msgstr[2] "para ogrzewaczy ramion" msgstr[3] "para ogrzewaczy ramion" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "Przytulne i miękkie rękawy, które utrzymają ciepło twoich rąk." @@ -22377,7 +22418,7 @@ msgstr[1] "kobiece szorty" msgstr[2] "kobiece szorty" msgstr[3] "kobiece szorty" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -22407,7 +22448,7 @@ msgstr[1] "slipki" msgstr[2] "slipki" msgstr[3] "slipki" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "Slipki to wygodna męska bielizna." @@ -22552,7 +22593,8 @@ msgstr[1] "para ogrzewaczy nóg w rozmiarze XL" msgstr[2] "para ogrzewaczy nóg w rozmiarze XL" msgstr[3] "para ogrzewaczy nóg w rozmiarze XL" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -22702,7 +22744,8 @@ msgstr[1] "elastyczne spodenki sportowe" msgstr[2] "elastyczne spodenki sportowe" msgstr[3] "elastyczne spodenki sportowe" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -24242,7 +24285,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -25267,7 +25310,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -27516,19 +27560,19 @@ msgstr[3] "" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -32419,7 +32463,8 @@ msgstr[1] "komercyjny nawóz" msgstr[2] "komercyjny nawóz" msgstr[3] "komercyjny nawóz" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "Bogate w składniki odżywcze granulki dla roślin." @@ -32523,7 +32568,8 @@ msgstr[1] "skoncentrowany kwas" msgstr[2] "skoncentrowany kwas" msgstr[3] "skoncentrowany kwas" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Skoncentrowany kwas. Nie pij tego." @@ -33404,7 +33450,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -33933,7 +33979,7 @@ msgstr[1] "gotowane ryby" msgstr[2] "gotowanych ryb" msgstr[3] "gotowanych ryb" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "Świeża gotowana ryba. Bardzo pożywna." @@ -34025,7 +34071,7 @@ msgstr[1] "kawałki mięsa" msgstr[2] "kawałki mięsa" msgstr[3] "kawałki mięsa" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -34055,7 +34101,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -34191,7 +34238,7 @@ msgstr[1] "gotowane podroby" msgstr[2] "gotowane podroby" msgstr[3] "gotowane podroby" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -34381,7 +34428,8 @@ msgstr[1] "gotowane kawałki płuc" msgstr[2] "gotowane kawałki płuc" msgstr[3] "gotowane kawałki płuc" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -34440,7 +34488,7 @@ msgstr[1] "gotowane mózgi" msgstr[2] "gotowanych mózgów" msgstr[3] "gotowane mózgi" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -34561,7 +34609,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -34638,7 +34687,8 @@ msgstr[1] "kawałki skażonego mięsa" msgstr[2] "kawałki skażonego mięsa" msgstr[3] "kawałki skażonego mięsa" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -35232,7 +35282,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -35260,7 +35310,7 @@ msgstr[1] "kawa" msgstr[2] "kawa" msgstr[3] "kawa" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -35279,7 +35329,8 @@ msgstr[1] "substytuty kawy" msgstr[2] "substytutów kawy" msgstr[3] "substytutów kawy" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -35298,7 +35349,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -35723,7 +35774,7 @@ msgstr[1] "czysta woda" msgstr[2] "czysta woda" msgstr[3] "czysta woda" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "" @@ -36288,7 +36339,8 @@ msgstr[1] "gotowane truskawki" msgstr[2] "gotowane truskawki" msgstr[3] "gotowane truskawki" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "Trochę jak dżem truskawkowy, ale bez cukru." @@ -36310,7 +36362,8 @@ msgstr[1] "gotowane jagody" msgstr[2] "gotowane jagody" msgstr[3] "gotowane jagody" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "Trochę jak dżem jagodowy, ale bez cukru." @@ -37242,20 +37295,20 @@ msgstr[1] "cukierki czekoladowe" msgstr[2] "cukierki czekoladowe" msgstr[3] "cukierki czekoladowe" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "Garść cukierków z nadzieniem czekoladowym." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "cukierki żujki" -msgstr[1] "cukierki żujki" -msgstr[2] "cukierki żujki" -msgstr[3] "cukierki żujki" +msgid_plural "chewy candy" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "Garść kolorowych owocowych cukierków do żucia." @@ -37524,7 +37577,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -37670,7 +37723,7 @@ msgstr[1] "chili dogi" msgstr[2] "chili dogi" msgstr[3] "chili dogi" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Hot dog serwowany z chilli con carne jako dodatek. Mniam!" @@ -37713,7 +37766,8 @@ msgstr[1] "naleśniki z czekoladą" msgstr[2] "naleśników z czekoladą" msgstr[3] "naleśników z czekoladą" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -37751,7 +37805,7 @@ msgstr[1] "frytki z serem" msgstr[2] "frytki z serem" msgstr[3] "frytki z serem" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "Frytki ziemniaczane z roztopionym żółtym serem na wierzchu." @@ -37795,13 +37849,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "gotowane hot dogi" -msgstr[1] "gotowane hot dogi" -msgstr[2] "gotowane hot dogi" -msgstr[3] "gotowane hot dogi" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -38415,7 +38465,8 @@ msgstr[1] "chili con carne" msgstr[2] "chili con carne" msgstr[3] "chili con carne" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" @@ -38424,7 +38475,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" @@ -38433,7 +38485,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "Pikantna potrawka z papryczek chilli, mięsa, pomidorów i fasoli." @@ -39461,7 +39513,7 @@ msgstr[1] "kokaina" msgstr[2] "kokaina" msgstr[3] "kokaina" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -39653,7 +39705,7 @@ msgstr[1] "guma do żucia" msgstr[2] "guma do żucia" msgstr[3] "guma do żucia" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "Jasnoróżowa guma balonowa do żucia. Słodka i niszczy zęby." @@ -41905,7 +41957,7 @@ msgstr[1] "chitynowa mączka" msgstr[2] "chitynowa mączka" msgstr[3] "chitynowa mączka" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -41973,7 +42025,7 @@ msgstr[1] "gotowana fasola jaś" msgstr[2] "gotowana fasola jaś" msgstr[3] "gotowana fasola jaś" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "Porcja od serca gotowanej fasoli typu jaś." @@ -42063,7 +42115,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "" @@ -42076,7 +42128,7 @@ msgstr[1] "kawa mielona" msgstr[2] "kawa mielona" msgstr[3] "kawa mielona" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -43934,7 +43986,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "" @@ -44031,7 +44083,8 @@ msgstr[1] "nasiona papryczki chili" msgstr[2] "nasiona papryczki chili" msgstr[3] "nasiona papryczki chili" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Nieco nasion papryczki chili." @@ -44457,7 +44510,7 @@ msgstr[1] "ziarna kawy" msgstr[2] "ziarna kawy" msgstr[3] "ziarna kawy" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Nieco ziaren kawy, mogą być uprażone." @@ -44483,7 +44536,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "" @@ -44834,13 +44887,9 @@ msgstr "Źdźbło tymianku. Pięknie pachnie." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "gotowane łodyga pałki wodnej" -msgstr[1] "gotowane łodygi pałki wodnej" -msgstr[2] "gotowane łodygi pałki wodnej" -msgstr[3] "gotowane łodygi pałki wodnej" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -44874,7 +44923,8 @@ msgstr[1] "gotowane liście mleczy" msgstr[2] "gotowane liście mleczy" msgstr[3] "gotowane liście mleczy" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Gotowane liście dzikich mleczy. Smaczne i pożywne." @@ -44913,7 +44963,8 @@ msgstr[1] "gotowane dzikie warzywa" msgstr[2] "gotowane dzikie warzywa" msgstr[3] "gotowane dzikie warzywa" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "Gotowane dzikie warzywa. Niezwykły kalejdoskop smaków." @@ -44937,7 +44988,7 @@ msgstr[1] "kasza gryczana" msgstr[2] "kasza gryczana" msgstr[3] "kasza gryczana" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -44999,7 +45050,7 @@ msgstr[1] "gotowany ryż" msgstr[2] "gotowany ryż" msgstr[3] "gotowany ryż" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Porcja od serca gotowanego białego ryżu." @@ -45670,9 +45721,13 @@ msgstr "Doskonała pizza z roztopionym serem na wierzchu." #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "granola" +msgid_plural "granola" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -48762,7 +48817,7 @@ msgstr[1] "sól kamienna" msgstr[2] "sól kamienna" msgstr[3] "sól kamienna" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "Garść kryształów soli kamiennej. Można przetworzyć w sól kuchenną." @@ -48775,7 +48830,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -48790,7 +48845,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -49036,7 +49091,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "Pasta półproduktów zmielonych ziaren, prawie mąka." @@ -49049,7 +49105,8 @@ msgstr[1] "tlące się niedopałki" msgstr[2] "tlących się niedopałków" msgstr[3] "tlącego się niedopałku" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -49088,7 +49145,7 @@ msgstr[1] "monety" msgstr[2] "monet" msgstr[3] "monety" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -49124,19 +49181,35 @@ msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "pobliski ogień" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "mięsień" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "wiatr" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -49154,6 +49227,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -49268,7 +49352,7 @@ msgstr[1] "skórzane łaty" msgstr[2] "skórzane łaty" msgstr[3] "skórzane łaty" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "Mała łata skórzana. Można jej użyć do uszycia wytrzymałego ubioru." @@ -49281,7 +49365,7 @@ msgstr[1] "łata filcu" msgstr[2] "łata filcu" msgstr[3] "łata filcu" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "Mała łata z filcu. Można ją rozłożyć na włókno wełny." @@ -49382,7 +49466,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -49734,7 +49819,7 @@ msgstr[1] "beton" msgstr[2] "beton" msgstr[3] "beton" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "Beton, gotowy do użycia w projektach budowlanych." @@ -49781,7 +49866,7 @@ msgstr[1] "martwa flara" msgstr[2] "martwa flara" msgstr[3] "martwa flara" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "To wypalona, zużyta flara magnezowa. W zasadzie to śmieć." @@ -50425,7 +50510,8 @@ msgstr[1] "soczewki wysokiej jakości" msgstr[2] "soczewki wysokiej jakości" msgstr[3] "soczewki wysokiej jakości" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -50442,7 +50528,8 @@ msgstr[1] "małe soczewki wysokiej jakości" msgstr[2] "małe soczewki wysokiej jakości" msgstr[3] "małe soczewki wysokiej jakości" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -50459,7 +50546,8 @@ msgstr[1] "para przyciemnianych szkieł" msgstr[2] "para przyciemnianych szkieł" msgstr[3] "para przyciemnianych szkieł" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -50641,7 +50729,7 @@ msgstr[1] "kuliste akwarium" msgstr[2] "kuliste akwarium" msgstr[3] "kuliste akwarium" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -51031,7 +51119,7 @@ msgstr[1] "bryła gliny" msgstr[2] "bryła gliny" msgstr[3] "bryła gliny" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Świeża bryła gliny. Przydatna w wytwarzaniu pewnych rzeczy." @@ -51057,7 +51145,7 @@ msgstr[1] "zaprawa murarska" msgstr[2] "zaprawa murarska" msgstr[3] "zaprawa murarska" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "Zaprawa murarska, gotowa do użycia w projektach budowlanych." @@ -51070,17 +51158,17 @@ msgstr[1] "miękkie cegły suszone na słońcu" msgstr[2] "miękkich cegieł suszonych na słońcu" msgstr[3] "miękkich cegieł suszonych na słońcu" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "Testujesz cegłę i wydaje się ona wystarczająco solidna, by ją użyć." -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "Cegła jest nadal zbyt wilgotna, aby wytrzymać ciężar." -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -51350,7 +51438,7 @@ msgstr[1] "wędzona skóra" msgstr[2] "wędzona skóra" msgstr[3] "wędzona skóra" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -51369,7 +51457,7 @@ msgstr[1] "wyprawiona skóra" msgstr[2] "wyprawiona skóra" msgstr[3] "wyprawiona skóra" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -51386,7 +51474,7 @@ msgstr[1] "wędzone futro" msgstr[2] "wędzone futro" msgstr[3] "wędzone futro" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -51405,7 +51493,7 @@ msgstr[1] "wyprawione futro" msgstr[2] "wyprawione futro" msgstr[3] "wyprawione futro" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -51422,7 +51510,7 @@ msgstr[1] "snopek siana" msgstr[2] "snopek siana" msgstr[3] "snopek siana" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -51439,7 +51527,7 @@ msgstr[1] "lalka z siana" msgstr[2] "lalka z siana" msgstr[3] "lalka z siana" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "Stara lalka z siana. Reprezentuje kobietę w sukni." @@ -51619,7 +51707,7 @@ msgstr[1] "pet ze skręta" msgstr[2] "pet ze skręta" msgstr[3] "pet ze skręta" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -51836,7 +51924,7 @@ msgstr[1] "zbiornik chłodniczy" msgstr[2] "zbiornik chłodniczy" msgstr[3] "zbiornik chłodniczy" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -52108,7 +52196,7 @@ msgstr[1] "ulotka" msgstr[2] "ulotka" msgstr[3] "ulotka" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "Skrawek papieru." @@ -52121,7 +52209,7 @@ msgstr[1] "notatki ocalonego" msgstr[2] "notatki ocalonego" msgstr[3] "notatki ocalonego" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -52151,7 +52239,7 @@ msgstr[1] "karty wyników" msgstr[2] "kart wyników" msgstr[3] "kart wyników" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "Kolorowo wydrukowana karta wyników." @@ -52164,7 +52252,7 @@ msgstr[1] "strona z gazety" msgstr[2] "strona z gazety" msgstr[3] "strona z gazety" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -52177,7 +52265,7 @@ msgstr "" "informacji jest okropnie trywialna, lub przedawniona, ale jedna rzecz zwraca" " na chwilę twoją uwagę." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -52190,7 +52278,7 @@ msgstr "" "zawartych na nim informacji jest okropnie trywialna, lub przedawniona, ale " "jedna rzecz zwraca na chwilę twoją uwagę.  " -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -52202,7 +52290,7 @@ msgstr "" "informacji jest okropnie trywialna, lub przedawniona, ale jedna rzecz zwraca" " na chwilę twoją uwagę.  " -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -52213,7 +52301,7 @@ msgstr "" "Większość zawartych na nim informacji jest okropnie trywialna, lub " "przedawniona, ale jedna rzecz zwraca na chwilę twoją uwagę.  " -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -52225,7 +52313,7 @@ msgstr "" "okropnie trywialna, lub przedawniona, ale jedna rzecz zwraca na chwilę twoją" " uwagę." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -52245,7 +52333,7 @@ msgstr[1] "ulotki ze schronu" msgstr[2] "ulotki ze schronu" msgstr[3] "ulotki ze schronu" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -52900,7 +52988,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "" @@ -52913,7 +53002,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -52927,7 +53017,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "" @@ -52940,7 +53031,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "" @@ -52953,7 +53044,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "" @@ -52966,7 +53058,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "" @@ -52979,7 +53072,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" @@ -52992,7 +53086,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -53007,7 +53102,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -53044,7 +53140,7 @@ msgstr[1] "różne oprogramowanie" msgstr[2] "różne oprogramowanie" msgstr[3] "różne oprogramowanie" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "" @@ -53058,7 +53154,7 @@ msgstr[1] "hackPRO" msgstr[2] "hackPRO" msgstr[3] "hackPRO" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "Program hakerski." @@ -53097,7 +53193,7 @@ msgstr[1] "dane o infekcji" msgstr[2] "dane o infekcji" msgstr[3] "dane o infekcji" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Dane medyczne o krwi zombie." @@ -53110,7 +53206,7 @@ msgstr[1] "dane laboratoryjne" msgstr[2] "dane laboratoryjne" msgstr[3] "dane laboratoryjne" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "Archiwa naukowe z laboratorium rządowego." @@ -53123,7 +53219,7 @@ msgstr[1] "dane pociągów" msgstr[2] "dane pociągów" msgstr[3] "dane pociągów" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "Dane logistyczne o podziemnych liniach kolejowych i rozkładach jazdy." @@ -53136,7 +53232,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -53152,7 +53248,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -56572,7 +56669,7 @@ msgstr[1] "części zamienne" msgstr[2] "części zamienne" msgstr[3] "części zamienne" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -57107,17 +57204,20 @@ msgstr[1] "składana pałka (rozłożona)" msgstr[2] "składana pałka (rozłożona)" msgstr[3] "składana pałka (rozłożona)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "Złóż" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Składasz pałkę." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -57429,7 +57529,8 @@ msgstr[1] "okuta laska bojowa" msgstr[2] "okuta laska bojowa" msgstr[3] "okuta laska bojowa" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -57692,7 +57793,7 @@ msgstr[1] "laska bojowa" msgstr[2] "laska bojowa" msgstr[3] "laska bojowa" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -57709,7 +57810,7 @@ msgstr[1] "kamień w skarpecie" msgstr[2] "kamień w skarpecie" msgstr[3] "kamień w skarpecie" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "" @@ -57724,7 +57825,8 @@ msgstr[1] "zaostrzona szczoteczka do zębów" msgstr[2] "zaostrzona szczoteczka do zębów" msgstr[3] "zaostrzona szczoteczka do zębów" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "Przedmiot higieny osobistej zmienimy w kosę." @@ -58061,7 +58163,7 @@ msgstr[1] "naginata" msgstr[2] "naginata" msgstr[3] "naginata" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -58072,7 +58174,7 @@ msgstr "" "sposobem co katany i inne japońskie ostrza. Czasami używane przez samurajów " "we wczesnych erach, lub przez ich żony w obronie domu." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -58080,7 +58182,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -58096,7 +58198,8 @@ msgstr[1] "naginata ocalonych" msgstr[2] "naginata ocalonych" msgstr[3] "naginata ocalonych" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -58178,7 +58281,7 @@ msgstr[1] "dora" msgstr[2] "dora" msgstr[3] "dora" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "Solidna hoplicka włócznia z ostrzem z brązu, rodem z Grecji." @@ -58191,7 +58294,7 @@ msgstr[1] "ji" msgstr[2] "ji" msgstr[3] "ji" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -58278,7 +58381,7 @@ msgstr[1] "jian" msgstr[2] "jian" msgstr[3] "jian" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -58408,7 +58511,7 @@ msgstr[1] "nodachi" msgstr[2] "nodachi" msgstr[3] "nodachi" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -58417,7 +58520,7 @@ msgstr "" "Tępa, tania replika wielkiego zakrzywionego miecza dwuręcznego z Japonii. " "Zaskakująco lekki jak na swój rozmiar." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -58564,7 +58667,7 @@ msgstr[1] "kordelas" msgstr[2] "kordelas" msgstr[3] "kordelas" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -58685,7 +58788,7 @@ msgstr[1] "kris" msgstr[2] "kris" msgstr[3] "kris" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -58717,7 +58820,7 @@ msgstr[1] "pazury tygrysa" msgstr[2] "pazury tygrysa" msgstr[3] "pazury tygrysa" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -58749,7 +58852,8 @@ msgstr[1] "para mosiężnych kastetów" msgstr[2] "para mosiężnych kastetów" msgstr[3] "para mosiężnych kastetów" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -58786,7 +58890,8 @@ msgstr[1] "kastet z gwoździ" msgstr[2] "kastet z gwoździ" msgstr[3] "kastet z gwoździ" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -58803,7 +58908,8 @@ msgstr[1] "para stalowych kastetów" msgstr[2] "para stalowych kastetów" msgstr[3] "para stalowych kastetów" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -58916,7 +59022,7 @@ msgstr[1] "noże do rzucania" msgstr[2] "noży do rzucania" msgstr[3] "noży do rzucania" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -58949,14 +59055,15 @@ msgstr[1] "tafla szkła" msgstr[2] "tafla szkła" msgstr[3] "tafla szkła" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -58970,7 +59077,8 @@ msgstr[1] "tafla zbrojonego szkła" msgstr[2] "tafla zbrojonego szkła" msgstr[3] "tafla zbrojonego szkła" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "Duża tafla szkła wzmocnionego stalowym odrutowaniem." @@ -58983,7 +59091,8 @@ msgstr[1] "szyba zbrojonego szkła" msgstr[2] "szyba zbrojonego szkła" msgstr[3] "szyba zbrojonego szkła" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "Mała szyba ze szkła zbrojonego stalowym oplotem." @@ -59088,7 +59197,7 @@ msgstr[1] "złom miedziany" msgstr[2] "złom miedziany" msgstr[3] "złom miedziany" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "Kawałek miedzi, do wykorzystania w wytwarzaniu lub naprawach." @@ -59161,7 +59270,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "" @@ -59174,7 +59283,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "" @@ -59558,21 +59667,28 @@ msgstr[1] "zamknięty słój z jajami" msgstr[2] "zamknięty słój z jajami" msgstr[3] "zamknięty słój z jajami" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Otwórz słój" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Otwierasz słój, wystawiając go na działanie powietrza." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -59588,7 +59704,8 @@ msgstr[1] "zamknięty słój z korniszonami" msgstr[2] "zamknięty słój z korniszonami" msgstr[3] "zamknięty słój z korniszonami" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -59605,7 +59722,8 @@ msgstr[1] "zamknięty słój kiszonej kapusty" msgstr[2] "zamknięty słój kiszonej kapusty" msgstr[3] "zamknięty słój kiszonej kapusty" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -60332,7 +60450,7 @@ msgstr[1] "pudełka ze zdalnie sterowanym samochodem" msgstr[2] "pudełek ze zdalnie sterowanym samochodem" msgstr[3] "pudełek ze zdalnie sterowanym samochodem" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -60457,7 +60575,8 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -60531,7 +60650,8 @@ msgstr[1] "para szydełek" msgstr[2] "para szydełek" msgstr[3] "para szydełek" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -60642,7 +60762,8 @@ msgstr[1] "wrzeciono i kądziel" msgstr[2] "wrzeciono i kądziel" msgstr[3] "wrzeciono i kądziel" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -60780,7 +60901,7 @@ msgstr[1] "oprawa akumulatora" msgstr[2] "oprawa akumulatora" msgstr[3] "oprawa akumulatora" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -60797,7 +60918,7 @@ msgstr[1] "drewniany kadłub łodzi" msgstr[2] "drewniany kadłub łodzi" msgstr[3] "drewniany kadłub łodzi" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -60815,7 +60936,7 @@ msgstr[1] "plastikowy kadłub łodzi" msgstr[2] "plastikowy kadłub łodzi" msgstr[3] "plastikowy kadłub łodzi" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -60853,7 +60974,7 @@ msgstr[1] "wiosła" msgstr[2] "wiosła" msgstr[3] "wiosła" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Wiosła do łódki." @@ -60866,7 +60987,7 @@ msgstr[1] "żagle" msgstr[2] "żagli" msgstr[3] "żagli" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "Żagle do łodzi." @@ -60879,7 +61000,8 @@ msgstr[1] "nadmuchiwana sekcja" msgstr[2] "nadmuchiwana sekcja" msgstr[3] "nadmuchiwana sekcja" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "Nadmuchiwana sekcja łódki." @@ -60892,7 +61014,8 @@ msgstr[1] "nadmuchiwana poduszka powietrzna" msgstr[2] "nadmuchiwana poduszka powietrzna" msgstr[3] "nadmuchiwana poduszka powietrzna" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "Nadmuchiwana poduszka powietrzna." @@ -61094,7 +61217,8 @@ msgstr[1] "zestawy układu sterowania pojazdu" msgstr[2] "zestawów układu sterowania pojazdu" msgstr[3] "układu sterowania pojazdu" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "" @@ -61166,7 +61290,8 @@ msgstr[1] "zestawy elektronicznego układu sterowania" msgstr[2] "zestawów elektronicznego układu sterowania" msgstr[3] "elektronicznego układu sterowania" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -61183,7 +61308,7 @@ msgstr[1] "jednostka sterowania robotycznego" msgstr[2] "jednostka sterowania robotycznego" msgstr[3] "jednostka sterowania robotycznego" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -61402,7 +61527,7 @@ msgstr[1] "zbierak do pojazdu" msgstr[2] "zbierak do pojazdu" msgstr[3] "zbierak do pojazdu" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -61419,7 +61544,7 @@ msgstr[1] "sadzarka" msgstr[2] "sadzarka" msgstr[3] "sadzarka" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -61437,7 +61562,7 @@ msgstr[1] "żniwiarz" msgstr[2] "żniwiarz" msgstr[3] "żniwiarz" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -61491,7 +61616,7 @@ msgstr[1] "pług" msgstr[2] "pług" msgstr[3] "pług" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "Ciężki zbiór kół i stalowych ostrzy, które odwracają ziemię." @@ -61673,7 +61798,8 @@ msgstr[1] "światła ostrzegawcze (czerwone)" msgstr[2] "światła ostrzegawcze (czerwone)" msgstr[3] "światła ostrzegawcze (czerwone)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -61691,7 +61817,8 @@ msgstr[1] "światła ostrzegawcze (niebieskie)" msgstr[2] "światła ostrzegawcze (niebieskie)" msgstr[3] "światła ostrzegawcze (niebieskie)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -61740,7 +61867,8 @@ msgstr[1] "zestaw obręczy ręcznych" msgstr[2] "zestaw obręczy ręcznych" msgstr[3] "zestaw obręczy ręcznych" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "Obręcze ręczne z wózka inwalidzkiego." @@ -62523,7 +62651,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "" @@ -62536,7 +62664,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "" @@ -62966,9 +63094,8 @@ msgstr[3] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -77832,7 +77959,7 @@ msgstr[1] "jagnię" msgstr[2] "jagnię" msgstr[3] "jagnię" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -87104,7 +87231,8 @@ msgstr[3] "hełm górniczy (wł.)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -87755,12 +87883,14 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -115137,10 +115267,10 @@ msgid "" msgstr "" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "słoma" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "Bela siana. Możesz na niej spać jeśli jesteś zdesperowany." @@ -184266,7 +184396,7 @@ msgid "Clothing Store" msgstr "Sklep z Ubraniami" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." +msgid "You there. Quiet down. Can you hear it? The song?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -184274,7 +184404,7 @@ msgid "You're back. Have you come to listen to the song?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" +msgid "Acolyte." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184422,42 +184552,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184530,13 +184660,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184768,14 +184898,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184950,16 +185080,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "Cześć, ." - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "Cześć, ." + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "Co tu robisz?" @@ -185031,24 +185161,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "Nie, po prostu nie..." +msgid "Anything to do before I go to sleep?" +msgstr "Jeszcze coś do zrobienia zanim pójdę spać?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "Po prostu pozwól mi spać, !" +msgid "Just few minutes more..." +msgstr "Jeszcze kilka minut..." #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Tylko szybko, chcę spać." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Jeszcze kilka minut..." +msgid "Just let me sleep, !" +msgstr "Po prostu pozwól mi spać, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "Jeszcze coś do zrobienia zanim pójdę spać?" +msgid "No, just no..." +msgstr "Nie, po prostu nie..." #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -185162,15 +185292,15 @@ msgid "Let's go." msgstr "Idziemy." #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185178,19 +185308,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185198,7 +185324,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -185206,7 +185332,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185214,19 +185340,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185234,7 +185360,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185242,13 +185368,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -185357,13 +185487,12 @@ msgid "Attack anything you want." msgstr "Atakuj co chcesz." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185373,11 +185502,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185417,12 +185547,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185432,12 +185562,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185473,19 +185603,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185529,7 +185659,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185537,11 +185667,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185549,7 +185675,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185557,7 +185683,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185565,7 +185691,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185573,7 +185699,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185581,7 +185707,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185589,7 +185715,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185597,13 +185723,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Stosuj takie zasady jak ten tutaj towarzysz." @@ -185772,14 +185902,14 @@ msgstr "" msgid "Sure thing, I'll make my way there." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -185950,28 +186080,28 @@ msgid "I don't care." msgstr "Nie obchodzi mnie to." #: 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ć?" - -#: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Mam tylko jedną robotę. Chcesz posłuchać?" +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 "Mam inne zadania dla ciebie. Chcesz o nich usłyszeć?" +msgid "I don't have any jobs for you." +msgstr "Nie mam żadnych prac dla ciebie." #: 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 -msgid "I don't have any jobs for you." -msgstr "Nie mam żadnych prac dla ciebie." +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 don't have any more jobs for you." -msgstr "Nie mam już więcej prac dla ciebie." +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 another job for you. Want to hear about it?" +msgstr "Mam kolejną robotę dla ciebie. Chcesz o niej usłyszeć?" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -185982,10 +186112,6 @@ msgstr "Oh, okej." msgid "Never mind, I'm not interested." msgstr "Nieważne, nie jestem zainteresowany." -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "Nie pracujesz teraz nad żadnym moim zleceniem." - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Która praca?" @@ -185994,6 +186120,10 @@ msgstr "Która praca?" msgid "What about it?" msgstr "Co ty na to?" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "Nie pracujesz teraz nad żadnym moim zleceniem." + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Zrobię to." @@ -186210,49 +186340,49 @@ msgstr "Hmmm, okej." msgid "Thanks!" msgstr "Dzięki!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "Skup się na drodze, kolego!" - #: lang/json/talk_topic_from_json.py msgid "I must focus on the road!" msgstr "Muszę się skupić na drodze!" #: lang/json/talk_topic_from_json.py -msgid "I'm too thirsty, give me something to drink." -msgstr "Pragnienie mnie męczy, daj mi coś do picia." +msgid "I have some reason for not telling you." +msgstr "Mam swoje powody by ci nie mówić." #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Żołądek mnie ssie, daj mi coś do jedzenia." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." 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 "" +msgid "I'm too hungry, give me something to eat." +msgstr "Żołądek mnie ssie, daj mi coś do jedzenia." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." -msgstr "Mam swoje powody by ci nie mówić." +msgid "I'm too thirsty, give me something to drink." +msgstr "Pragnienie mnie męczy, daj mi coś do picia." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "Skup się na drodze, kolego!" #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Oh, okej." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Nie, dopóki nie dostanę antybiotyków..." +msgid "Why should I travel with you?" +msgstr "Czemu mam z tobą podróżować?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Niedawno mnie o to pytałeś. Poproś później." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "Czemu mam z tobą podróżować?" +msgid "Not until I get some antibiotics..." +msgstr "Nie, dopóki nie dostanę antybiotyków..." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -186342,21 +186472,21 @@ msgstr "Nie, tu nam dobrze." msgid "On second thought, never mind." msgstr "Po zastanowieniu się, jednak nieważne." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -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 "Nie jestem w stanie cię trenować gdy prowadzę pojazd!" +#: lang/json/talk_topic_from_json.py +msgid "I have some reason for denying you training." +msgstr "Mam swoje powody, by odmówić ci szkolenia." + #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "Odczekaj trochę, później pokażę ci cos nowego..." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "Mam swoje powody, by odmówić ci szkolenia." +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Nie jestem w stanie cię trenować gdy prowadzisz pojazd!" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -186394,14 +186524,14 @@ msgstr "Wolę zachować to dla siebie." msgid "I understand…" msgstr "Rozumiem..." -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Dopiero mnie pytałeś o sprzęt. Zapytaj później." - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "Czemu mam się dzielić ekwipunkiem?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Dopiero mnie pytałeś o sprzęt. Zapytaj później." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "Okej, w porządku." @@ -186544,16 +186674,16 @@ msgstr "Miło było robić interesy!" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "Witaj ponownie. *ksss*" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "Witaj ponownie. *ksss*" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "" @@ -187549,15 +187679,15 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." +msgid "Greeting citizen, what brings you to the FoodLair?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" +msgid "Greetings friend, it's nice to see you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -187565,11 +187695,11 @@ msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -189178,10 +189308,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "Nie mogę na razie o tym mówić. Nie potrafię." - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -189190,7 +189316,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -189201,10 +189328,13 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "Nie mogę na razie o tym mówić. Nie potrafię." + #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." msgstr "Mogę pomóc zdjąć to z twoich barków." @@ -189600,21 +189730,21 @@ msgstr "Dziękuję, że mi to powiedziałeś. " #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Mój mąż zdołał uciec ze mną, ale pożarł go jeden z tych roślinnych " -"potworów kilka dni przed tym jak cię spotkałem. To nie był dla mnie " -"najlepszy rok." +"Moja żona zdołała uciec ze mną, ale pożarł ją jeden z tych " +"roślinnych potworów kilka dni przed tym jak cię spotkałem. To nie był dla " +"mnie najlepszy rok." #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Moja żona zdołała uciec ze mną, ale pożarł ją jeden z tych " -"roślinnych potworów kilka dni przed tym jak cię spotkałem. To nie był dla " -"mnie najlepszy rok." +"Mój mąż zdołał uciec ze mną, ale pożarł go jeden z tych roślinnych " +"potworów kilka dni przed tym jak cię spotkałem. To nie był dla mnie " +"najlepszy rok." #: lang/json/talk_topic_from_json.py msgid "I'm sorry to hear it." @@ -189674,9 +189804,10 @@ msgid "I'm sorry you lost someone." msgstr "Przykro mi że kogoś straciłeś." #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" -msgstr "Powiedziałem, nie chcę o tym mówić. Czemu tego nie rozumiesz?" +msgid "Just another tale of love and loss. Not one I like to tell." +msgstr "" +"To tylko kolejna bajka o miłości i stracie. Nic nad czym lubiłbym " +"się rozwodzić." #: lang/json/talk_topic_from_json.py msgid "" @@ -189687,10 +189818,9 @@ msgstr "" "jeszcze raz ją opowiem." #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." -msgstr "" -"To tylko kolejna bajka o miłości i stracie. Nic nad czym lubiłbym " -"się rozwodzić." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" +msgstr "Powiedziałem, nie chcę o tym mówić. Czemu tego nie rozumiesz?" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -189713,51 +189843,51 @@ msgid "" "Oh, . This doesn't have anything to do with you, or with us." msgstr "Oh, . To nie ma nic wspólnego z tobą, ani z nami." -#: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." -msgstr "W porządku. Miałam kogoś. I jego straciłam." - #: lang/json/talk_topic_from_json.py msgid "All right, fine. I had someone. I lost her." msgstr "W porządku. Miałem kogoś. I ją straciłem." +#: lang/json/talk_topic_from_json.py +msgid "All right, fine. I had someone. I lost him." +msgstr "W porządku. Miałam kogoś. I jego straciłam." + #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"Był w domu gdy bomby spadły i świat poszedł w diabły. Byłam w pracy. " -"Starałam się dostać do naszego domu, ale miasto zmieniło się w strefę wojny." +"Była w domu gdy bomby spadły i świat poszedł w diabły. Byłem w pracy. " +"Starałem się dostać do naszego domu, ale miasto zmieniło się w strefę wojny." " Rzeczy, których nie potrafię opisać latały po ulicach, miażdżąc ludzi i " "samochody. Żołnierze próbowali je zatrzymać, ale trafiali w krzyżowym ogniu " "cywili na równi ze wszystkim innym. Po czym straty w cywilach powstały by " -"przyłączyć się do wrogów. Gdyby nie mój mąż, po prostu bym odeszła, ale " -"robiłam co mogłam i się prześliznęłam. Cudem uszłam z życiem." +"przyłączyć się do wrogów. Gdyby nie moja żona, po prostu bym odszedł, ale " +"robiłem co mogłem i się prześliznąłem. Cudem uszedłem z życiem." #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"Była w domu gdy bomby spadły i świat poszedł w diabły. Byłem w pracy. " -"Starałem się dostać do naszego domu, ale miasto zmieniło się w strefę wojny." +"Był w domu gdy bomby spadły i świat poszedł w diabły. Byłam w pracy. " +"Starałam się dostać do naszego domu, ale miasto zmieniło się w strefę wojny." " Rzeczy, których nie potrafię opisać latały po ulicach, miażdżąc ludzi i " "samochody. Żołnierze próbowali je zatrzymać, ale trafiali w krzyżowym ogniu " "cywili na równi ze wszystkim innym. Po czym straty w cywilach powstały by " -"przyłączyć się do wrogów. Gdyby nie moja żona, po prostu bym odszedł, ale " -"robiłem co mogłem i się prześliznąłem. Cudem uszedłem z życiem." +"przyłączyć się do wrogów. Gdyby nie mój mąż, po prostu bym odeszła, ale " +"robiłam co mogłam i się prześliznęłam. Cudem uszłam z życiem." #: lang/json/talk_topic_from_json.py msgid "You must have seen some shit." @@ -189827,11 +189957,11 @@ msgstr "Dostałeś się do wnętrza domu?" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -189839,11 +189969,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -190614,6 +190744,16 @@ msgstr "" "wiernych nadeszło, a ja zostałem w tyle. Więc teraz, jak sądzę, kroczę przez" " piekło na ziemi. Szkoda, że nie słuchałem na szkółce niedzielnej." +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -190625,16 +190765,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -190730,14 +190860,6 @@ msgstr "Przykro mi z powodu Buck'a. " msgid "I'm sorry about Buck. " msgstr "Przykro mi z powodu Buck'a. " -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "" -"Jak już mówiłem, chcesz posłuchać ode mnie historii, stawiasz whiskey. Pełna" -" butelka, przypominam." - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " @@ -190746,6 +190868,14 @@ msgstr "" "Słuchaj. Krótka piłka. Pracuję dla ciebie, ok? Nie jestem zainteresowany by " "się przywiązywać. Nie zapłaciłeś mi za bycie twoim przyjacielem." +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "" +"Jak już mówiłem, chcesz posłuchać ode mnie historii, stawiasz whiskey. Pełna" +" butelka, przypominam." + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -191129,20 +191259,6 @@ msgstr "" " jestem tchórzem, ale teraz wiem ze gdybym został byłbym kolejnym cieknącym " "trupem." -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm" -" just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." -msgstr "" -"Cóż, mam taką dziwną nadzieję. Pewnie to głupota, ale widziałem narzeczonego" -" zwiewającego stamtąd z jego siostrą - a moim świadkiem - w tym pickupie gdy" -" sprawy wymknęły się spod kontroli. Więc, zanim nie wpadnę na nich tak czy " -"inaczej, będę nadal wierzyć, że gdzieś tam są, i im się wiedzie. To więcej " -"niż na co większość z nasz może liczyć." - #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancée " @@ -191157,10 +191273,28 @@ msgstr "" "inaczej, będę nadal wierzyć, że gdzieś tam są, i im się wiedzie. To więcej " "niż na co większość z nasz może liczyć." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm" +" just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" +"Cóż, mam taką dziwną nadzieję. Pewnie to głupota, ale widziałem narzeczonego" +" zwiewającego stamtąd z jego siostrą - a moim świadkiem - w tym pickupie gdy" +" sprawy wymknęły się spod kontroli. Więc, zanim nie wpadnę na nich tak czy " +"inaczej, będę nadal wierzyć, że gdzieś tam są, i im się wiedzie. To więcej " +"niż na co większość z nasz może liczyć." + #: lang/json/talk_topic_from_json.py msgid "What were you saying before that?" msgstr "O czym to mówiłeś wcześniej?" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "Hej tam." @@ -191181,10 +191315,6 @@ msgstr "" msgid "How's the weather?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "Co to za miejsce?" @@ -191271,16 +191401,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191327,15 +191457,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -191369,15 +191499,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191420,14 +191550,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191496,11 +191626,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -191557,11 +191687,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191573,19 +191703,19 @@ msgid "You're disgusting." msgstr "Jesteś obrzydliwy." #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191611,9 +191741,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -191621,7 +191749,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191696,13 +191826,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -191796,7 +191926,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -191804,7 +191934,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -192102,11 +192232,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -192305,8 +192435,12 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "Marszalu, mam nadzieję że jesteś tu by nas wesprzeć." +msgid "" +"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 "" +"Sir, nie wiem jak u licha się tu Pan dostał ale jeśli ma Pan choć trochę " +"oleju w głowie to zabierze się Pan stąd puki może." #: lang/json/talk_topic_from_json.py msgid "" @@ -192317,12 +192451,8 @@ msgstr "" "trochę oleju w głowie to zabierze się Pani stąd puki może." #: 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 " -"you'll get out while you can." -msgstr "" -"Sir, nie wiem jak u licha się tu Pan dostał ale jeśli ma Pan choć trochę " -"oleju w głowie to zabierze się Pan stąd puki może." +msgid "Marshal, I hope you're here to assist us." +msgstr "Marszalu, mam nadzieję że jesteś tu by nas wesprzeć." #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -192400,16 +192530,16 @@ 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." -msgstr "Marszalu, jestem poniekąd zdziwiony twoją tu obecnością." +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "Marszalu, jestem poniekąd zdziwiony twoją tu obecnością." #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -192452,22 +192582,6 @@ msgstr "" "zapewnić integralność systemów łączności. Liczymy na to, że nadawanie " "czystym tekstem będzie mimo tego uchwytne." -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "Witaj marszalu." - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "Marszalu, obawiam się że nie mogę teraz rozmawiać." - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "Ja tu nie dowodzę, marszalu." - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "Mam polecenie odsyłać wszelkie pytania do mojego dowództwa, marszalu." - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "" @@ -192480,6 +192594,16 @@ msgstr "Powinieneś pilnować własnego nosa, nic tu nie ma do oglądania." msgid "If you need something you'll need to talk to someone else." msgstr "Jak czegoś chcesz to pogadaj z kimś innym." +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "Pani." + +#: lang/json/talk_topic_from_json.py +msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgstr "" +"Hej panienko, nie sądzisz że będzie bezpieczniej jak się będziesz trzymać ze" +" mną?" + #: lang/json/talk_topic_from_json.py msgid "Sir." msgstr "Sir." @@ -192489,14 +192613,20 @@ msgid "Dude, if you can hold your own you should look into enlisting." msgstr "Koleś, jak dajesz radę ogarniać, to powinieneś się zaciągnąć." #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "Pani." +msgid "Hello, marshal." +msgstr "Witaj marszalu." #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" -msgstr "" -"Hej panienko, nie sądzisz że będzie bezpieczniej jak się będziesz trzymać ze" -" mną?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "Marszalu, obawiam się że nie mogę teraz rozmawiać." + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "Ja tu nie dowodzę, marszalu." + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." +msgstr "Mam polecenie odsyłać wszelkie pytania do mojego dowództwa, marszalu." #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -192553,15 +192683,16 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "" +msgid "Please, help me. I need food." +msgstr "Proszę pomóż mi, potrzebuję żywności." #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" +"Proszę, pomóż mi. Potrzebuję pożywienia. Nie jesteś aby ich szeryfem? Nie " +"możesz mi pomóc?" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -192569,15 +192700,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" -"Proszę, pomóż mi. Potrzebuję pożywienia. Nie jesteś aby ich szeryfem? Nie " -"możesz mi pomóc?" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "Proszę pomóż mi, potrzebuję żywności." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -192596,17 +192726,17 @@ msgstr "Odejdź ode mnie." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" +"Oni mnie nie wpuszczą. Mówią że już są zapełnieni. Wolno mi tu obozować, " +"jeśli po sobie sprzątam i nie robię problemów, ale jestem tak głodny." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" -"Oni mnie nie wpuszczą. Mówią że już są zapełnieni. Wolno mi tu obozować, " -"jeśli po sobie sprzątam i nie robię problemów, ale jestem tak głodny." #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -192711,13 +192841,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -192761,17 +192891,17 @@ 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?" -msgstr "Czy mówiłem ci już o kartonie przyjacielu? Czy masz może jakiś?" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "" +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…" @@ -192801,16 +192931,16 @@ msgstr "Na serio nosisz ten kostium dinozaura?" msgid "Do you need something to eat?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -192909,15 +193039,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. Thanks." +" You've helped me a lot. I'm feeling much more myself with all this to " +"keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. Thanks." -" You've helped me a lot. I'm feeling much more myself with all this to " -"keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -192937,15 +193067,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "" +msgid "Don't bother with these assholes." +msgstr "Nie przejmuje się tymi dupkami." #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -192955,19 +193088,16 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "Nie przejmuje się tymi dupkami." +msgid "Fuck off, dickwaddle." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -193278,16 +193408,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -193332,14 +193462,14 @@ msgstr "" msgid "I'll see what I can do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "Hej, jesteś wielkim fanem przeżycia najlepszych?" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "Czemu pytasz?" @@ -193356,12 +193486,6 @@ msgstr "" msgid "Nice to see you. I gotta be going though." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " @@ -193370,6 +193494,12 @@ msgstr "" "Bo ja, to pewne, do najlepszych nie należę, więc posiedzę tu aż umrę z " "głodu. Pomożesz biednej duszy w potrzebie?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "" @@ -193391,12 +193521,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "Czemu tu obozujesz skoro cię nie wpuszczą?" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -193683,6 +193813,10 @@ msgstr "" msgid "What's your take on the situation here?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "O, hej, to znowu ty." @@ -193695,10 +193829,6 @@ msgstr "" msgid "Aw hey, look who's back." msgstr "Hej, zobacz, kto wrócił." -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "Miło mi cię poznać, dzieciaku. Co tam?" @@ -193716,16 +193846,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "Nie jestem dzieckiem, okej? Mam szesnaście lat." +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "Nie jestem dzieckiem, okej? Mam czternaście lat." #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "Nie jestem dzieckiem, okej? Mam piętnaście lat." #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "Nie jestem dzieckiem, okej? Mam czternaście lat." +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "Nie jestem dzieckiem, okej? Mam szesnaście lat." #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -193735,6 +193865,18 @@ msgstr "Wybacz, nie chciałem cię urazić. Co tam?" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "Wybacz, nie chciałem cię urazić. Zbieram się w drogę." +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" +"Nie wiem co tam. Nie jestem nawet pewien co my tutaj robimy. Oni mówią, że " +"powinniśmy czekać zanim będziemy mogli być przeniesieni do schronu na dole, " +"ale jesteśmy tu już od dni i nie było słowa ile to jeszcze będzie trwać. To " +"wszystko takie głupie i nikt mi nic nie mówi." + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -193748,18 +193890,6 @@ msgstr "" " że to się wydarzy. Nie wiem co tu robimy. Przeczytałem wszystkie książki, a" " na zewnątrz są zombie więc utknęliśmy tutaj. Słychać je w nocy." -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" -"Nie wiem co tam. Nie jestem nawet pewien co my tutaj robimy. Oni mówią, że " -"powinniśmy czekać zanim będziemy mogli być przeniesieni do schronu na dole, " -"ale jesteśmy tu już od dni i nie było słowa ile to jeszcze będzie trwać. To " -"wszystko takie głupie i nikt mi nic nie mówi." - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -193797,7 +193927,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -193807,8 +193938,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -193838,33 +193968,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -193893,6 +194023,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -193901,9 +194037,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" +"W centrum Alonso można się czuć samotnym. Mamy jednak kilku odważnych, " +"silnych podróżników takich jak ty, a ich widok rozjaśnia dzień." #: lang/json/talk_topic_from_json.py msgid "" @@ -193914,12 +194052,8 @@ msgstr "" "ale widok podróżników takich jak ty zawsze rozjaśnia mój dzień." #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." -msgstr "" -"W centrum Alonso można się czuć samotnym. Mamy jednak kilku odważnych, " -"silnych podróżników takich jak ty, a ich widok rozjaśnia dzień." +msgid "Ah, another new face. Hello. I am Boris." +msgstr "Ach, kolejna nowa twarz. Cześć. Jestem Boris." #: lang/json/talk_topic_from_json.py msgid "Well, well. I'm glad you are back." @@ -193933,10 +194067,6 @@ msgstr "Witaj ponownie, przyjacielu." msgid "It is good to see you again." msgstr "Miło znów cię widzieć." -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "Ach, kolejna nowa twarz. Cześć. Jestem Boris." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -194010,13 +194140,6 @@ msgstr "Przykro mi. Co mówiłeś wcześniej?" msgid "I'm sorry. I'd better get going." msgstr "Przykro mi. Lepiej już pójdę." -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -194027,6 +194150,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -194057,6 +194187,10 @@ msgstr "" msgid "Got any more bread I can trade flour for?" msgstr "Masz jeszcze chleb, za który mogę wymienić mąkę?" +#: lang/json/talk_topic_from_json.py +msgid "Hi there. I'm Dana, nice to see a new face." +msgstr "Witaj. Jestem Dana, miło widzieć nową twarz." + #: lang/json/talk_topic_from_json.py msgid "Hello, nice to see you again." msgstr "Cześć, miło znów cię widzieć." @@ -194065,10 +194199,6 @@ msgstr "Cześć, miło znów cię widzieć." msgid "It's good to see you're still around." msgstr "Dobrze widzieć, że nadal jesteś tutaj." -#: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." -msgstr "Witaj. Jestem Dana, miło widzieć nową twarz." - #: lang/json/talk_topic_from_json.py msgid "Dana, hey? Nice to meet you." msgstr "Boris, czy tak? Miło cię poznać." @@ -194118,8 +194248,10 @@ msgstr "Przykro mi z powodu twojej straty." #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -194130,10 +194262,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -194155,6 +194285,14 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" +"Świetnie, oto bochenek z mojego lokalnego, mało dojrzałego zakwasu. Szczerze" +" mówiąc, nie jest taki zły. Wydaje się, że wszystkim tu się podoba." + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -194178,14 +194316,6 @@ msgstr "" "Mam nadzieję, że podoba ci się tak samo jak mi, to teraz najlepszy cholerny " "chleb na świecie." -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" -"Świetnie, oto bochenek z mojego lokalnego, mało dojrzałego zakwasu. Szczerze" -" mówiąc, nie jest taki zły. Wydaje się, że wszystkim tu się podoba." - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -194215,10 +194345,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -194226,6 +194352,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -194262,16 +194392,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "Miło mi cię poznać, Draco." @@ -194511,12 +194641,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -194626,14 +194756,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -194684,6 +194814,12 @@ msgstr "" msgid "Is there anything I can do to help you out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "Witaj ponownie." @@ -194696,12 +194832,6 @@ msgstr "" msgid "Oh, hi." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "" @@ -194763,6 +194893,10 @@ msgid "" " I'm pretty nervous about going outside." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgstr "Hej. Witaj. Jestem Garry, Garry Villeneuve." + #: lang/json/talk_topic_from_json.py msgid "Well, hello." msgstr "Cóż, witaj." @@ -194771,10 +194905,6 @@ msgstr "Cóż, witaj." msgid "Good to see you again." msgstr "Dobrze Cię znowu widzieć." -#: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." -msgstr "Hej. Witaj. Jestem Garry, Garry Villeneuve." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Garry." msgstr "Miło mi cię poznać, Garry." @@ -194837,6 +194967,12 @@ msgid "" "look like we'll be here for the long term. If we live that long." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hi." msgstr "Cześć." @@ -194845,12 +194981,6 @@ msgstr "Cześć." msgid "Hey again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "" @@ -194897,15 +195027,15 @@ msgid "" " I think my mom's on the fence." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." -msgstr "Miło znów cię widzieć." - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "Cześć. Nie widziałam cię tu wcześniej. Jestem Jenny. Jenny Forcette." +#: lang/json/talk_topic_from_json.py +msgid "Nice to see you again." +msgstr "Miło znów cię widzieć." + #: lang/json/talk_topic_from_json.py msgid "Nice meeting you. What are you doing on that computer?" msgstr "Miło poznać. Co robisz na tym komputerze?" @@ -195095,6 +195225,19 @@ msgstr "" "jedzenia, i towarzystwa sobie nie dobieraliśmy. Nie wiem jak długo to się " "utrzyma zanim komuś odbije." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" +"Cóż, cała nasza hałastra. Zaczynamy formować drobną społeczność. Fatima i " +"jak pracujemy od czasu do czasu razem, i przebywam często z Daną, Draco i " +"Aleeshą. Nie znam zbyt dobrze bandy Boryszenków, Singhów, Vanessy, Uyena ani" +" Rhyzy, ale rozmawiamy czasami. Co chciałbyś wiedzieć?" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -195114,19 +195257,6 @@ msgstr "" "Uyen i Rhyzea ciągle marudzą o decyzjach przywództwa, jakby sami mieli coś " "do powiedzenia. Co chciałbyś wiedzieć?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" -"Cóż, cała nasza hałastra. Zaczynamy formować drobną społeczność. Fatima i " -"jak pracujemy od czasu do czasu razem, i przebywam często z Daną, Draco i " -"Aleeshą. Nie znam zbyt dobrze bandy Boryszenków, Singhów, Vanessy, Uyena ani" -" Rhyzy, ale rozmawiamy czasami. Co chciałbyś wiedzieć?" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "Co mi możesz powiedzieć o Wolnych Kupcach?" @@ -195196,22 +195326,6 @@ msgid "" "hope that there's a future to be had." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I didn't get to know Boris, Garry, and Stan so well for the first while. " -"They kinda kept to themselves. Boris and Garry had just lost their son, you" -" know. It's pretty lucky that Stan was with them, he's Boris' little " -"brother. Together, they're a pretty good team. I feel bad for thinking " -"they were standoffish before. They probably do the most to pull their " -"weight around here whenever there's work to be done." -msgstr "" -"Z początku nie poznałam zbytnio Borysa, Garrego i Stana. Trzymali się w " -"swojej grupie. Borys i Garry stracili syna, nie wiem czy wiesz. Szczęśliwie " -"Stan był z nimi, jest młodszym bratem Borysa. Stanowią razem dobry zespół. " -"Przykro mi, że myślałam, że odnoszą się do wszystkich z rezerwą. " -"Prawdopodobnie najlepiej sobie radzą z utrzymaniem się jeśli chodzi o robotę" -" do wykonania." - #: lang/json/talk_topic_from_json.py msgid "" "Boris and Garry are married, I guess. They kinda keep to themselves, they " @@ -195227,12 +195341,19 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The Singhs are really shy, and I think they feel pretty bad about making it " -"through this together. They're the only complete family I've seen since " -". That has to feel really weird, and I think it's made them " -"stick really close together. I think… I think they also just don't really " -"like any of us." +"I didn't get to know Boris, Garry, and Stan so well for the first while. " +"They kinda kept to themselves. Boris and Garry had just lost their son, you" +" know. It's pretty lucky that Stan was with them, he's Boris' little " +"brother. Together, they're a pretty good team. I feel bad for thinking " +"they were standoffish before. They probably do the most to pull their " +"weight around here whenever there's work to be done." msgstr "" +"Z początku nie poznałam zbytnio Borysa, Garrego i Stana. Trzymali się w " +"swojej grupie. Borys i Garry stracili syna, nie wiem czy wiesz. Szczęśliwie " +"Stan był z nimi, jest młodszym bratem Borysa. Stanowią razem dobry zespół. " +"Przykro mi, że myślałam, że odnoszą się do wszystkich z rezerwą. " +"Prawdopodobnie najlepiej sobie radzą z utrzymaniem się jeśli chodzi o robotę" +" do wykonania." #: lang/json/talk_topic_from_json.py msgid "" @@ -195248,14 +195369,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… I'm doing my best, I really am, but we just do not get along. One " -"of these days one of us is probably going to brain the other with a tire " -"iron, and I'm just grateful I spend more time around the tire irons. Uyen " -"and Rhyzaea are both excellent people, and I genuinely like them, but I " -"can't stand this ongoing political bullshit they've got going on. Alonso is" -" just a… he's… there's no polite word for what he is. A lot of the others " -"are fine with it, and okay, sure, I guess. John is a walking stereotype, " -"but he's a great poker buddy. I admit I kinda like him." +"The Singhs are really shy, and I think they feel pretty bad about making it " +"through this together. They're the only complete family I've seen since " +". That has to feel really weird, and I think it's made them " +"stick really close together. I think… I think they also just don't really " +"like any of us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -195271,7 +195389,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Howdy, pardner." +msgid "" +"Vanessa… I'm doing my best, I really am, but we just do not get along. One " +"of these days one of us is probably going to brain the other with a tire " +"iron, and I'm just grateful I spend more time around the tire irons. Uyen " +"and Rhyzaea are both excellent people, and I genuinely like them, but I " +"can't stand this ongoing political bullshit they've got going on. Alonso is" +" just a… he's… there's no polite word for what he is. A lot of the others " +"are fine with it, and okay, sure, I guess. John is a walking stereotype, " +"but he's a great poker buddy. I admit I kinda like him." msgstr "" #: lang/json/talk_topic_from_json.py @@ -195279,6 +195405,10 @@ msgid "" "Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Howdy, pardner." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -195333,11 +195463,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -195380,15 +195510,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -195593,12 +195723,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -195689,17 +195819,17 @@ msgid "Do you want to talk about your story?" msgstr "Chcesz porozmawiać o swojej historii?" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -195817,10 +195947,6 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "Oh, jesteś z powrotem. " - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " @@ -195829,6 +195955,10 @@ msgstr "" "O, wspaniale. Kolejna nowa gęba do karmienia? Wszystko czego potrzebujemy. " "Cóż, ja jestem Vanessa." +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "Oh, jesteś z powrotem. " + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "Nie jestem nową gębą do karmienia, ale ciebie też miło poznać." @@ -195870,14 +196000,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -195886,6 +196008,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -196064,15 +196194,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -196461,14 +196591,14 @@ msgstr "Zachowuj się, bo inaczej przyprowadzę cię do porządku." msgid "Just on watch, move along." msgstr "Tylko stróżuję, ruszaj dalej." -#: lang/json/talk_topic_from_json.py -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 "Rough out there, isn't it?" msgstr "Ostro tam na zewnątrz, nie?" +#: lang/json/talk_topic_from_json.py +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…" msgstr "" @@ -196497,14 +196627,14 @@ msgstr "" msgid "Well, I'd better be going. Bye." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "Witaj marszalu..." - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "Witaj..." +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "Witaj marszalu..." + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -196751,14 +196881,14 @@ msgid "" "attacked by zombie hordes, as you might guess." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "Marszalu..." - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "Obywatelu..." +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "Marszalu..." + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "Czy mogę pohandlować i kupić zapasy?" @@ -196826,14 +196956,14 @@ msgstr "" "Nie możemy. Nie mamy nic co moglibyśmy poświęcić na sprzedaż, a ja nie mam " "budżetu by kupować od ciebie. Zgaduję że na darowiznę się nie łapię?" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "Nosisz zaprawdę błyszczącą odznakę!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Heh, wyglądasz na kogoś ważnego." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "Nosisz zaprawdę błyszczącą odznakę!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "Jestem tu tak naprawdę nowy." @@ -196899,6 +197029,10 @@ msgid "" "it." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " @@ -196907,10 +197041,6 @@ msgstr "" "Założę się, że tak samo jak ty zdobyłeś swoją. Nie rozgłaszaj tego, " "niektórzy tutaj nie lubią tu takich jak my." -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "Wybacz że pytam" @@ -196936,22 +197066,22 @@ msgstr "Kupuję." msgid "Who needs rebar?" msgstr "Kto potrzebuje prętów zbrojeniowych?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "Tak jakbyś miał coś do gadania. Pieprz się." - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "Pieprz się!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "" +msgid "As if you're one to talk. Screw You." +msgstr "Tak jakbyś miał coś do gadania. Pieprz się." #: lang/json/talk_topic_from_json.py 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 "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "" @@ -197264,6 +197394,16 @@ msgstr "Wygląda na to że jesteś szefem." msgid "Glad to have you aboard." msgstr "Cieszę się że mam cię na pokładzie." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -197344,16 +197484,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -197624,38 +197754,38 @@ msgid "Keep it civil, merc." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Still plenty of outlaws in the roads, perhaps you should tend to your job, " -"marshal..." +msgid "Here to trade, I hope?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You see anything you want, marshal?" +msgid "Safe travels, scavenger." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, a U.S. marshal, how quaint." +msgid "" +"Still plenty of outlaws in the roads, perhaps you should tend to your job, " +"marshal..." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" +msgid "You see anything you want, marshal?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -197895,16 +198025,16 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "Mogę ci pomóc marszalu?" +msgid "Morning ma'am, how can I help you?" +msgstr "Dobry, psze pani, w czym mogę pomóc?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "Dobry, sir, w czym mogę pomóc?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "Dobry, psze pani, w czym mogę pomóc?" +msgid "Can I help you, marshal?" +msgstr "Mogę ci pomóc marszalu?" #: lang/json/talk_topic_from_json.py msgid "" @@ -198033,14 +198163,14 @@ msgstr "Jakie rodzaje prac macie tu dla mnie?" msgid "Not now." msgstr "Nie teraz." -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "Przyjdź później, najpierw muszę się zająć paroma rzeczami." - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "Mogę zerknąć na ciebie lub twoich towarzyszy jeżeli jesteście ranni." +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "Przyjdź później, najpierw muszę się zająć paroma rzeczami." + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$200, 30m] Musisz mnie połatać." @@ -198294,7 +198424,7 @@ msgid "Ok." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -198317,9 +198447,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -198421,11 +198552,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -198437,11 +198568,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -207007,12 +207138,6 @@ msgstr "" msgid "mana weaving" msgstr "" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "żadne" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -213899,16 +214024,18 @@ msgstr "" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s]ortuj: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F]iltruj" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R]esetuj" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -213943,8 +214070,9 @@ msgid "Unsorted (recently added first)" msgstr "Nieposortowane (ostatnio dodane najpierw)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] pokaż pomoc >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -216952,6 +217080,13 @@ msgstr "" msgid " BIONICS " msgstr "BIONIKA" +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -216961,19 +217096,13 @@ msgstr "" "Wybierz bionikę do zmiany przypisania, lub naciśnij SPACJĘ by anulować. " #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" #: src/bionics_ui.cpp @@ -217069,10 +217198,8 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"Nie możesz aktywować %s!\n" -"By przeczytać opis %s, wciśnij '!', następnie '%c'." #: src/bonuses.cpp msgid "Accuracy" @@ -229370,7 +229497,7 @@ msgid "You can't crack a safe while deaf!" msgstr "Nie możesz złamać sejfu będąc głuchym!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -231641,13 +231768,8 @@ msgstr "Nie ma dostępnych wyborów" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Filtr" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Filtr: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -250531,6 +250653,16 @@ msgstr "" "Użyj metod SDL do rysowania lini ASCII zamiast Unicode. Użyj tej opcji gdy " "twoja czcionka nie ma potrzebnych glifów." +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "Użyj nakładki graficznej" @@ -252451,10 +252583,6 @@ msgstr "Zmęcz:" msgid "Heat :" msgstr "Ciepł:" -#: src/panels.cpp -msgid "Sound :" -msgstr "" - #: src/panels.cpp msgid "Deaf!" msgstr "Głuchy!" @@ -257360,8 +257488,9 @@ msgid "Remove attached curtains first." msgstr "Najpierw usuń przyłączone zasłony." #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "Najpierw usuń przyłączoną część." +#, c-format +msgid "Remove the attached %s first." +msgstr "" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/pt_BR.po b/lang/po/pt_BR.po index f0d04c03c4a08..7ab6e83ae634b 100644 --- a/lang/po/pt_BR.po +++ b/lang/po/pt_BR.po @@ -17,13 +17,14 @@ # Brett Dong , 2019 # Douglas Onofre Rosas dos Santos , 2019 # C. J. , 2020 +# Leonardo Gonçalves , 2020 # Yuri Laskowski , 2020 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: Yuri Laskowski , 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/pt_BR/)\n" @@ -742,7 +743,7 @@ msgid_plural "oxygen" msgstr[0] "oxigênio" msgstr[1] "oxigênio" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Uma lata de oxigênio." @@ -758,6 +759,8 @@ msgid "" "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 "" +" \n" +"Um foguete feito à mão, consistindo de um espigão soldado em um cano que foi preenchido com combustível de foguete improvisado. Horrivelmente impreciso, como é de se esperar deste tipo de arma, mas com um impacto devastador ... se acertar." #: lang/json/AMMO_from_json.py msgid "explosive homemade rocket" @@ -825,7 +828,7 @@ msgid_plural "nitrox" msgstr[0] "nitrox" msgstr[1] "nitrox" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "" @@ -837,7 +840,7 @@ msgid_plural "tinder" msgstr[0] "acendalha" msgstr[1] "acendalhas" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "" @@ -860,7 +863,7 @@ msgid_plural "metal RPG dice" msgstr[0] "dado de metal de RPG" msgstr[1] "dados de metal de RPG" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: 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." @@ -896,7 +899,7 @@ msgid_plural "sulfur" msgstr[0] "enxofre" msgstr[1] "enxofre" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -943,7 +946,7 @@ msgid_plural "limestone" msgstr[0] "calcário" msgstr[1] "calcário" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -960,7 +963,7 @@ msgid_plural "quicklime" msgstr[0] "cal viva" msgstr[1] "cal viva" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -980,7 +983,7 @@ msgid_plural "sand" msgstr[0] "areia" msgstr[1] "areia" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -996,7 +999,7 @@ msgid_plural "soil" msgstr[0] "terra" msgstr[1] "terra" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1030,7 +1033,7 @@ msgid_plural "zinc powder" msgstr[0] "pó de zinco" msgstr[1] "pó de zinco" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1048,7 +1051,7 @@ msgid_plural "zinc oxide" msgstr[0] "óxido de zinco" msgstr[1] "óxido de zinco" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1063,7 +1066,8 @@ msgid_plural "manganese dioxide" msgstr[0] "dióxido de manganês" msgstr[1] "dióxido de manganês" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1080,7 +1084,8 @@ msgid_plural "potassium chloride" msgstr[0] "cloreto de potássio" msgstr[1] "cloreto de potássio" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1099,7 +1104,8 @@ msgid_plural "potassium hydroxide" msgstr[0] "hidróxido de potássio" msgstr[1] "hidróxido de potássio" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1117,7 +1123,7 @@ msgid_plural "sulfuric acid" msgstr[0] "ácido sulfúrico" msgstr[1] "ácido sulfúrico" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1172,7 +1178,7 @@ msgid_plural "nitric acid" msgstr[0] "ácido nítrico" msgstr[1] "ácido nítrico" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1297,7 +1303,7 @@ msgid_plural "saltpeter" msgstr[0] "salitre" msgstr[1] "salitre" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1314,7 +1320,7 @@ msgid_plural "niter" msgstr[0] "nitro" msgstr[1] "nitro" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1390,7 +1396,7 @@ msgid_plural "thermite" msgstr[0] "termite" msgstr[1] "termite" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1448,7 +1454,8 @@ msgid_plural "match head powder" msgstr[0] "pó de cabeças de fósforos" msgstr[1] "pó de cabeças de fósforos" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1527,7 +1534,7 @@ msgid_plural "soap flakes" msgstr[0] "flocos de sabão" msgstr[1] "flocos de sabão" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "" @@ -1555,7 +1562,7 @@ msgid_plural "wood ashes" msgstr[0] "cinza de madeira" msgstr[1] "cinzas de madeira" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1679,7 +1686,7 @@ msgid_plural "lamp oil" msgstr[0] "óleo de lamparina" msgstr[1] "óleo de lamparina" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "Um óleo fino e de queima limpa, feito para uso em lâmpadas a óleo." @@ -1690,7 +1697,7 @@ msgid_plural "motor oil" msgstr[0] "óleo de motor" msgstr[1] "óleo de motor" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "Um óleo criado para uso em motores de carro." @@ -1701,7 +1708,7 @@ msgid_plural "napalm" msgstr[0] "napalm" msgstr[1] "napalm" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -5101,7 +5108,7 @@ msgid_plural "red paint" msgstr[0] "tinta vermelha" msgstr[1] "tinta vermelha" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Uma lata de tinta vermelha." @@ -5123,7 +5130,7 @@ msgid_plural "white paint" msgstr[0] "tinta branca" msgstr[1] "tinta branca" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Uma lata de tinta branca." @@ -5145,7 +5152,7 @@ msgid_plural "purple paint" msgstr[0] "tinta roxa" msgstr[1] "tinta roxa" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Uma lata de tinta roxa." @@ -5156,7 +5163,7 @@ msgid_plural "yellow paint" msgstr[0] "tinta amarela" msgstr[1] "tinta amarela" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Uma lata de tinta amarela." @@ -5228,7 +5235,7 @@ msgstr[0] "ouro" msgstr[1] "ouro" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5249,7 +5256,7 @@ msgid_plural "zinc" msgstr[0] "zinco" msgstr[1] "zinco" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5264,7 +5271,7 @@ msgid_plural "lead" msgstr[0] "chumbo" msgstr[1] "chumbo" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5280,7 +5287,7 @@ msgid_plural "magnesium powder" msgstr[0] "pó de magnésio" msgstr[1] "pó de magnésio" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5295,7 +5302,7 @@ msgid_plural "silver" msgstr[0] "prata" msgstr[1] "prata" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5489,7 +5496,7 @@ msgid_plural "leather scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5502,7 +5509,7 @@ msgid_plural "lycra scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5515,7 +5522,7 @@ msgid_plural "neoprene scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5528,7 +5535,8 @@ msgid_plural "synthetic fabric scraps" msgstr[0] "" msgstr[1] "" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5565,7 +5573,8 @@ msgid_plural "patchwork cotton clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5588,7 +5597,8 @@ msgid_plural "patchwork faux fur clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5611,7 +5621,8 @@ msgid_plural "patchwork felt clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5647,7 +5658,8 @@ msgid_plural "patchwork lycra clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5674,7 +5686,8 @@ msgid_plural "patchwork neoprene clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5700,7 +5713,8 @@ msgid_plural "patchwork Nomex clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5723,7 +5737,8 @@ msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -7712,12 +7727,14 @@ msgstr[0] "" msgstr[1] "" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -7732,7 +7749,8 @@ msgstr[1] "" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -7741,11 +7759,14 @@ msgid "You stash your %s." msgstr "" #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -7780,7 +7801,8 @@ msgid_plural "chest ammo pouches" msgstr[0] "" msgstr[1] "" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -7795,7 +7817,7 @@ msgid_plural "chest rig" msgstr[0] "" msgstr[1] "" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -7810,12 +7832,13 @@ msgid_plural "javelin bags" msgstr[0] "" msgstr[1] "" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "Esconder dardos" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -7846,7 +7869,7 @@ msgid_plural "leg ammo pouches" msgstr[0] "" msgstr[1] "" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -8065,7 +8088,8 @@ msgid_plural "pairs of 2-by-arm guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -8392,7 +8416,7 @@ msgid_plural "grenade pouches" msgstr[0] "" msgstr[1] "" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -8420,12 +8444,14 @@ msgid_plural "large grenade pouches" msgstr[0] "" msgstr[1] "" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "grandes granadas pouchStash granadas" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "Uma bolsa para guardar até quatro granadas de tamanho normal." @@ -8892,6 +8918,8 @@ msgid_plural "pairs of armored boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -9003,6 +9031,8 @@ msgid_plural "pairs of XL survivor boots" msgstr[0] "" msgstr[1] "" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -9487,7 +9517,8 @@ msgid_plural "pairs of ankle socks" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -10956,7 +10987,8 @@ msgid_plural "pairs of armored fingerless gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -11301,7 +11333,8 @@ msgid_plural "pairs of XL survivor gloves" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -11694,7 +11727,7 @@ msgid_plural "kippahs" msgstr[0] "" msgstr[1] "" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "" @@ -11707,7 +11740,7 @@ msgid_plural "kufi caps" msgstr[0] "" msgstr[1] "" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Um chapéu sem aba, curto e arredondado." @@ -12045,7 +12078,7 @@ msgid_plural "galeae" msgstr[0] "" msgstr[1] "" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -12777,7 +12810,7 @@ msgid_plural "diver's watches" msgstr[0] "" msgstr[1] "" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -16735,7 +16768,8 @@ msgid_plural "pairs of 2-by-shin guards" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -16768,7 +16802,8 @@ msgid_plural "pairs of chainmail leggings" msgstr[0] "" msgstr[1] "" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -16781,7 +16816,7 @@ msgid_plural "leather chaps" msgstr[0] "" msgstr[1] "" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -16796,7 +16831,7 @@ msgid_plural "fencing pants" msgstr[0] "calças de esgrima" msgstr[1] "calças de esgrima" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" @@ -16898,7 +16933,8 @@ msgid_plural "light survivor cargo pants" msgstr[0] "calças de carga leves do sobrevivente" msgstr[1] "calças de carga leves do sobrevivente" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -16913,7 +16949,8 @@ msgid_plural "pairs of motorcycle pants" msgstr[0] "calça para motocicletas" msgstr[1] "pares de calças para motocicletas" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "Um par de calças projetadas para motociclistas." @@ -16952,7 +16989,7 @@ msgid_plural "breeches" msgstr[0] "" msgstr[1] "" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -16980,7 +17017,7 @@ msgid_plural "hot pants" msgstr[0] "" msgstr[1] "" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "calças quentes Um par simples de shorts curtos." @@ -16991,7 +17028,7 @@ msgid_plural "fur hot pants" msgstr[0] "" msgstr[1] "" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "calças quentes de peleUm simples par de shorts curtos de peles." @@ -17002,7 +17039,8 @@ msgid_plural "leather hot pants" msgstr[0] "" msgstr[1] "" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "calça de couro quenteUm simples par de shorts curtos de couro." @@ -17013,7 +17051,7 @@ msgid_plural "jeans" msgstr[0] "jeans" msgstr[1] "jeans" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "jeansUm par de calças de ganga com dois bolsos profundos." @@ -17055,7 +17093,7 @@ msgid_plural "leggings" msgstr[0] "" msgstr[1] "" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -17190,7 +17228,7 @@ msgid_plural "fur pants" msgstr[0] "calça de pele" msgstr[1] "calças de pele" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Um par robusto de calças forradas com pele." @@ -17213,7 +17251,7 @@ msgid_plural "leather pants" msgstr[0] "calça de couro" msgstr[1] "calças de couro" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -17239,7 +17277,8 @@ msgid_plural "mail carrier shorts" msgstr[0] "" msgstr[1] "" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "" @@ -17263,7 +17302,7 @@ msgid_plural "cargo shorts" msgstr[0] "shorts de carga" msgstr[1] "shorts de carga" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "" @@ -17276,7 +17315,7 @@ msgid_plural "denim shorts" msgstr[0] "bermuda jeans" msgstr[1] "bermudas jeans" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -17428,17 +17467,20 @@ msgid_plural "bondage masks (zipped)" msgstr[0] "" msgstr[1] "" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Abrir zíper" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "Você abre os olhos e a boca da máscara de bondage." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -18411,7 +18453,7 @@ msgid_plural "leather pouches" msgstr[0] "bolsa de couro" msgstr[1] "bolsas de couro" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -19635,7 +19677,8 @@ msgid_plural "lorica segmentata" msgstr[0] "lorica segmentata" msgstr[1] "loricas segmentatas" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -19689,7 +19732,7 @@ msgid_plural "cuirasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -20427,7 +20470,8 @@ msgid_plural "pairs of arm warmers" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "" @@ -20522,7 +20566,7 @@ msgid_plural "boy shorts" msgstr[0] "" msgstr[1] "" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -20550,7 +20594,7 @@ msgid_plural "briefs" msgstr[0] "" msgstr[1] "" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "Um par de cuecas slip. Uma roupa de baixo masculina confortável." @@ -20679,7 +20723,8 @@ msgid_plural "pairs of XL leg warmers" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -20812,7 +20857,8 @@ msgid_plural "compression shorts" msgstr[0] "" msgstr[1] "" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -22154,7 +22200,7 @@ msgid_plural "test batteries" msgstr[0] "" msgstr[1] "" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -23035,7 +23081,8 @@ msgid_plural "Power Storage CBM Mk. II" msgstr[0] "" msgstr[1] "" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -25016,19 +25063,19 @@ msgstr[1] "" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -29511,7 +29558,8 @@ msgid_plural "commercial fertilizer" msgstr[0] "fertilizante comercial" msgstr[1] "fertilizante comercial" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "fertilizante comercial Grânulos ricos em nutrientes para plantas." @@ -29603,7 +29651,8 @@ msgid_plural "concentrated acid" msgstr[0] "ácido concentrado" msgstr[1] "ácido concentrado" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Ácido concentrado. Não beba." @@ -30406,7 +30455,7 @@ msgid_plural "cheap whiskey" msgstr[0] "uísque barato" msgstr[1] "uísque barato" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -30919,7 +30968,7 @@ msgid_plural "cooked fish" msgstr[0] "peixe cozido" msgstr[1] "peixes cozidos" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "peixe cozido Peixe cozido fresquinho. Muito nutritivo." @@ -31005,7 +31054,7 @@ msgid_plural "chunks of meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -31034,7 +31083,8 @@ msgid_plural "chunks of mutant meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -31160,7 +31210,7 @@ msgid_plural "cooked offal" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -31333,7 +31383,8 @@ msgid_plural "cooked pieces of lung" msgstr[0] "pedaço de pulmão cozido" msgstr[1] "pedaços de pulmão cozido" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -31388,7 +31439,7 @@ msgid_plural "cooked brains" msgstr[0] "cérebro cozido" msgstr[1] "cérebros cozidos" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -31506,7 +31557,8 @@ msgid_plural "chunks of mutant fat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -31579,7 +31631,8 @@ msgid_plural "chunks of tainted meat" msgstr[0] "" msgstr[1] "" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -32145,7 +32198,7 @@ msgid_plural "chamomile tea" msgstr[0] "chá de camomila" msgstr[1] "chás de camomila" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -32173,7 +32226,7 @@ msgid_plural "coffee" msgstr[0] "café" msgstr[1] "café" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -32191,7 +32244,8 @@ msgid_plural "coffee substitute" msgstr[0] "" msgstr[1] "" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -32205,7 +32259,7 @@ msgid_plural "chicory brew" msgstr[0] "infusão de chicória" msgstr[1] "infusões de chicória" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -32614,7 +32668,7 @@ msgid_plural "clean water" msgstr[0] "água purificada" msgstr[1] "água purificada" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "" @@ -33140,7 +33194,8 @@ msgid_plural "cooked strawberries" msgstr[0] "morango cozido" msgstr[1] "morangos cozidos" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "morango cozido É como geléia de morango, só sem açúcar." @@ -33160,7 +33215,8 @@ msgid_plural "cooked blueberries" msgstr[0] "mirtilo cozido" msgstr[1] "mirtilos cozidos" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "blueberry cozido É como geléia de mirtilo, só sem açúcar." @@ -34039,18 +34095,18 @@ msgid_plural "chocolate candies" msgstr[0] "doce de chocolate" msgstr[1] "doces de chocolate" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "chocolate candyA punhado de chocolate colorido cheio de doces." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" +msgid_plural "chewy candy" msgstr[0] "" msgstr[1] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "chewy candyA punhado de doces chewy coloridos com sabor de frutas." @@ -34298,7 +34354,7 @@ msgid_plural "cheese nachos" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -34428,7 +34484,7 @@ msgid_plural "chili dogs" msgstr[0] "" msgstr[1] "" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Cachorro quente, servido com chili con carne como cobertura. Yum!" @@ -34467,7 +34523,8 @@ msgid_plural "chocolate pancakes" msgstr[0] "" msgstr[1] "" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -34504,7 +34561,7 @@ msgid_plural "cheese fries" msgstr[0] "" msgstr[1] "" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "Batatas fritas com queijo delicioso sufocada por cima." @@ -34546,11 +34603,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "" -msgstr[1] "" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -35105,21 +35160,23 @@ msgid_plural "chilis con carne" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "" msgstr[1] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "" msgstr[1] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "" @@ -36052,7 +36109,7 @@ msgid_plural "cocaine" msgstr[0] "cocaína" msgstr[1] "cocaína" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -36231,7 +36288,7 @@ msgid_plural "chewing gum" msgstr[0] "goma de mascar" msgstr[1] "goma de mascar" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "" @@ -38392,7 +38449,7 @@ msgid_plural "chitin powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -38454,7 +38511,7 @@ msgid_plural "cooked beans" msgstr[0] "feijões cozidos" msgstr[1] "feijões cozidos" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "beans cozidosUm serviço saudável de grandes grãos cozidos do norte." @@ -38532,7 +38589,7 @@ msgid_plural "cooked lentils" msgstr[0] "" msgstr[1] "" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "" @@ -38543,7 +38600,7 @@ msgid_plural "coffee powder" msgstr[0] "" msgstr[1] "" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -40246,7 +40303,7 @@ msgid_plural "chicory seeds" msgstr[0] "sementes de chicória" msgstr[1] "sementes de chicória" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "Algumas sementes de chicória." @@ -40334,7 +40391,8 @@ msgid_plural "chili pepper seeds" msgstr[0] "sementes de pimenta" msgstr[1] "sementes de pimenta" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Algumas sementes de pimenta." @@ -40708,7 +40766,7 @@ msgid_plural "coffee beans" msgstr[0] "grãos de café" msgstr[1] "grãos de café" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Alguns grãos de café. Podem ser torrados." @@ -40730,7 +40788,7 @@ msgid_plural "chamomile seeds" msgstr[0] "sementes de camomila" msgstr[1] "sementes de camomila" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "Algumas sementes de camomila." @@ -41050,11 +41108,9 @@ msgstr "Um talo de tomilho. Cheira delicioso." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "caule de taboa cozido" -msgstr[1] "caules de taboa cozidos" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -41084,7 +41140,8 @@ msgid_plural "cooked dandelion greens" msgstr[0] "folhas de dente-de-leão cozidas" msgstr[1] "folhas de dente-de-leão cozidas" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Folhas cozidas de dente-de-leão selvagem. Saborosas e nutritivas." @@ -41119,7 +41176,8 @@ msgid_plural "cooked wild vegetables" msgstr[0] "vegetais silvestres cozidos" msgstr[1] "vegetais silvestres cozidos" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "" @@ -41143,7 +41201,7 @@ msgid_plural "cooked buckwheat" msgstr[0] "trigo sarraceno cozido" msgstr[1] "trigo sarraceno cozido" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -41199,7 +41257,7 @@ msgid_plural "cooked rice" msgstr[0] "arroz cozido" msgstr[1] "arroz cozido" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Uma porção saudável de arroz branco cozido." @@ -41828,9 +41886,11 @@ msgstr "Uma deliciosa pizza com queijo derretido por cima." #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "granola" +msgid_plural "granola" +msgstr[0] "" +msgstr[1] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -44664,7 +44724,7 @@ msgid_plural "rock salt" msgstr[0] "sal de rocha" msgstr[1] "sal de rocha" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "" @@ -44676,7 +44736,7 @@ msgid_plural "rhodonite" msgstr[0] "rodonita" msgstr[1] "rodonita" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -44689,7 +44749,7 @@ msgid_plural "zincite" msgstr[0] "" msgstr[1] "" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -44906,7 +44966,8 @@ msgid_plural "semi ground grains" msgstr[0] "" msgstr[1] "" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "" @@ -44917,7 +44978,8 @@ msgid_plural "smoldering embers" msgstr[0] "" msgstr[1] "" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -44952,7 +45014,7 @@ msgid_plural "coins" msgstr[0] "moeda" msgstr[1] "moedas" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -44982,19 +45044,27 @@ msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "fogo nas proximidades" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "vendo isso é um bugmuscle" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "vento" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "luz do sol" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -45008,6 +45078,15 @@ msgid_plural "none" msgstr[0] "" msgstr[1] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" +msgstr[1] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -45108,7 +45187,7 @@ msgid_plural "leather patches" msgstr[0] "" msgstr[1] "" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "" @@ -45120,7 +45199,7 @@ msgid_plural "felt patches" msgstr[0] "" msgstr[1] "" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "" @@ -45209,7 +45288,8 @@ msgid_plural "ceramic disks" msgstr[0] "conjunto de 100 discos de cerâmica" msgstr[1] "discos de cerâmica" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -45523,7 +45603,7 @@ msgid_plural "concrete" msgstr[0] "concreto" msgstr[1] "concreto" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "Um pouco de concreto, pronto para ser usado em alguma construção." @@ -45564,7 +45644,7 @@ msgid_plural "dead flares" msgstr[0] "sinalizador gasto" msgstr[1] "sinalizadores gastos" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "Este é um sinalizador de magnésio gasto. É essencialmente lixo." @@ -46129,7 +46209,8 @@ msgid_plural "high-quality lenses" msgstr[0] "lente de alta qualidade" msgstr[1] "lentes de alta qualidade" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -46144,7 +46225,8 @@ msgid_plural "small high-quality lenses" msgstr[0] "lente de alta qualidade pequena" msgstr[1] "lentes de alta qualidade pequenas" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -46159,7 +46241,8 @@ msgid_plural "pairs of tinted glass" msgstr[0] "par de vidros escurecidos" msgstr[1] "pares de vidro escurecido" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -46321,7 +46404,7 @@ msgid_plural "fish bowls" msgstr[0] "aquário" msgstr[1] "aquários" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -46673,7 +46756,7 @@ msgid_plural "lumps of clay" msgstr[0] "pedaço de argila" msgstr[1] "pedaços de argila" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Um pedaço de barro fresco. Útil para algumas receitas de artesanato." @@ -46696,7 +46779,7 @@ msgid_plural "mortar" msgstr[0] "argamassa" msgstr[1] "argamassa" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "Argamassa, pronta para ser usada em projetos de construção." @@ -46707,17 +46790,17 @@ msgid_plural "soft adobe bricks" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -46948,7 +47031,7 @@ msgid_plural "cured hides" msgstr[0] "" msgstr[1] "" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46964,7 +47047,7 @@ msgid_plural "tanned hides" msgstr[0] "" msgstr[1] "" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -46979,7 +47062,7 @@ msgid_plural "cured pelts" msgstr[0] "" msgstr[1] "" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -46996,7 +47079,7 @@ msgid_plural "tanned pelts" msgstr[0] "" msgstr[1] "" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -47011,7 +47094,7 @@ msgid_plural "piles of straw" msgstr[0] "pilha de palha" msgstr[1] "pilhas de palha" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -47026,7 +47109,7 @@ msgid_plural "straw dolls" msgstr[0] "boneca de palha" msgstr[1] "bonecas de palha" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "Representa uma mulher em um vestido." @@ -47189,7 +47272,7 @@ msgid_plural "joint roaches" msgstr[0] "" msgstr[1] "" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -47387,7 +47470,7 @@ msgid_plural "refrigerant tanks" msgstr[0] "" msgstr[1] "" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -47625,7 +47708,7 @@ msgid_plural "flyers" msgstr[0] "" msgstr[1] "" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "flyerA sucata de papel." @@ -47636,7 +47719,7 @@ msgid_plural "survivor's notes" msgstr[0] "anotação de sobrevivente" msgstr[1] "anotações de sobrevivente" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -47662,7 +47745,7 @@ msgid_plural "score cards" msgstr[0] "cartão de pontuação" msgstr[1] "cartões de pontuação" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "Um cartão de pontuação impresso em cores." @@ -47673,7 +47756,7 @@ msgid_plural "newspaper pages" msgstr[0] "página de jornal" msgstr[1] "páginas de jornal" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -47686,7 +47769,7 @@ msgstr "" "estivessesobrecarregada. Amaior parte da informação é terrivelmente trivial," " oudesatualizada, masuma coisa chama sua atenção rapidamente." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -47699,7 +47782,7 @@ msgstr "" "éterrivelmentetrivial, ou desatualizada, mas uma coisa chama sua " "atençãorapidamente." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -47710,7 +47793,7 @@ msgstr "" "incrívelquedurou tanto tempo. A maior parte da informação é terrivelmente " "trivial, oudesatualizada, mas uma coisa chama sua atenção rapidamente." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -47721,7 +47804,7 @@ msgstr "" "partedainformação é terrivelmente trivial, ou desatualizada, mas uma " "coisachamasua atenção rapidamente." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -47732,7 +47815,7 @@ msgstr "" "antecederamoCataclismo. A maior parte da informação é terrivelmente trivial," " oudesatualizada, mas uma coisa chama sua atenção rapidamente." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -47749,7 +47832,7 @@ msgid_plural "vault leaflets" msgstr[0] "" msgstr[1] "" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -48326,7 +48409,8 @@ msgid_plural "sets of tiny spidery legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "" @@ -48337,7 +48421,8 @@ msgid_plural "sets of reverse-jointed legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -48349,7 +48434,8 @@ msgid_plural "sets of omni wheels" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "" @@ -48360,7 +48446,7 @@ msgid_plural "sets of rotors" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "" @@ -48371,7 +48457,8 @@ msgid_plural "sets of android legs" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "" @@ -48382,7 +48469,8 @@ msgid_plural "sets of android arms" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "" @@ -48393,7 +48481,8 @@ msgid_plural "sets of small tank tread" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "" @@ -48404,7 +48493,8 @@ msgid_plural "turret interior chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -48417,7 +48507,8 @@ msgid_plural "police bot chassis" msgstr[0] "" msgstr[1] "" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -48448,7 +48539,7 @@ msgid_plural "misc software" msgstr[0] "software sortido" msgstr[1] "softwares sortidos" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "" @@ -48461,7 +48552,7 @@ msgid_plural "hackPRO" msgstr[0] "hackPRO" msgstr[1] "hackPRO" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "hackPROA pedaço de software de hackers." @@ -48494,7 +48585,7 @@ msgid_plural "infection data" msgstr[0] "dados sobre infecção" msgstr[1] "dados sobre infecção" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Dados médicos sobre sangue zumbi." @@ -48505,7 +48596,7 @@ msgid_plural "lab data" msgstr[0] "dados de laboratório" msgstr[1] "dados de laboratório" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr " Arquivos de pesquisa de um laboratório do governo." @@ -48516,7 +48607,7 @@ msgid_plural "train data" msgstr[0] "dados ferroviários" msgstr[1] "dados ferroviários" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "Dados logísticos sobre rotas e horários dos trens subterrâneos." @@ -48527,7 +48618,7 @@ msgid_plural "neural data" msgstr[0] "dados neurais" msgstr[1] "dados neurais" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -48541,7 +48632,8 @@ msgid_plural "misc software" msgstr[0] "arquivos de bancos de dados de circuitos integrados" msgstr[1] "softwares sortidos" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -51115,8 +51207,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "butter knife" msgid_plural "butter knives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "faca de manteiga" +msgstr[1] "facas de manteiga" #. ~ Description for butter knife #: lang/json/GENERIC_from_json.py @@ -51124,12 +51216,14 @@ msgid "" "A dull knife, absolutely worthless in combat. Excellent for spreading soft " "things on bread." msgstr "" +"Uma faca sem fio, inútil no combate. Excelente para espalhar coisas moles no" +" pão." #: lang/json/GENERIC_from_json.py msgid "plastic knife" msgid_plural "plastic knives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "faca de plástico" +msgstr[1] "facas de plástico" #. ~ Description for plastic knife #: lang/json/GENERIC_from_json.py @@ -51141,8 +51235,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "plastic straw" msgid_plural "plastic straws" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "canudo de plástico" +msgstr[1] "canudos de plástico" #. ~ Description for plastic straw #: lang/json/GENERIC_from_json.py @@ -51152,8 +51246,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "corkscrew" msgid_plural "corkscrews" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "saca-rolhas" +msgstr[1] "saca-rolhas" #. ~ Description for corkscrew #: lang/json/GENERIC_from_json.py @@ -51164,8 +51258,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "vegetable peeler" msgid_plural "vegetable peelers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "descascador de vegetais" +msgstr[1] "descascadores de vegetais" #. ~ Description for vegetable peeler #: lang/json/GENERIC_from_json.py @@ -51177,8 +51271,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "bottle opener" msgid_plural "bottle openers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "abridor de garrafas" +msgstr[1] "abridores de garrafa" #. ~ Description for bottle opener #: lang/json/GENERIC_from_json.py @@ -51263,8 +51357,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "ladle" msgid_plural "ladles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "concha" +msgstr[1] "conchas" #. ~ Description for ladle #: lang/json/GENERIC_from_json.py @@ -51286,8 +51380,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "potato masher" msgid_plural "potato mashers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "amassador de batata" +msgstr[1] "amassadores de batata" #. ~ Description for potato masher #: lang/json/GENERIC_from_json.py @@ -51299,8 +51393,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "garlic press" msgid_plural "garlic presses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "amassador de alho" +msgstr[1] "amassadores de alho" #. ~ Description for garlic press #: lang/json/GENERIC_from_json.py @@ -51310,8 +51404,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "can opener" msgid_plural "can openers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "abridor de lata" +msgstr[1] "abridor de latas" #. ~ Description for can opener #: lang/json/GENERIC_from_json.py @@ -51334,8 +51428,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "spatula" msgid_plural "spatulas" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "espátula de cozinha" +msgstr[1] "espátulas de cozinha" #. ~ Description for spatula #: lang/json/GENERIC_from_json.py @@ -51360,8 +51454,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "pot" msgid_plural "pots" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "panela" +msgstr[1] "panelas" #. ~ Description for pot #: lang/json/GENERIC_from_json.py @@ -51371,8 +51465,8 @@ msgstr "potUseful para ferver a água ao cozinhar o espaguete e mais." #: lang/json/GENERIC_from_json.py msgid "cast-iron pot" msgid_plural "cast-iron pots" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "panela de ferro" +msgstr[1] "panelas de ferro" #. ~ Description for cast-iron pot #: lang/json/GENERIC_from_json.py @@ -51383,8 +51477,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "copper pot" msgid_plural "copper pots" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "panela de cobre" +msgstr[1] "panelas de cobre" #. ~ Description for copper pot #: lang/json/GENERIC_from_json.py @@ -51399,8 +51493,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "casserole" msgid_plural "casseroles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "caçarola" +msgstr[1] "caçarolas" #. ~ Description for casserole #: lang/json/GENERIC_from_json.py @@ -51412,8 +51506,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "stock pot" msgid_plural "stock pots" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "panela de sopa" +msgstr[1] "panelas de sopa" #. ~ Description for stock pot #: lang/json/GENERIC_from_json.py @@ -51461,8 +51555,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "steel frying pan" msgid_plural "steel frying pans" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "frigideira de aço" +msgstr[1] "frigideiras de aço" #. ~ Description for steel frying pan #: lang/json/GENERIC_from_json.py @@ -51518,13 +51612,13 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "kettle" msgid_plural "kettles" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "chaleira" +msgstr[1] "chaleiras" #. ~ Description for kettle #: lang/json/GENERIC_from_json.py msgid "A stovetop kettle for boiling water." -msgstr "" +msgstr "Uma chaleira de cozinha para ferver água." #: lang/json/GENERIC_from_json.py msgid "mesh colander" @@ -51555,8 +51649,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "cutting board" msgid_plural "cutting boards" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tábua de corte" +msgstr[1] "tábuas de corte" #. ~ Description for cutting board #: lang/json/GENERIC_from_json.py @@ -51584,7 +51678,7 @@ msgid_plural "spare parts" msgstr[0] "" msgstr[1] "" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -51628,8 +51722,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "air filter" msgid_plural "air filters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "filtro de ar" +msgstr[1] "filtros de ar" #. ~ Description for air filter #: lang/json/GENERIC_from_json.py @@ -51644,8 +51738,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "makeshift air filter" msgid_plural "makeshift air filters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "filtro de ar improvisado" +msgstr[1] "filtros de ar improvisados" #. ~ Description for makeshift air filter #: lang/json/GENERIC_from_json.py @@ -51659,8 +51753,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "automotive filter" msgid_plural "automotive filters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "filtro de automóvel" +msgstr[1] "filtros de automóvel" #. ~ Description for automotive filter #: lang/json/GENERIC_from_json.py @@ -51672,8 +51766,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "makeshift automotive filter" msgid_plural "makeshift automotive filters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "filtro de automóvel improvisado" +msgstr[1] "filtros de automóvel improvisados" #. ~ Description for makeshift automotive filter #: lang/json/GENERIC_from_json.py @@ -51907,8 +52001,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "baseball" msgid_plural "baseballs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bola de beisebol" +msgstr[1] "bolas de beisebol" #. ~ Description for baseball #: lang/json/GENERIC_from_json.py @@ -51922,8 +52016,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "football" msgid_plural "footballs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bola de futebol" +msgstr[1] "bolas de futebol" #. ~ Description for football #: lang/json/GENERIC_from_json.py @@ -51937,8 +52031,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "basketball" msgid_plural "basketballs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bola de basquete" +msgstr[1] "bolas de basquete" #. ~ Description for basketball #: lang/json/GENERIC_from_json.py @@ -51949,8 +52043,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "hockey puck" msgid_plural "hockey pucks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "disco de hóquei" +msgstr[1] "discos de hóquei" #. ~ Description for hockey puck #: lang/json/GENERIC_from_json.py @@ -51965,8 +52059,8 @@ msgstr "" #: lang/json/GENERIC_from_json.py msgid "makeshift bayonet" msgid_plural "makeshift bayonets" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "baioneta improvisada" +msgstr[1] "baionetas improvisadas" #. ~ Description for makeshift bayonet #: lang/json/GENERIC_from_json.py @@ -52064,17 +52158,20 @@ msgid_plural "expandable batons (extended)" msgstr[0] "" msgstr[1] "" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "bastão expansível (estendido) Collapse" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Você desmorona seu bastão." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -52356,7 +52453,8 @@ msgid_plural "ironshod quarterstaves" msgstr[0] "" msgstr[1] "" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -52602,7 +52700,7 @@ msgid_plural "quarterstaves" msgstr[0] "" msgstr[1] "" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -52617,7 +52715,7 @@ msgid_plural "rocks in socks" msgstr[0] "meia com pedra dentro" msgstr[1] "meias com pedras dentro" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "" @@ -52630,7 +52728,8 @@ msgid_plural "sharpened toothbrushes" msgstr[0] "escova de dente afiada" msgstr[1] "escovas de dente afiadas" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "" @@ -52934,7 +53033,7 @@ msgid_plural "naginata" msgstr[0] "naginata" msgstr[1] "naginata" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52945,7 +53044,7 @@ msgstr "" "mesmamaneiraque a katana e outras lâminas japonesas. Ocasionalmente usado " "porsamuraisem períodos precoces, ou por suas esposas em defesa do lar." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -52953,7 +53052,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -52967,7 +53066,8 @@ msgid_plural "survivor naginata" msgstr[0] "" msgstr[1] "" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -53043,7 +53143,7 @@ msgid_plural "dories" msgstr[0] "" msgstr[1] "" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "doryA lança bem feita com cabeça de bronze, origem grega." @@ -53054,7 +53154,7 @@ msgid_plural "ji" msgstr[0] "ji" msgstr[1] "ji" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -53141,7 +53241,7 @@ msgid_plural "jian" msgstr[0] "jian" msgstr[1] "jian" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -53260,7 +53360,7 @@ msgid_plural "nodachi" msgstr[0] "nodachi" msgstr[1] "nodachi" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -53269,7 +53369,7 @@ msgstr "" " nodachiEsta é uma réplica maçante e barata de uma enorme espada curvadeduas" " mãos do Japão. É surpreendentemente leve para o seu tamanho." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -53399,7 +53499,7 @@ msgid_plural "cutlasses" msgstr[0] "" msgstr[1] "" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -53509,7 +53609,7 @@ msgid_plural "krises" msgstr[0] "kris" msgstr[1] "krises" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -53539,7 +53639,7 @@ msgid_plural "tiger claws" msgstr[0] "garra de tigre" msgstr[1] "garras de tigre" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -53570,7 +53670,8 @@ msgid_plural "pairs of brass knuckles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -53603,7 +53704,8 @@ msgid_plural "pairs of nail knuckles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -53619,7 +53721,8 @@ msgid_plural "pairs of steel knuckles" msgstr[0] "" msgstr[1] "" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -53718,7 +53821,7 @@ msgid_plural "throwing knives" msgstr[0] "faca de arremesso" msgstr[1] "facas de arremesso" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -53747,7 +53850,8 @@ msgid_plural "sheets of glass" msgstr[0] "folha de vidro" msgstr[1] "folhas de vidro" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " @@ -53756,7 +53860,7 @@ msgstr "" "Você quebra o vidro e coloca os cacos no chão, prontos para serem quebrados " "por alguma coisa que passe por cima." -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -53770,7 +53874,8 @@ msgid_plural "sheets of reinforced glass" msgstr[0] "folha de vidro reforçado" msgstr[1] "folhas de vidro reforçado" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "" @@ -53782,7 +53887,8 @@ msgid_plural "panes of reinforced glass" msgstr[0] "painel de vidro reforçado" msgstr[1] "painéis de vidro reforçado" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "" @@ -53880,7 +53986,7 @@ msgid_plural "scrap copper" msgstr[0] "sucata de cobre" msgstr[1] "sucata de cobre" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "" @@ -53948,7 +54054,7 @@ msgid_plural "mattresses" msgstr[0] "colchão" msgstr[1] "colchões" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "Um colchão de tamanho único ou de casal." @@ -53959,7 +54065,7 @@ msgid_plural "down mattresses" msgstr[0] "colchão de penas" msgstr[1] "colchões de penas" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "Um colchão de tamanho único ou de casal, recheado de plumas." @@ -54301,21 +54407,28 @@ msgid_plural "sealed jars of eggs" msgstr[0] "frasco selado de ovos" msgstr[1] "frascos selados de ovos" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Abrir jarra" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Você abre o jarro, expondo-o à atmosfera." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -54330,7 +54443,8 @@ msgid_plural "sealed jars of pickles" msgstr[0] "jarra selada de picles" msgstr[1] "jarras seladas de picles" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -54345,7 +54459,8 @@ msgid_plural "sealed jars of sauerkraut" msgstr[0] "frasco selado de chucrute" msgstr[1] "frascos selados de chucrute" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -55003,7 +55118,7 @@ msgid_plural "radio car boxes" msgstr[0] "" msgstr[1] "" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -55113,7 +55228,8 @@ msgid_plural "sets of ring stand clamps" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -55177,7 +55293,8 @@ msgid_plural "pairs of knitting needles" msgstr[0] "par de agulhas de tricô" msgstr[1] "pares de agulhas de tricô" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -55274,7 +55391,8 @@ msgid_plural "distaves and spindles" msgstr[0] "roca e fuso" msgstr[1] "rocas e fusos" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -55397,7 +55515,7 @@ msgid_plural "storage battery cases" msgstr[0] "estojo de baterias de armazenamento" msgstr[1] "estojos de baterias de armazenamento" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -55412,7 +55530,7 @@ msgid_plural "wood boat hulls" msgstr[0] "" msgstr[1] "" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -55428,7 +55546,7 @@ msgid_plural "plastic boat hulls" msgstr[0] "" msgstr[1] "" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -55462,7 +55580,7 @@ msgid_plural "oars" msgstr[0] "remos" msgstr[1] "remos" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Caso contrário, para um barco." @@ -55473,7 +55591,7 @@ msgid_plural "sails" msgstr[0] "vela de barco" msgstr[1] "velas de barco" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "Velas para um barco." @@ -55484,7 +55602,8 @@ msgid_plural "inflatable section" msgstr[0] "seção inflável" msgstr[1] "seções infláveis" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "seção inflávelUma seção inflável do barco." @@ -55495,7 +55614,8 @@ msgid_plural "inflatable airbag" msgstr[0] "airbag inflável" msgstr[1] "airbags infláveis" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "airbag inflávelUma bolsa a ar inflável." @@ -55683,7 +55803,8 @@ msgid_plural "sets of vehicle controls" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "" @@ -55745,7 +55866,8 @@ msgid_plural "sets of drive by wire controls" msgstr[0] "" msgstr[1] "" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -55760,7 +55882,7 @@ msgid_plural "robot driving units" msgstr[0] "" msgstr[1] "" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -55957,7 +56079,7 @@ msgid_plural "vehicle scoops" msgstr[0] "" msgstr[1] "" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -55973,7 +56095,7 @@ msgid_plural "seed drills" msgstr[0] "" msgstr[1] "" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -55990,7 +56112,7 @@ msgid_plural "reapers" msgstr[0] "" msgstr[1] "" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -56039,7 +56161,7 @@ msgid_plural "plows" msgstr[0] "arado" msgstr[1] "arados" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "Um pesado conjunto de rodas e lâminas de aço que sobem o solo." @@ -56205,7 +56327,8 @@ msgid_plural "emergency vehicle lights (red)" msgstr[0] "luz de veículo de emergência (vermelha)" msgstr[1] "luzes de veículo de emergência (vermelhas)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -56220,7 +56343,8 @@ msgid_plural "emergency vehicle lights (blue)" msgstr[0] "luz de veículo de emergência (azul)" msgstr[1] "luzes de veículo de emergência (azuis)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -56261,7 +56385,8 @@ msgid_plural "sets of hand rims" msgstr[0] "" msgstr[1] "" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "conjunto de jantes de mãoJantes para uso em cadeira de rodas." @@ -56967,7 +57092,7 @@ msgid_plural "vehicle coolers" msgstr[0] "ar-condicionado de veículo" msgstr[1] "ares-condicionados de veículo" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "Um ar-condicionado para instalar em veículos." @@ -56978,7 +57103,7 @@ msgid_plural "vehicle heaters" msgstr[0] "aquecedor de veículo" msgstr[1] "aquecedores de veículo" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "Um aquecedor para instalar em veículos." @@ -57357,9 +57482,8 @@ msgstr[1] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -70512,7 +70636,7 @@ msgid_plural "lambs" msgstr[0] "" msgstr[1] "" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -78927,7 +79051,8 @@ msgstr[1] "" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -79541,12 +79666,14 @@ msgid_plural "phase immersion suits (on)" msgstr[0] "" msgstr[1] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -105477,10 +105604,10 @@ msgid "" msgstr "" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "feno" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "Um fardo de feno. Você poderia dormir nisso, em último caso." @@ -106996,7 +107123,7 @@ 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 "" +msgstr "Você gira a manivela..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py @@ -107016,12 +107143,12 @@ 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 "" +msgstr "Você puxa a corda..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py msgid "The palisade gate swings closed with a crash!" -msgstr "O portão de paliçada balança se fechando com uma batida!" +msgstr "O portão de paliçada se fecha com uma batida!" #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py @@ -107051,7 +107178,7 @@ msgstr "A porta sobe!" #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You throw the lever…" -msgstr "" +msgstr "Você puxa a alavanca..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py @@ -107071,12 +107198,12 @@ msgstr "A estante de livros se abre!" #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You pull an odd looking book..." -msgstr "Você pucha um livro estanho" +msgstr "Você puxa um livro estanho..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py msgid "The wall slides closed." -msgstr "A parede se fecha." +msgstr "A parede desliza e se fecha." #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py @@ -107091,7 +107218,7 @@ msgstr "A parede de correr se abre!" #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You trigger the odd looking statue..." -msgstr "Você ativa uma estranha estatua..." +msgstr "Você ativa a estranha estátua..." #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py @@ -107106,12 +107233,12 @@ msgstr "Você ativa o mecanismo..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py msgid "The glass wall slides closed." -msgstr "A parede de vidro se fecha." +msgstr "A parede de vidro desliza e se fecha." #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py msgid "The glass wall can't be closed!" -msgstr "a parede de vidro não pode ser fechada!" +msgstr "A parede de vidro não pode ser fechada!" #. ~ 'open' action message of some gate object. #: lang/json/gates_from_json.py @@ -107126,22 +107253,22 @@ msgstr "Você ativa o mecanismo..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py msgid "The bolts slide back into place." -msgstr "Os tricos deslisam de volta." +msgstr "Os trincos deslizam de volta." #. ~ 'fail' action message of some gate object. #: lang/json/gates_from_json.py msgid "The release can't be activated!" -msgstr "O lançamento não pode ser ativado!" +msgstr "A trava não pode ser ativada!" #. ~ 'open' action message of some gate object. #: lang/json/gates_from_json.py msgid "The bolts fall open!" -msgstr "Os tricos se abrem!" +msgstr "Os trincos se abrem!" #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py msgid "You activate the security bolt release..." -msgstr "Você ativa a liberação do parafuso de segurança ..." +msgstr "Você ativa a trava do fecho de segurança..." #. ~ 'close' action message of some gate object. #: lang/json/gates_from_json.py @@ -107156,7 +107283,7 @@ msgstr "A ponte não pode ser estendida!" #. ~ 'open' action message of some gate object. #: lang/json/gates_from_json.py msgid "The bridge retracts!" -msgstr "A ponte retrai!" +msgstr "A ponte se retrai!" #. ~ 'pull' action message of some gate object. #: lang/json/gates_from_json.py @@ -107187,8 +107314,8 @@ msgstr "rifle" #: lang/json/gun_from_json.py msgid "acid dart gun" msgid_plural "acid dart guns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "arma de dardos ácidos" +msgstr[1] "armas de dardos ácidos" #: lang/json/gun_from_json.py msgid "fusion blaster" @@ -107198,11 +107325,11 @@ msgstr[1] "" #: lang/json/gun_from_json.py msgid "single shot" -msgstr "" +msgstr "tiro único" #: lang/json/gun_from_json.py msgid "triple shot" -msgstr "" +msgstr "tiro triplo" #: lang/json/gun_from_json.py msgid "fusion blaster rifle" @@ -107222,8 +107349,8 @@ msgstr "" #: lang/json/gun_from_json.py msgid "FTK-93 fusion gun" msgid_plural "FTK-93 fusion guns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "arma de fusão FTK-93" +msgstr[1] "armas de fusão FTK-93" #: lang/json/gun_from_json.py msgid "" @@ -107231,34 +107358,33 @@ msgid "" "monsters. It can only hold two rounds at a time, but a special superheating" " unit causes its bolts to be extremely deadly." msgstr "" -" Arma de fusão FTK-93 Um rifle de fusão muito poderoso desenvolvido " -"poucoantes do influxo de monstros. Só pode aguentar duas rodadas de cada " -"vez, mas uma unidade especial de superaquecimento faz com que seus " -"parafusossejam extremamente letais." +"Um rifle de fusão muito poderoso desenvolvido pouco antes do influxo de " +"monstros. Só comporta dois tiros de cada vez, mas uma unidade especial de " +"superaquecimento faz com que seus raios sejam extremamente letais." #: lang/json/gun_from_json.py msgid "acid spit gun" msgid_plural "acid spit guns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "arma de jato ácido" +msgstr[1] "armas de jato ácido" #: lang/json/gun_from_json.py msgid "reach bow" msgid_plural "reach bows" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "arco de alcance" +msgstr[1] "arcos de alcance" #: lang/json/gun_from_json.py msgid "A test item that is both a ranged weapon and a reach weapon" msgstr "" -" reach bow Um item de teste que é tanto uma arma de longo alcance quanto " -"umaarma de alcance" +"Um item de teste que é tanto uma arma de longo alcance quanto uma arma de " +"alcance" #: lang/json/gun_from_json.py msgid "mi-go bio-gun" msgid_plural "mi-go bio-guns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "bio-arma mi-go" +msgstr[1] "bio-armas mi-go" #: lang/json/gun_from_json.py msgid "" @@ -107279,32 +107405,31 @@ msgid "" "been crudely modified to disperse gasoline, and a small pump attached to the" " side allows for repressurization, though this process takes a few minutes." msgstr "" -" Um favorito de hooligans ao redor do mundo, este mais leve duto-gravadopara" -" uma lata de spray é provavelmente tão perigoso para o usuário comoqualquer " -"outra pessoa. O bocal foi modificado grosseiramente para dispersara " -"gasolina, e uma pequena bomba presa ao lado permite a repressurização, " +"Um favorito de hooligans ao redor do mundo, este isqueiro preso com fita a " +"uma lata de spray é provavelmente tão perigoso para o usuário como para " +"qualquer outra pessoa. O bocal foi modificado grosseiramente para dispersar " +"a gasolina, e uma pequena bomba presa ao lado permite a repressurização, " "embora esse processo leve alguns minutos." #: lang/json/gun_from_json.py msgid "simple flamethrower" msgid_plural "simple flamethrowers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lança-chamas simples" +msgstr[1] "lança-chamas simples" #: lang/json/gun_from_json.py msgid "" "A simple, home-made flamethrower. While its capacity is not superb, it is " "more than capable of igniting terrain and monsters alike." msgstr "" -" lança-chamas simples Um lança-chamas simples e caseiro. Embora " -"suacapacidade não seja excelente, é mais do que capaz de acender terreno " -"emonstros." +"Um lança-chamas simples e caseiro. Embora sua capacidade não seja excelente," +" é mais do que capaz de incendiar terreno e monstros." #: lang/json/gun_from_json.py msgid "homemade laser pistol" msgid_plural "homemade laser pistols" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pistola laser caseira" +msgstr[1] "pistolas laser caseiras" #: lang/json/gun_from_json.py msgid "" @@ -107312,9 +107437,9 @@ msgid "" " century. While little more than duct tape and electronics, it runs on a " "standard UPS." msgstr "" -" pistola a laser caseira Esta pistola laser foi baseada na pistola laser " -"V29projetada em meados do século XXI. Embora pouco mais que fita adesiva " -"eeletrônica, ele é executado em um no-break padrão." +"Esta pistola laser foi baseada na pistola laser V29 projetada em meados do " +"século XXI. Embora pouco mais que fita adesiva e peças de eletrônica, ela é " +"abastecida pelo Suprimento de Energia Unificado normal." #: lang/json/gun_from_json.py lang/json/gunmod_from_json.py src/item.cpp msgctxt "gun_type_type" @@ -107331,8 +107456,8 @@ msgstr[1] "" msgid "" "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!" msgstr "" -" Tankbot Main Gun O canhão de 120mm de um tankbot. Se você tem isso, émelhor" -" você estar depurando!" +"O canhão de 120 mm de um tankbot. Se você tem isso, é melhor você estar " +"depurando!" #: lang/json/gun_from_json.py lang/json/gun_from_json.py #: lang/json/gunmod_from_json.py lang/json/gunmod_from_json.py @@ -107352,53 +107477,53 @@ msgid "" "together in the shape of a rifle with nothing more than glue, duct tape, and" " generous amounts of faith." msgstr "" -" Special 700 Um receptor enferrujado, um cano padrão R700 e meia " -"muletaquebrada; todos mantidos juntos na forma de um rifle com nada mais do " -"quecola, fita adesiva e quantidades generosas de fé." +"Um receptor enferrujado, um cano padrão R700 e meia muleta quebrada; todos " +"mantidos juntos na forma de um rifle com nada mais do que cola, fita adesiva" +" e quantidades generosas de fé." #: lang/json/gun_from_json.py msgid "base gun" msgid_plural "base guns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "arma base" +msgstr[1] "armas base" #: lang/json/gun_from_json.py msgid "base flamethrower" msgid_plural "base flamethrowers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lança-chamas base" +msgstr[1] "lança-chamas base" #: lang/json/gun_from_json.py msgid "slosh." -msgstr "espirra." +msgstr "slosh." #: lang/json/gun_from_json.py msgid "base launcher" msgid_plural "base launchers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "lançador base" +msgstr[1] "lançadores base" #: lang/json/gun_from_json.py msgid "single" -msgstr "base lançador de base de lança-chamas base de lançador único" +msgstr "único" #: lang/json/gun_from_json.py msgid "base pistol" msgid_plural "base pistols" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pistola base" +msgstr[1] "pistolas base" #: lang/json/gun_from_json.py msgid "backup pistol" msgid_plural "backup pistols" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "pistola reserva" +msgstr[1] "pistolas reserva" #: lang/json/gun_from_json.py src/item_factory.cpp msgid "revolver" msgid_plural "revolvers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "revólver" +msgstr[1] "revólveres" #: lang/json/gun_from_json.py msgid "cap & ball revolver" @@ -107493,15 +107618,15 @@ msgid "" "action shotgun was designed for hunting big game, with durability and ease " "of use as priorities." msgstr "" -"Utilizando um calibre potente e invulgar, a espingarda de acção por bomba " +"Utilizando um calibre potente e invulgar, a espingarda de ação por bomba " "Rivtech RM120c foi concebida para caça de animais de grande porte, com " "durabilidade e facilidade de utilização sendo as prioridades." #: lang/json/gun_from_json.py msgid "RM20 autoshotgun" msgid_plural "RM20 autoshotguns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "auto-escopeta RM20" +msgstr[1] "auto-escopetas RM20" #: lang/json/gun_from_json.py msgid "" @@ -107509,9 +107634,8 @@ msgid "" "automatic combat shotgun was designed with durability and overwhelming power" " in mind." msgstr "" -" Carabina automática RM20 Utilizando um poderoso e incomum calibre, " -"aespingarda automática de combate Rivtech RM20 foi projetada comdurabilidade" -" e poder esmagador em mente." +"Utilizando um poderoso e incomum calibre, a espingarda automática de combate" +" Rivtech RM20 foi projetada com durabilidade e poder esmagador em mente." #: lang/json/gun_from_json.py src/item_factory.cpp msgid "semi-auto" @@ -107520,8 +107644,8 @@ msgstr "semi-automática" #: lang/json/gun_from_json.py msgid "RM228 PDW" msgid_plural "RM228 PDWs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "RM228 PDW" +msgstr[1] "RM228 PDWs" #: lang/json/gun_from_json.py msgid "" @@ -107531,11 +107655,11 @@ msgid "" "and light weight, its hefty price tag kept it out of the reach of casual " "collectors." msgstr "" -" RM228 PDW Com o poderoso cartucho shotgun de 20x66mm, o Rivtech RM228 " -"PDWfoi projetado para o mercado civil de defesa pessoal com durabilidade " -"efacilidade de uso como prioridades. Embora elogiado por seu pequeno " -"tamanhoe peso leve, seu preço robusto manteve-o fora do alcance de " -"colecionadorescasuais." +"Utilizando o poderoso cartucho sem invólucro de 20x66 mm, a Rivtech RM228 " +"PDW foi projetada para o mercado civil de defesa pessoal com durabilidade e " +"facilidade de uso como prioridades. Embora elogiada por seu pequeno tamanho " +"e peso leve, seu preço elevado manteve-a fora do alcance de colecionadores " +"casuais." #: lang/json/gun_from_json.py msgid "American-180" @@ -107556,8 +107680,8 @@ msgstr "" #: lang/json/gun_from_json.py msgid "Marlin 39A" msgid_plural "Marlin 39A" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Marlin 39A" +msgstr[1] "Marlin 39As" #: lang/json/gun_from_json.py msgid "" @@ -107565,15 +107689,15 @@ msgid "" "fires the weak .22 round, it is highly accurate and damaging, and has " "essentially no recoil." msgstr "" -" Marlin 39A A arma de fogo de ombro mais antiga e mais comprida do mundo. " -"Apesar de disparar a rodada fraca de 0,22, ela é altamente precisa " -"eprejudicial, e essencialmente não tem recuo." +"A arma de fogo de ombro mais antiga e produzida pelo maior tempo do mundo. " +"Apesar de disparar o fraco .22, ela é altamente precisa e prejudicial, e " +"essencialmente não tem recuo." #: lang/json/gun_from_json.py msgid "Mossberg Brownie" msgid_plural "Mossberg Brownie" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Mossberg Brownie" +msgstr[1] "Mossberg Brownies" #: lang/json/gun_from_json.py msgid "" @@ -107618,8 +107742,8 @@ msgstr "" #: lang/json/gun_from_json.py msgid "Ruger 10/22" msgid_plural "Ruger 10/22" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ruger 10/22" +msgstr[1] "Ruger 10/22" #: lang/json/gun_from_json.py msgid "" @@ -107628,22 +107752,22 @@ msgid "" " game hunters. Even though it fires the weak .22 round, it's perfectly " "capable of killing." msgstr "" -" Ruger 10/22 Uma combinação de recuo insignificante, alta customização " -"emunição barata fez do Ruger 10/22 uma escolha popular entre entusiastas " -"ecaçadores de caça. Mesmo que atire no fraco 22, é perfeitamente capaz " -"dematar." +"Uma combinação de recuo insignificante, alta customização e munição barata " +"fez do Ruger 10/22 uma escolha popular entre entusiastas e caçadores de " +"animais de pequeno porte. Mesmo que atire o fraco .22, é perfeitamente capaz" +" de matar." #: lang/json/gun_from_json.py msgid "Ruger LCR .22" msgid_plural "Ruger LCR .22" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ruger LCR .22" +msgstr[1] "Ruger LCR .22" #: lang/json/gun_from_json.py msgid "SIG Mosquito" msgid_plural "SIG Mosquito" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "SIG Mosquito" +msgstr[1] "SIG Mosquitos" #: lang/json/gun_from_json.py msgid "" @@ -107651,25 +107775,25 @@ msgid "" "produced during the latter 20th-early 21st centuries; it has an underbarrel " "rail." msgstr "" -" Ruger LCR .22 SIG Mosquito Uma popular e pequena pistola .22 LR. Uma " -"dasmuitas pistolas de estrutura de polímero produzidas durante o final " -"doséculo XX-XXI; tem um trilho underbarrel." +"Uma popular e pequena pistola .22 LR. Uma das muitas pistolas de estrutura " +"de polímero produzidas durante o final do século XX-XXI; tem um trilho sob o" +" cano." #: lang/json/gun_from_json.py msgid "S&W 22A" msgid_plural "S&W 22A" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "S&W 22A" +msgstr[1] "S&W 22As" #: lang/json/gun_from_json.py msgid "A popular .22 pistol." -msgstr "S & W 22A Uma popular pistola .22." +msgstr "Uma popular pistola .22." #: lang/json/gun_from_json.py msgid "Jennings J-22" msgid_plural "Jennings J-22s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Jennings J-22" +msgstr[1] "Jennings J-22s" #: lang/json/gun_from_json.py msgid "" @@ -107683,8 +107807,8 @@ msgstr "" #: lang/json/gun_from_json.py msgid "Walther P22" msgid_plural "Walther P22s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Walther P22" +msgstr[1] "Walther P22s" #: lang/json/gun_from_json.py msgid "" @@ -107696,8 +107820,8 @@ msgstr "" #: lang/json/gun_from_json.py msgid "Remington ACR" msgid_plural "Remington ACRs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Remington ACR" +msgstr[1] "Remington ACRs" #: lang/json/gun_from_json.py msgid "" @@ -107705,15 +107829,15 @@ msgid "" "is damaging and accurate, though its rate of fire is a bit slower than " "competing .223 carbines." msgstr "" -" Remington ACR Esta carabina foi desenvolvida para uso militar no início " -"doséculo XXI. É prejudicial e preciso, embora sua taxa de tiro seja um " -"poucomais lenta que as carabinas competidoras." +"Esta carabina foi desenvolvida para uso militar no início do século XXI. É " +"prejudicial e precisa, embora sua taxa de tiro seja um pouco mais lenta que " +"as outras marcas de carabinas .223." #: lang/json/gun_from_json.py msgid "AR-15" msgid_plural "AR-15s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "AR-15" +msgstr[1] "AR-15s" #: lang/json/gun_from_json.py msgid "" @@ -107721,30 +107845,29 @@ msgid "" "lightweight and accurate, but will malfunction if not properly maintained. " "This one is a semi automatic civilian version." msgstr "" -" AR-15 Este rifle onipresente é o antepassado da série de rifles M16. É " -"levee preciso, mas irá funcionar mal se não for mantido adequadamente. Este " -"éuma versão civil semi-automática." +"Este rifle onipresente é o antepassado da série de rifles M16. É leve e " +"preciso, mas irá funcionar mal se não for mantido adequadamente. Este é uma " +"versão civil semi-automática." #: lang/json/gun_from_json.py msgid "HK416 A5" msgid_plural "HK416 A5s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "HK416 A5" +msgstr[1] "HK416 A5s" #: lang/json/gun_from_json.py msgid "" "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of " "the former's strengths, while being considerably more durable." msgstr "" -" H & K 416A5 Projetado para substituir o M4A1, o Heckler e o Koch " -"416A5apresentam a maioria dos pontos fortes do primeiro, sendo " -"consideravelmentemais duráveis." +"Projetado para substituir o M4A1, o Heckler & Koch 416A5 apresenta a maioria" +" dos pontos fortes de seu antecessor, sendo consideravelmente mais durável." #: lang/json/gun_from_json.py msgid "H&K G36" msgid_plural "H&K G36s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "H&K G36" +msgstr[1] "H&K G36s" #: lang/json/gun_from_json.py msgid "" @@ -107752,15 +107875,15 @@ msgid "" " accurate, and uses the much-lighter .223 round, allowing for a higher ammo " "capacity." msgstr "" -" H & K G36 Projetado como um substituto para o antigo rifle de batalha " -"H& K G3, o G36 é mais preciso e usa a rodada mais leve de 223,permitindo" -" uma maior capacidade de munição." +"Projetado como um substituto para o antigo rifle de batalha H&K G3, o G36 é " +"mais preciso e usa o cartucho mais leve .223, permitindo uma maior " +"capacidade de munição." #: lang/json/gun_from_json.py msgid "L2037 Backup" msgid_plural "L2037 Backups" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "L2037 Backup" +msgstr[1] "L2037 Backups" #: lang/json/gun_from_json.py msgid "" @@ -117466,7 +117589,7 @@ msgstr "" #: lang/json/help_from_json.py msgid ": Martial arts styles" -msgstr "" +msgstr ": Estilos de artes marciais" #: lang/json/help_from_json.py msgid "" @@ -117515,7 +117638,7 @@ msgstr "" #: lang/json/help_from_json.py msgid ": Survival tips" -msgstr "" +msgstr ": Dicas de sobrevivência" #: lang/json/help_from_json.py msgid "" @@ -117523,6 +117646,9 @@ msgid "" "water, food. The rest is the process of trying to answer a question what " "would you do in a survival situation?" msgstr "" +"A hierarquia das necessidades de sobrevivência costuma ser assim: abrigo, " +"fogo, água, comida. O resto é o processo de tentar responder a questão do " +"que fazer em uma situação de sobrevivência." #: lang/json/help_from_json.py msgid "" @@ -173686,16 +173812,16 @@ msgid "Clothing Store" msgstr "Loja de roupas" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." -msgstr "Acólito." +msgid "You there. Quiet down. Can you hear it? The song?" +msgstr "Você aí. Silêncio. Consegue escutar? A canção?" #: lang/json/talk_topic_from_json.py msgid "You're back. Have you come to listen to the song?" 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 "Você aí. Silêncio. Consegue escutar? A canção?" +msgid "Acolyte." +msgstr "Acólito." #: lang/json/talk_topic_from_json.py msgid "What? What do you mean? What song?" @@ -173842,42 +173968,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -173950,13 +174076,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174172,14 +174298,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174350,16 +174476,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "O que você está fazendo aqui?" @@ -174431,24 +174557,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "Não, só não..." +msgid "Anything to do before I go to sleep?" +msgstr "Qualquer coisa para fazer antes de ir dormir?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "Apenas me deixe dormir !" +msgid "Just few minutes more..." +msgstr "Apenas alguns minutos mais ..." #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Faça isso rápido, eu quero voltar a dormir." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Apenas alguns minutos mais ..." +msgid "Just let me sleep, !" +msgstr "Apenas me deixe dormir !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "Qualquer coisa para fazer antes de ir dormir?" +msgid "No, just no..." +msgstr "Não, só não..." #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -174562,15 +174688,15 @@ msgid "Let's go." msgstr "Vamos lá." #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174578,19 +174704,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174598,7 +174720,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -174606,7 +174728,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174614,19 +174736,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174634,7 +174756,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174642,13 +174764,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -174757,13 +174883,12 @@ msgid "Attack anything you want." msgstr "Ataque o que quiser." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174773,11 +174898,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174817,12 +174943,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174832,12 +174958,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174873,19 +174999,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -174929,7 +175055,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174937,11 +175063,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174949,7 +175071,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174957,7 +175079,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174965,7 +175087,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174973,7 +175095,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174981,7 +175103,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174989,7 +175111,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -174997,13 +175119,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Siga as mesmas regras deste seguidor." @@ -175172,14 +175298,14 @@ msgstr "" msgid "Sure thing, I'll make my way there." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -175351,28 +175477,28 @@ msgid "I don't care." msgstr "Eu não me importo." #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "Eu tenho mais um trabalho pra você. Quer ouvir a respeito?" - -#: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -msgstr "Eu tenho só um trabalho pra você. Quer ouvir a respeito?" +msgid "I don't have any more jobs for you." +msgstr "Eu não tenho mais trabalhos para você." #: lang/json/talk_topic_from_json.py -msgid "I have other jobs for you. Want to hear about them?" -msgstr "Eu tenho outros trabalhos pra você. Quer ouvir a respeito deles?" +msgid "I don't have any jobs for you." +msgstr "Eu não tenho nenhum trabalho para você." #: lang/json/talk_topic_from_json.py msgid "I have more jobs for you. Want to hear about them?" msgstr "Eu tenho mais trabalhos pra você. Quer ouvir a respeito deles?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any jobs for you." -msgstr "Eu não tenho nenhum trabalho para você." +msgid "I have other jobs for you. Want to hear about them?" +msgstr "Eu tenho outros trabalhos pra você. Quer ouvir a respeito deles?" #: lang/json/talk_topic_from_json.py -msgid "I don't have any more jobs for you." -msgstr "Eu não tenho mais trabalhos para você." +msgid "I just have one job for you. Want to hear about it?" +msgstr "Eu tenho só um trabalho pra você. Quer ouvir a respeito?" + +#: lang/json/talk_topic_from_json.py +msgid "I have another job for you. Want to hear about it?" +msgstr "Eu tenho mais um trabalho pra você. Quer ouvir a respeito?" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -175383,10 +175509,6 @@ msgstr "Ok." msgid "Never mind, I'm not interested." msgstr "Não importa, não estou interessado." -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "Você não está trabalhando em nada pra mim no momento." - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Qual trabalho?" @@ -175395,6 +175517,10 @@ msgstr "Qual trabalho?" msgid "What about it?" msgstr "O que tem?" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "Você não está trabalhando em nada pra mim no momento." + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Eu vou fazer isso!" @@ -175612,49 +175738,49 @@ msgstr "Hmm OK." msgid "Thanks!" msgstr "Obrigado!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -msgstr "Foque na estrada, chapa!" - #: lang/json/talk_topic_from_json.py msgid "I must focus on the road!" msgstr "Eu preciso focar na estrada!" #: lang/json/talk_topic_from_json.py -msgid "I'm too thirsty, give me something to drink." -msgstr "Estou com muita sede, me dê algo para beber." +msgid "I have some reason for not telling you." +msgstr "Eu tenho alguns motivos pra não lhe dizer." #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Estou com muita fome, me dê algo para comer." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "Estou muito cansado, deixe-me descansar primeiro." #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "" +msgid "I'm too hungry, give me something to eat." +msgstr "Estou com muita fome, me dê algo para comer." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." -msgstr "Eu tenho alguns motivos pra não lhe dizer." +msgid "I'm too thirsty, give me something to drink." +msgstr "Estou com muita sede, me dê algo para beber." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "Foque na estrada, chapa!" #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ah ok." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Não até eu conseguir alguns antibióticos ..." +msgid "Why should I travel with you?" +msgstr "Por que eu deveria viajar com você?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Você me perguntou recentemente; pergunte novamente mais tarde." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "Por que eu deveria viajar com você?" +msgid "Not until I get some antibiotics..." +msgstr "Não até eu conseguir alguns antibióticos ..." #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -175744,21 +175870,21 @@ msgstr "Não, vamos ficar bem aqui." msgid "On second thought, never mind." msgstr "No segundo pensamento, não importa." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Não consigo lhe treinar direito enquanto você opera um veículo!" - #: lang/json/talk_topic_from_json.py msgid "I can't train you properly while I'm operating a vehicle!" msgstr "Não consigo lhe treinar direito enquanto opero um veículo!" +#: lang/json/talk_topic_from_json.py +msgid "I have some reason for denying you training." +msgstr "Eu tenho alguns motivos para negar que você está treinando." + #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "Dá um tempo, eu vou te mostrar algo novo depois ..." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "Eu tenho alguns motivos para negar que você está treinando." +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Não consigo lhe treinar direito enquanto você opera um veículo!" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -175796,14 +175922,14 @@ msgstr "Eu prefiro manter isso para mim mesmo." msgid "I understand…" msgstr "Eu entendo..." -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Você acabou de me pedir coisas; pergunte mais tarde." - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "Por que devo compartilhar meu equipamento com você?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Você acabou de me pedir coisas; pergunte mais tarde." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "OK tudo bem." @@ -175947,16 +176073,16 @@ msgstr "Prazer fazer negócios!" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "Ei. Vamos conversar um minuto." @@ -176954,27 +177080,27 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." -msgstr "Saudações amigo, é bom te ver." +msgid "Greeting citizen, what brings you to the FoodLair?" +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" +msgid "Still here? Take your time, it's rough out there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" -msgstr "" +msgid "Greetings friend, it's nice to see you." +msgstr "Saudações amigo, é bom te ver." #: lang/json/talk_topic_from_json.py msgid "Welcome home Foodkid!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." +msgid "What sorcery is this?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" +msgid "So you're back… Explain yourself!" msgstr "" #: lang/json/talk_topic_from_json.py @@ -178602,10 +178728,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "Eu simplesmente não posso falar sobre isso agora. Eu não posso." - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -178614,7 +178736,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -178625,10 +178748,13 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "Eu simplesmente não posso falar sobre isso agora. Eu não posso." + #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." msgstr "Pode ajudar a tirá-lo do seu peito." @@ -179028,19 +179154,19 @@ msgstr "Obrigado por me contar tudo isso. " #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -" Meu marido saiu comigo, mas foi comido por um daqueles plantar " +" Minha esposa saiu comigo, mas foi comido por um daqueles plantar " "monstros alguns dias antes de te conhecer. Este não foi um grande ano para " "mim." #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -" Minha esposa saiu comigo, mas foi comido por um daqueles plantar " +" Meu marido saiu comigo, mas foi comido por um daqueles plantar " "monstros alguns dias antes de te conhecer. Este não foi um grande ano para " "mim." @@ -179103,11 +179229,10 @@ msgid "I'm sorry you lost someone." msgstr "Sinto muito que você tenha perdido alguém." #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" -" Eu disse, eu não quero falar sobre isso. Como você não está entendendo " -"isso?" +" Apenas outro conto de amor e perda. Não é um que eu goste de " +"contar." #: lang/json/talk_topic_from_json.py msgid "" @@ -179118,10 +179243,11 @@ msgstr "" "para contar mais uma vez." #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" -" Apenas outro conto de amor e perda. Não é um que eu goste de " -"contar." +" Eu disse, eu não quero falar sobre isso. Como você não está entendendo " +"isso?" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -179144,51 +179270,51 @@ msgid "" "Oh, . This doesn't have anything to do with you, or with us." msgstr "Oh, . Isso não tem nada a ver com você ou conosco." -#: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." -msgstr "Tudo bem. Eu tive alguém. Eu perdi ele." - #: lang/json/talk_topic_from_json.py msgid "All right, fine. I had someone. I lost her." msgstr "Tudo bem. Eu tive alguém. Eu a perdi." +#: lang/json/talk_topic_from_json.py +msgid "All right, fine. I had someone. I lost him." +msgstr "Tudo bem. Eu tive alguém. Eu perdi ele." + #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -" Ele estava em casa quando as bombas começaram a cair e o mundo foi para o " +" Ela estava em casa quando as bombas começaram a cair e o mundo foi para o " "inferno. Eu estava no trabalho. Eu tentei chegar à nossa casa, mas a cidade " "era uma zona de guerra. Coisas que não consigo descrever andando pelas ruas," " esmagando pessoas e carros. Soldados tentando detê-los, mas atingindo as " "pessoas no fogo cruzado, tanto quanto qualquer outra coisa. E então o dano " -"colateral voltaria e se juntaria ao inimigo. Se não fosse pelo meu marido, " +"colateral voltaria e se juntaria ao inimigo. Se não fosse por minha esposa, " "eu teria acabado de sair, mas fiz o que pude e escorreguei. eu na verdade " " fez isso vivo." #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -" Ela estava em casa quando as bombas começaram a cair e o mundo foi para o " +" Ele estava em casa quando as bombas começaram a cair e o mundo foi para o " "inferno. Eu estava no trabalho. Eu tentei chegar à nossa casa, mas a cidade " "era uma zona de guerra. Coisas que não consigo descrever andando pelas ruas," " esmagando pessoas e carros. Soldados tentando detê-los, mas atingindo as " "pessoas no fogo cruzado, tanto quanto qualquer outra coisa. E então o dano " -"colateral voltaria e se juntaria ao inimigo. Se não fosse por minha esposa, " +"colateral voltaria e se juntaria ao inimigo. Se não fosse pelo meu marido, " "eu teria acabado de sair, mas fiz o que pude e escorreguei. eu na verdade " " fez isso vivo." @@ -179261,11 +179387,11 @@ msgstr "Você entrou na casa?" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -179273,11 +179399,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -180059,6 +180185,16 @@ msgstr "" "acho que perambulo pelo Inferno na Terra. Eu gostaria de ter prestado mais " "atenção na Escola Dominical." +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -180070,16 +180206,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -180174,14 +180300,6 @@ msgstr "Sinto muito por Buck. " msgid "I'm sorry about Buck. " msgstr "Sinto muito por Buck. " -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "" -" Como eu disse, você quer que eu conte uma história, você tem que " -"desembolsar o uísque. Uma garrafa cheia, lembre-se." - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " @@ -180190,6 +180308,14 @@ msgstr "" " Ouço. Eu vou cortar isso. Eu trabalho para você, ok? Eu não estou " "interessado em me apegar. Você não me pagou para ser seu amigo." +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "" +" Como eu disse, você quer que eu conte uma história, você tem que " +"desembolsar o uísque. Uma garrafa cheia, lembre-se." + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -180587,29 +180713,29 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm" -" just gonna keep on believing they're out there, doing well. That's more " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " +"just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" " Bem, eu tenho essa estranha esperança. É provavelmente estúpido, mas eu vi " -"meu noivo sair de lá com sua irmã - minha dama de honra - em sua caminhonete" -" quando as coisas correram mal. Então, até eu deparar com eles de um jeito " +"minha noiva sair de lá com seu irmão - meu padrinho - em sua caminhonete " +"enquanto as coisas correram mal. Então, até eu deparar com eles de um jeito " "ou de outro, vou continuar acreditando que eles estão indo bem. Isso é mais " "do que a maioria de nós tem." #: lang/json/talk_topic_from_json.py msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " -"just gonna keep on believing they're out there, doing well. That's more " +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm" +" just gonna keep on believing they're out there, doing well. That's more " "than most of us have." msgstr "" " Bem, eu tenho essa estranha esperança. É provavelmente estúpido, mas eu vi " -"minha noiva sair de lá com seu irmão - meu padrinho - em sua caminhonete " -"enquanto as coisas correram mal. Então, até eu deparar com eles de um jeito " +"meu noivo sair de lá com sua irmã - minha dama de honra - em sua caminhonete" +" quando as coisas correram mal. Então, até eu deparar com eles de um jeito " "ou de outro, vou continuar acreditando que eles estão indo bem. Isso é mais " "do que a maioria de nós tem." @@ -180617,6 +180743,10 @@ msgstr "" msgid "What were you saying before that?" msgstr "O que você estava dizendo antes disso?" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "Olá." @@ -180637,10 +180767,6 @@ msgstr "Boas vindas!" msgid "How's the weather?" msgstr "Como anda o clima?" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "O que é este lugar?" @@ -180727,16 +180853,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180783,15 +180909,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -180825,15 +180951,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180876,14 +181002,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -180952,11 +181078,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181013,11 +181139,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181029,19 +181155,19 @@ msgid "You're disgusting." msgstr "Você é nojento." #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181067,9 +181193,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181077,7 +181201,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181152,13 +181278,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181252,7 +181378,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" +msgid "Hi, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181260,7 +181386,7 @@ msgid "Hello, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" +msgid "Is that a U.S. Marshal's badge you're wearing?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -181558,11 +181684,11 @@ msgid "That's all for now. I'd best get going." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." +msgid "Hello, We don't see many people these days." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, We don't see many people these days." +msgid "Leave our property, Marshal." msgstr "" #: lang/json/talk_topic_from_json.py @@ -181761,8 +181887,12 @@ msgid "Tell me about your dad." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "Marechal, espero que esteja aqui para nos ajudar." +msgid "" +"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 "" +" Senhor, eu não sei como diabos você chegou aqui, mas se você tem algum " +"senso, você sairá enquanto puder." #: lang/json/talk_topic_from_json.py msgid "" @@ -181773,12 +181903,8 @@ msgstr "" " senso, você sairá enquanto puder." #: 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 " -"you'll get out while you can." -msgstr "" -" Senhor, eu não sei como diabos você chegou aqui, mas se você tem algum " -"senso, você sairá enquanto puder." +msgid "Marshal, I hope you're here to assist us." +msgstr "Marechal, espero que esteja aqui para nos ajudar." #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -181858,16 +181984,16 @@ 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." -msgstr "Marechal, estou muito surpreso em ver você aqui." +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "Marechal, estou muito surpreso em ver você aqui." #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -181912,23 +182038,6 @@ msgstr "" "integridade da rede de comunicações. Esperamos que algumas mensagens de " "texto simples possam ser captadas." -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "Olá, marechal." - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "Marechal, tenho medo de não poder falar agora." - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "Eu não estou no comando aqui, marechal." - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "" -" Eu deveria direcionar todas as perguntas para a minha liderança, marechal." - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "" @@ -181941,6 +182050,15 @@ msgstr "Você deve cuidar do seu próprio negócio, nada para ver aqui." msgid "If you need something you'll need to talk to someone else." msgstr "Se você precisar de algo, precisará conversar com outra pessoa." +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "madame" + +#: lang/json/talk_topic_from_json.py +msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgstr "" +" Ei, senhorita, você não acha que seria mais seguro se você ficasse comigo?" + #: lang/json/talk_topic_from_json.py msgid "Sir." msgstr "Senhor." @@ -181951,13 +182069,21 @@ msgstr "" " Cara, se você pode manter o seu próprio você deve olhar para se alistar." #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "madame" +msgid "Hello, marshal." +msgstr "Olá, marechal." #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "Marechal, tenho medo de não poder falar agora." + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "Eu não estou no comando aqui, marechal." + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." msgstr "" -" Ei, senhorita, você não acha que seria mais seguro se você ficasse comigo?" +" Eu deveria direcionar todas as perguntas para a minha liderança, marechal." #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -182014,15 +182140,16 @@ msgid "I've no use for weaklings. Run. Now." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "" +msgid "Please, help me. I need food." +msgstr "Por favor me ajude. Eu preciso de comida." #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" +" Por favor me ajude. Eu preciso de comida. Você não é seu xerife? Você não " +"pode me ajudar?" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -182030,15 +182157,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" -" Por favor me ajude. Eu preciso de comida. Você não é seu xerife? Você não " -"pode me ajudar?" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "Por favor me ajude. Eu preciso de comida." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -182057,18 +182183,18 @@ msgstr "Saia de perto de mim." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" +" Eles não me deixam entrar. Dizem que estão muito cheios. Tenho permissão " +"para acampar aqui enquanto eu mantiver limpo e não fazer barulho, mas estou " +"com tanta fome." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" -" Eles não me deixam entrar. Dizem que estão muito cheios. Tenho permissão " -"para acampar aqui enquanto eu mantiver limpo e não fazer barulho, mas estou " -"com tanta fome." #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -182173,13 +182299,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"That's quite the offer, but I don't think I'd survive the trip. I don't " -"think you realize how useless I am in this world." +msgid "I'm sorry, I'm too hungry to make a big decision like that." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgid "" +"That's quite the offer, but I don't think I'd survive the trip. I don't " +"think you realize how useless I am in this world." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182223,17 +182349,17 @@ 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?" -msgstr "Já te falei de papelão, amigo? Voc ~ e tem algum?" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "" +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…" @@ -182263,16 +182389,16 @@ msgstr "Você está seriamente vestindo uma fantasia de dinossauro?" msgid "Do you need something to eat?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "" @@ -182371,15 +182497,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" +"That's it! I'm just gonna need a little time to get it all set up. Thanks." +" You've helped me a lot. I'm feeling much more myself with all this to " +"keep me going." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That's it! I'm just gonna need a little time to get it all set up. Thanks." -" You've helped me a lot. I'm feeling much more myself with all this to " -"keep me going." +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182399,15 +182525,18 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "" +msgid "Don't bother with these assholes." +msgstr "Não se incomode com esses idiotas." #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgid "Hey there, not-asshole. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -182417,19 +182546,16 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" +msgid "Hey there. Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "Não se incomode com esses idiotas." +msgid "Fuck off, dickwaddle." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -182719,16 +182845,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -182773,14 +182899,14 @@ msgstr "" msgid "I'll see what I can do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "Ei, você é um grande fã da sobrevivência do mais apto?" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "Por que você pergunta?" @@ -182797,12 +182923,6 @@ msgstr "" msgid "Nice to see you. I gotta be going though." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " @@ -182811,6 +182931,12 @@ msgstr "" " Porque eu com certeza não me encaixo, então estou sentada aqui até morrer " "de fome. Ajudar uma pobre alma doentia?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "" @@ -182832,12 +182958,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "Por que você está acampado aqui se eles não o deixarem entrar?" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183122,6 +183248,10 @@ msgstr "" msgid "What's your take on the situation here?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "Oh, ei, é você de novo." @@ -183134,10 +183264,6 @@ msgstr "" msgid "Aw hey, look who's back." msgstr "Ah, olhe quem está de volta." -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "Prazer em conhecê-lo, garoto. Estás bem?" @@ -183155,16 +183281,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "Eu não sou criança, ok? Eu tenho dezesseis anos." +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "Eu não sou criança, ok? Eu tenho quatorze." #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "Eu não sou criança, ok? Eu tenho quinze." #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "Eu não sou criança, ok? Eu tenho quatorze." +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "Eu não sou criança, ok? Eu tenho dezesseis anos." #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -183174,6 +183300,19 @@ msgstr "Desculpe, eu não quis dizer nada com isso. Estás bem?" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "Desculpe, eu não quis dizer nada com isso. Estarei à caminho." +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" +" Eu não sei o que está acontecendo. Não tenho certeza do que estamos fazendo" +" aqui. Eles dizem que devemos esperar até que possamos ser transferidos para" +" o abrigo no andar de baixo, mas estamos aqui há dias e não há nenhuma " +"palavra sobre quanto tempo ficaremos esperando. É tudo tão estúpido e " +"ninguém pode me dizer nada." + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -183188,19 +183327,6 @@ msgstr "" "Eu li todos os livros e há zumbis do lado de fora, então estamos presos " "aqui. Nós podemos ouvi-los durante a noite." -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" -" Eu não sei o que está acontecendo. Não tenho certeza do que estamos fazendo" -" aqui. Eles dizem que devemos esperar até que possamos ser transferidos para" -" o abrigo no andar de baixo, mas estamos aqui há dias e não há nenhuma " -"palavra sobre quanto tempo ficaremos esperando. É tudo tão estúpido e " -"ninguém pode me dizer nada." - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -183238,7 +183364,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183248,8 +183375,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -183277,11 +183403,6 @@ msgstr "" msgid "Actually I'm just heading out." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Now that you are here, everything. Is there anything Alonso can… *do for " @@ -183289,23 +183410,28 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" -msgstr "Você me conhece, eu tenho que ser eu, certo?" +msgid "" +"Well, it's a lot better now that you're here. Nice to see a familiar face." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "You know me, I gotta be me, right?" +msgstr "Você me conhece, eu tenho que ser eu, certo?" + #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -183334,6 +183460,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -183342,8 +183474,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183353,10 +183485,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." -msgstr "" +msgid "Ah, another new face. Hello. I am Boris." +msgstr "Ah, outro novo rosto. Olá. Eu sou o Boris." #: lang/json/talk_topic_from_json.py msgid "Well, well. I'm glad you are back." @@ -183370,10 +183500,6 @@ msgstr "Olá de novo, meu amigo." msgid "It is good to see you again." msgstr "É bom ver você novamente." -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "Ah, outro novo rosto. Olá. Eu sou o Boris." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -183442,13 +183568,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -183459,6 +183578,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -183487,6 +183613,10 @@ msgstr "" msgid "Got any more bread I can trade flour for?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there. I'm Dana, nice to see a new face." +msgstr "Olá. Eu sou Dana, bom ver um novo rosto." + #: lang/json/talk_topic_from_json.py msgid "Hello, nice to see you again." msgstr "Olá, prazer em vê-lo novamente." @@ -183495,10 +183625,6 @@ msgstr "Olá, prazer em vê-lo novamente." msgid "It's good to see you're still around." msgstr "É bom ver que você ainda está por perto." -#: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." -msgstr "Olá. Eu sou Dana, bom ver um novo rosto." - #: lang/json/talk_topic_from_json.py msgid "Dana, hey? Nice to meet you." msgstr "Dana, ei? Prazer em conhecê-lo." @@ -183548,8 +183674,10 @@ msgstr "Sinto muito pela sua perda." #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183560,10 +183688,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -183585,6 +183711,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -183606,12 +183738,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -183641,10 +183767,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -183652,6 +183774,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -183688,16 +183814,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -183932,12 +184058,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184037,14 +184163,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184095,6 +184221,12 @@ msgstr "" msgid "Is there anything I can do to help you out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "Olá de novo." @@ -184107,12 +184239,6 @@ msgstr "" msgid "Oh, hi." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "" @@ -184172,15 +184298,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184245,6 +184371,12 @@ msgid "" "look like we'll be here for the long term. If we live that long." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hi." msgstr "Oi." @@ -184253,12 +184385,6 @@ msgstr "Oi." msgid "Hey again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "" @@ -184305,15 +184431,15 @@ msgid "" " I think my mom's on the fence." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." -msgstr "É bom ver você de novo." - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "Olá. Não te vejo por aqui antes. Eu sou Jenny, Jenny Forcette." +#: lang/json/talk_topic_from_json.py +msgid "Nice to see you again." +msgstr "É bom ver você de novo." + #: lang/json/talk_topic_from_json.py msgid "Nice meeting you. What are you doing on that computer?" msgstr "Muito prazer em conhece-lo. O que você está fazendo nesse computador?" @@ -184498,6 +184624,20 @@ msgstr "" "escolhemos estar um com o outro. Eu não sei quanto tempo podemos ficar assim" " antes que alguém se agarre." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" +" Bem, tem um monte de gente. Estamos começando a formar um pouco de " +"comunidade. Fatima e eu trabalhamos juntos um pouco, e eu tenho saído muito " +"com Dana, Draco e Aleesha. Eu não conheço muito bem o bando de Borichenko, " +"os Singhs, Vanessa, Uyen ou Rhyzaea, mas já falamos o suficiente. O que você" +" queria saber?" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -184518,20 +184658,6 @@ msgstr "" "discutindo sobre decisões de liderança, como se eles fizessem esse tipo de " "ligação. O que você queria saber?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" -" Bem, tem um monte de gente. Estamos começando a formar um pouco de " -"comunidade. Fatima e eu trabalhamos juntos um pouco, e eu tenho saído muito " -"com Dana, Draco e Aleesha. Eu não conheço muito bem o bando de Borichenko, " -"os Singhs, Vanessa, Uyen ou Rhyzaea, mas já falamos o suficiente. O que você" -" queria saber?" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "Você pode me falar sobre os comerciantes livres?" @@ -184601,22 +184727,6 @@ msgid "" "hope that there's a future to be had." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I didn't get to know Boris, Garry, and Stan so well for the first while. " -"They kinda kept to themselves. Boris and Garry had just lost their son, you" -" know. It's pretty lucky that Stan was with them, he's Boris' little " -"brother. Together, they're a pretty good team. I feel bad for thinking " -"they were standoffish before. They probably do the most to pull their " -"weight around here whenever there's work to be done." -msgstr "" -" Eu não conheci Boris, Garry e Stan tão bem pelo primeiro tempo. Eles meio " -"que se mantinham para eles mesmos. Boris e Garry tinham acabado de perder o " -"filho, você sabe. É muita sorte que Stan esteja com eles, ele é o irmão mais" -" novo de Boris. Juntos, eles são um time muito bom. Eu me sinto mal por " -"pensar que eles eram reservados antes. Eles provavelmente fazem o máximo " -"para puxar seu peso por aqui sempre que há trabalho a ser feito." - #: lang/json/talk_topic_from_json.py msgid "" "Boris and Garry are married, I guess. They kinda keep to themselves, they " @@ -184632,12 +184742,19 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"The Singhs are really shy, and I think they feel pretty bad about making it " -"through this together. They're the only complete family I've seen since " -". That has to feel really weird, and I think it's made them " -"stick really close together. I think… I think they also just don't really " -"like any of us." +"I didn't get to know Boris, Garry, and Stan so well for the first while. " +"They kinda kept to themselves. Boris and Garry had just lost their son, you" +" know. It's pretty lucky that Stan was with them, he's Boris' little " +"brother. Together, they're a pretty good team. I feel bad for thinking " +"they were standoffish before. They probably do the most to pull their " +"weight around here whenever there's work to be done." msgstr "" +" Eu não conheci Boris, Garry e Stan tão bem pelo primeiro tempo. Eles meio " +"que se mantinham para eles mesmos. Boris e Garry tinham acabado de perder o " +"filho, você sabe. É muita sorte que Stan esteja com eles, ele é o irmão mais" +" novo de Boris. Juntos, eles são um time muito bom. Eu me sinto mal por " +"pensar que eles eram reservados antes. Eles provavelmente fazem o máximo " +"para puxar seu peso por aqui sempre que há trabalho a ser feito." #: lang/json/talk_topic_from_json.py msgid "" @@ -184653,14 +184770,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… I'm doing my best, I really am, but we just do not get along. One " -"of these days one of us is probably going to brain the other with a tire " -"iron, and I'm just grateful I spend more time around the tire irons. Uyen " -"and Rhyzaea are both excellent people, and I genuinely like them, but I " -"can't stand this ongoing political bullshit they've got going on. Alonso is" -" just a… he's… there's no polite word for what he is. A lot of the others " -"are fine with it, and okay, sure, I guess. John is a walking stereotype, " -"but he's a great poker buddy. I admit I kinda like him." +"The Singhs are really shy, and I think they feel pretty bad about making it " +"through this together. They're the only complete family I've seen since " +". That has to feel really weird, and I think it's made them " +"stick really close together. I think… I think they also just don't really " +"like any of us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184676,7 +184790,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Howdy, pardner." +msgid "" +"Vanessa… I'm doing my best, I really am, but we just do not get along. One " +"of these days one of us is probably going to brain the other with a tire " +"iron, and I'm just grateful I spend more time around the tire irons. Uyen " +"and Rhyzaea are both excellent people, and I genuinely like them, but I " +"can't stand this ongoing political bullshit they've got going on. Alonso is" +" just a… he's… there's no polite word for what he is. A lot of the others " +"are fine with it, and okay, sure, I guess. John is a walking stereotype, " +"but he's a great poker buddy. I admit I kinda like him." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184684,6 +184806,10 @@ msgid "" "Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Howdy, pardner." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -184738,11 +184864,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184785,15 +184911,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -184994,12 +185120,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -185090,17 +185216,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185212,10 +185338,6 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "Oh, você voltou." - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " @@ -185224,6 +185346,10 @@ msgstr "" " Ótimo. Outra nova boca para alimentar? Apenas o que precisamos. Bem, eu sou" " a Vanessa." +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "Oh, você voltou." + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -185263,14 +185389,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "Você poderia me dar um corte de cabelo?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -185279,6 +185397,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -185456,15 +185582,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -185851,14 +185977,14 @@ msgstr "Mantenha civil ou vou trazer a dor." msgid "Just on watch, move along." msgstr "Apenas de relance, siga em frente." -#: lang/json/talk_topic_from_json.py -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 "Rough out there, isn't it?" msgstr "Áspero lá fora, não é?" +#: lang/json/talk_topic_from_json.py +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…" msgstr "Eu ouvi dizer que esse lugar era um centro de refugiados..." @@ -185887,14 +186013,14 @@ msgstr "" msgid "Well, I'd better be going. Bye." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "Bem-vindo marechal ..." - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "Bem vinda..." +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "Bem-vindo marechal ..." + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -186137,14 +186263,14 @@ msgid "" "attacked by zombie hordes, as you might guess." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "Marechal..." - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "Cidadão..." +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "Marechal..." + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "Posso trocar por suprimentos?" @@ -186211,14 +186337,14 @@ msgstr "" " Nós não podemos. Não há nada que possamos poupar para vender e não tenho " "orçamento para comprar de você. Eu não suponho que você queira doar?" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "Isso com certeza é um emblema brilhante que você chegou lá!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Heh, você parece importante." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "Isso com certeza é um emblema brilhante que você chegou lá!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "Eu sou realmente novo." @@ -186284,6 +186410,10 @@ msgid "" "it." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " @@ -186292,10 +186422,6 @@ msgstr "" " Do mesmo jeito que você tem o seu, aposto. Fique quieto sobre isso, algumas" " pessoas aqui olham para baixo em pessoas como nós." -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "Desculpe por perguntar" @@ -186320,22 +186446,22 @@ msgstr "Eu vou comprar." msgid "Who needs rebar?" msgstr "Quem precisa de vergalhão?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "Como se você fosse alguém para conversar. Dane-se." - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "Dane-se!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "" +msgid "As if you're one to talk. Screw You." +msgstr "Como se você fosse alguém para conversar. Dane-se." #: lang/json/talk_topic_from_json.py 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 "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "" @@ -186651,6 +186777,16 @@ msgstr "Eu acho que você é o chefe." msgid "Glad to have you aboard." msgstr "Fico feliz em ter você a bordo." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "" @@ -186731,16 +186867,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -187010,6 +187136,14 @@ msgstr "Na verdade, acho que não tenho tempo pra isso, desculpa." msgid "Keep it civil, merc." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Here to trade, I hope?" +msgstr "Aqui pra negociar, espero?" + +#: lang/json/talk_topic_from_json.py +msgid "Safe travels, scavenger." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Still plenty of outlaws in the roads, perhaps you should tend to your job, " @@ -187025,11 +187159,10 @@ msgid "Oh, a U.S. marshal, how quaint." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" -msgstr "Aqui pra negociar, espero?" - -#: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." +msgid "" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." msgstr "" #: lang/json/talk_topic_from_json.py @@ -187038,13 +187171,6 @@ msgid "" "fair deal?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Keep safe, then." msgstr "" @@ -187285,16 +187411,16 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "Posso te ajudar, marechal?" +msgid "Morning ma'am, how can I help you?" +msgstr "Manhã senhora, como posso ajudá-lo?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "Manhã senhor, como posso ajudá-lo?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "Manhã senhora, como posso ajudá-lo?" +msgid "Can I help you, marshal?" +msgstr "Posso te ajudar, marechal?" #: lang/json/talk_topic_from_json.py msgid "" @@ -187425,15 +187551,15 @@ msgstr "Que tipo de emprego você tem para mim?" msgid "Not now." msgstr "Agora não." -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "Volte mais tarde, eu preciso cuidar de algumas coisas primeiro." - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "" " Eu posso dar uma olhada em você ou seus companheiros se você está ferido." +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "Volte mais tarde, eu preciso cuidar de algumas coisas primeiro." + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$ 200, 30m] Eu preciso que você me trate." @@ -187691,8 +187817,8 @@ msgid "Ok." msgstr "Ok." #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" -msgstr "O que são criptomoedas?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" @@ -187714,9 +187840,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -187819,11 +187946,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -187835,11 +187962,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -196440,12 +196567,6 @@ msgstr "" msgid "mana weaving" msgstr "" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "Nenhum" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -203349,16 +203470,18 @@ msgstr "[<] página %1$d de %2$d [>]" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s] organizar: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F]iltrar" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R]edefinir" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -203393,8 +203516,9 @@ msgid "Unsorted (recently added first)" msgstr "Desorganizado ( primeiros os adicionados recentemente )" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] mostrar ajuda >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -206349,6 +206473,13 @@ msgstr "" msgid " BIONICS " msgstr "BIÔNICA" +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -206358,19 +206489,13 @@ msgstr "" " Selecione um biônico para reatribuir ou pressione ESPAÇO para cancelar." #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" #: src/bionics_ui.cpp @@ -206466,7 +206591,7 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" #: src/bonuses.cpp @@ -218563,7 +218688,7 @@ msgid "You can't crack a safe while deaf!" msgstr "Você não pode quebrar um cofre enquanto está surdo!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -220819,13 +220944,8 @@ msgstr "Não há opções disponíveis" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Filtro" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Filtro: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -239549,6 +239669,16 @@ msgid "" "necessary glyphs." msgstr "" +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "Usar gráficos" @@ -241469,10 +241599,6 @@ msgstr "" msgid "Heat :" msgstr "" -#: src/panels.cpp -msgid "Sound :" -msgstr "" - #: src/panels.cpp msgid "Deaf!" msgstr "Surdo!" @@ -246332,8 +246458,9 @@ msgid "Remove attached curtains first." msgstr "Remova as cortinas presas primeiro." #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "Remova a peça anexada primeiro." +#, c-format +msgid "Remove the attached %s first." +msgstr "" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/ru.po b/lang/po/ru.po index 6828af5f4d13d..4c5e363e0951d 100644 --- a/lang/po/ru.po +++ b/lang/po/ru.po @@ -61,16 +61,16 @@ # Антон Бурмистров <22.valiant@gmail.com>, 2020 # Ivan Ivanov , 2020 # Zhar the Mad , 2020 -# CountAlex, 2020 # Alexey Mostovoy , 2020 # Vlasov Vitaly , 2020 +# CountAlex, 2020 # 8street, 2020 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: 8street, 2020\n" "Language-Team: Russian (https://www.transifex.com/cataclysm-dda-translators/teams/2217/ru/)\n" @@ -797,7 +797,7 @@ msgstr[1] "кислород" msgstr[2] "кислород" msgstr[3] "кислород" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "Баллон с кислородом." @@ -890,7 +890,7 @@ msgstr[1] "нитрокса" msgstr[2] "нитрокса" msgstr[3] "нитрокс" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "Смесь кислорода и азота в подходящих для дайвинга пропорциях." @@ -903,7 +903,7 @@ msgstr[1] "трута" msgstr[2] "трутов" msgstr[3] "трут" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "Горючий материал, разделённый для лёгкого поджигания." @@ -929,7 +929,7 @@ msgstr[1] "металлических РПГ кубика" msgstr[2] "металлических РПГ кубиков" msgstr[3] "металлический РПГ кубик" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "Металлический кубик, используемый для различных ролевых игр." @@ -970,7 +970,7 @@ msgstr[1] "серы" msgstr[2] "серы" msgstr[3] "сера" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -1023,7 +1023,7 @@ msgstr[1] "известняка" msgstr[2] "известняка" msgstr[3] "известняк" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -1042,7 +1042,7 @@ msgstr[1] "негашёной извести" msgstr[2] "негашёной извести" msgstr[3] "негашёная известь" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -1064,7 +1064,7 @@ msgstr[1] "песка" msgstr[2] "песка" msgstr[3] "песок" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -1082,7 +1082,7 @@ msgstr[1] "грунта" msgstr[2] "грунта" msgstr[3] "грунт" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1121,7 +1121,7 @@ msgstr[1] "цинкового порошка" msgstr[2] "цинкового порошка" msgstr[3] "цинковый порошок" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1141,7 +1141,7 @@ msgstr[1] "оксид цинка" msgstr[2] "оксид цинка" msgstr[3] "оксид цинка" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1158,7 +1158,8 @@ msgstr[1] "диоксид марганца" msgstr[2] "диоксид марганца" msgstr[3] "диоксид марганца" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1177,7 +1178,8 @@ msgstr[1] "хлористый калий" msgstr[2] "хлористый калий" msgstr[3] "хлористый калий" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1198,7 +1200,8 @@ msgstr[1] "гидроксид калия" msgstr[2] "гидроксид калия" msgstr[3] "гидроксид калия" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1217,7 +1220,7 @@ msgstr[1] "серной кислоты" msgstr[2] "серной кислоты" msgstr[3] "серная кислота" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1277,7 +1280,7 @@ msgstr[1] "азотной кислоты" msgstr[2] "азотной кислоты" msgstr[3] "азотная кислота" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1413,7 +1416,7 @@ msgstr[1] "селитры" msgstr[2] "селитры" msgstr[3] "селитра" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1432,7 +1435,7 @@ msgstr[1] "кристалла селитры" msgstr[2] "кристаллов селитры" msgstr[3] "кристалл селитры" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1518,7 +1521,7 @@ msgstr[1] "термита" msgstr[2] "термита" msgstr[3] "термит" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1582,7 +1585,8 @@ msgstr[1] "спичечного порошка" msgstr[2] "спичечного порошка" msgstr[3] "спичечный порошок" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1671,7 +1675,7 @@ msgstr[1] "мыльной стружки" msgstr[2] "мыльной стружки" msgstr[3] "мыльная стружка" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "" @@ -1700,7 +1704,7 @@ msgstr[1] "древесной золы" msgstr[2] "древесных зол" msgstr[3] "древесная зола" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1836,7 +1840,7 @@ msgstr[1] "лампового масла" msgstr[2] "лампового масла" msgstr[3] "ламповое масло" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "" @@ -1851,7 +1855,7 @@ msgstr[1] "моторное масло" msgstr[2] "моторное масло" msgstr[3] "моторное масло" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "Масло, применяемое в автомобильных двигателях." @@ -1864,7 +1868,7 @@ msgstr[1] "напалма" msgstr[2] "напалма" msgstr[3] "напалм" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -5398,7 +5402,7 @@ msgstr[1] "банки красной краски" msgstr[2] "банок красной краски" msgstr[3] "банка красной краски" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "Это банка красной краски." @@ -5424,7 +5428,7 @@ msgstr[1] "банки белой краски" msgstr[2] "банок белой краски" msgstr[3] "банка белой краски" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "Это банка белой краски." @@ -5450,7 +5454,7 @@ msgstr[1] "банки пурпурной краски" msgstr[2] "банок пурпурной краски" msgstr[3] "банка пурпурной краски" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "Это банка пурпурной краски." @@ -5463,7 +5467,7 @@ msgstr[1] "банки жёлтой краски" msgstr[2] "банок жёлтой краски" msgstr[3] "банка жёлтой краски" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "Это банка жёлтой краски." @@ -5540,7 +5544,7 @@ msgstr[2] "золота" msgstr[3] "золото" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -5565,7 +5569,7 @@ msgstr[1] "цинк" msgstr[2] "цинк" msgstr[3] "цинк" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -5586,7 +5590,7 @@ msgstr[1] "свинца" msgstr[2] "свинца" msgstr[3] "свинец" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -5603,7 +5607,7 @@ msgstr[1] "магниевых порошка" msgstr[2] "магниевых порошков" msgstr[3] "магниевый порошок" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -5621,7 +5625,7 @@ msgstr[1] "серебра" msgstr[2] "серебра" msgstr[3] "серебро" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -5848,7 +5852,7 @@ msgstr[1] "кожаных обрезка" msgstr[2] "кожаных обрезков" msgstr[3] "кожаные обрезки" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -5865,7 +5869,7 @@ msgstr[1] "обрезка лайкры" msgstr[2] "обрезка лайкры" msgstr[3] "обрезки лайкры" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5882,7 +5886,7 @@ msgstr[1] "неопреновых обрезка" msgstr[2] "неопреновых обрезка" msgstr[3] "неопреновые обрезки" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5899,7 +5903,8 @@ msgstr[1] "обрезка синтетики" msgstr[2] "обрезка синтетики" msgstr[3] "обрезки синтетики" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5945,7 +5950,8 @@ msgstr[1] "сшитых лоскута хлопчатобумажной ткан msgstr[2] "сшитых лоскута хлопчатобумажной ткани" msgstr[3] "сшитые лоскуты хлопчатобумажной ткани" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5973,7 +5979,8 @@ msgstr[1] "сшитых лоскута искусственного меха" msgstr[2] "сшитых лоскута искусственного меха" msgstr[3] "сшитые лоскуты искусственного меха" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -6001,7 +6008,8 @@ msgstr[1] "сшитых лоскута войлока" msgstr[2] "сшитых лоскутов войлока" msgstr[3] "сшитые лоскуты войлока" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -6047,7 +6055,8 @@ msgstr[1] "сшитых лоскута лайкры" msgstr[2] "сшитых лоскутов лайкры" msgstr[3] "сшитые лоскуты лайкры" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -6083,7 +6092,8 @@ msgstr[1] "сшитых лоскута неопрена" msgstr[2] "сшитых лоскутов неопрена" msgstr[3] "сшитые лоскуты неопрена" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -6116,7 +6126,8 @@ msgstr[1] "сшитых лоскута номекса" msgstr[2] "сшитых лоскута номекса" msgstr[3] "сшитые лоскуты номекса" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -6144,7 +6155,8 @@ msgstr[1] "сшитых лоскута синтетической ткани" msgstr[2] "сшитых лоскута синтетической ткани" msgstr[3] "сшитые лоскуты синтетической ткани" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -8468,12 +8480,14 @@ msgstr[2] "патронных сумок" msgstr[3] "патронная сумка" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -8488,7 +8502,8 @@ msgstr[3] "патронная сумка" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -8497,11 +8512,14 @@ msgid "You stash your %s." msgstr "Вы убираете %s." #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -8538,7 +8556,8 @@ msgstr[1] "патронных подсумка на грудь" msgstr[2] "патронных подсумков на грудь" msgstr[3] "патронный подсумок на грудь" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -8555,7 +8574,7 @@ msgstr[1] "нагрудника" msgstr[2] "нагрудников" msgstr[3] "нагрудники" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -8576,12 +8595,13 @@ msgstr[1] "сумки для дротиков" msgstr[2] "сумок для дротиков" msgstr[3] "сумка для дротиков" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "Убрать дротики" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -8615,7 +8635,7 @@ msgstr[1] "подсумка для боеприпасов" msgstr[2] "подсумков для боеприпасов" msgstr[3] "подсумок для боеприпасов" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -8862,7 +8882,8 @@ msgstr[1] "пары деревянных наручей" msgstr[2] "пар деревянных наручей" msgstr[3] "пара деревянных наручей" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -9229,7 +9250,7 @@ msgstr[1] "гранатные сумки" msgstr[2] "гранатных сумок" msgstr[3] "гранатная сумка" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -9263,12 +9284,14 @@ msgstr[1] "большие гранатные сумки" msgstr[2] "больших гранатных сумок" msgstr[3] "большая гранатная сумка" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "Убрать гранаты" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "Сумка для хранения до четырёх гранат разных типов." @@ -9783,6 +9806,8 @@ msgstr[1] "пары бронеботинок" msgstr[2] "пар бронеботинок" msgstr[3] "пара бронеботинок" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -9905,6 +9930,8 @@ msgstr[1] "пары ботинок выживальщика XL" msgstr[2] "пар ботинок выживальщика XL" msgstr[3] "пара ботинок выживальщика XL" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -10443,7 +10470,8 @@ msgstr[1] "короткие носки" msgstr[2] "короткие носки" msgstr[3] "короткие носки" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -12079,7 +12107,8 @@ msgstr[1] "пары бронеперчаток без пальцев" msgstr[2] "пар бронеперчаток без пальцев" msgstr[3] "пара бронеперчаток без пальцев" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -12457,7 +12486,8 @@ msgstr[1] "пары перчаток выживальщика XL" msgstr[2] "пар перчаток выживальщика XL" msgstr[3] "пара перчаток выживальщика XL" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -12898,7 +12928,7 @@ msgstr[1] "кипы" msgstr[2] "кип" msgstr[3] "кипа" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "Тонкая круглая ермолка. Традиционный головной убор в иудаизме." @@ -12911,7 +12941,7 @@ msgstr[1] "куфи" msgstr[2] "куфи" msgstr[3] "куфи" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "Короткая круглая шапочка без полей." @@ -13285,7 +13315,7 @@ msgstr[1] "галеи" msgstr[2] "галей" msgstr[3] "галея" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -14146,7 +14176,7 @@ msgstr[1] "подводных часов" msgstr[2] "подводных часов" msgstr[3] "подводные часы" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -19140,7 +19170,8 @@ msgstr[1] "пары деревянных поножей" msgstr[2] "пар деревянных поножей" msgstr[3] "пара деревянных поножей" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -19176,7 +19207,8 @@ msgstr[1] "пары кольчужных штанов" msgstr[2] "пар кольчужных штанов" msgstr[3] "пара кольчужных штанов" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -19193,7 +19225,7 @@ msgstr[1] "кожаных чапсов" msgstr[2] "кожаных чапсов" msgstr[3] "кожаные чапсы" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -19210,7 +19242,7 @@ msgstr[1] "фехтовальных штанов" msgstr[2] "фехтовальных штанов" msgstr[3] "фехтовальные брюки " -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "" @@ -19325,7 +19357,8 @@ msgstr[1] "лёгких штанов выживальщика с кармана msgstr[2] "лёгких штанов выживальщика с карманами" msgstr[3] "лёгкие штаны выживальщика с карманами" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -19342,7 +19375,8 @@ msgstr[1] "мотоциклетных штанов" msgstr[2] "мотоциклетных штанов" msgstr[3] "мотоциклетные штаны" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "Штаны, предназначенные для мотокроссменов и мотоциклистов." @@ -19387,7 +19421,7 @@ msgstr[1] "бриджей" msgstr[2] "бриджей" msgstr[3] "бриджи" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -19419,7 +19453,7 @@ msgstr[1] "шортиков" msgstr[2] "шортиков" msgstr[3] "шортики" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "Очень короткие шорты." @@ -19432,7 +19466,7 @@ msgstr[1] "меховых шортиков" msgstr[2] "меховых шортиков" msgstr[3] "меховые шортики" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "Очень короткие меховые шортики." @@ -19445,7 +19479,8 @@ msgstr[1] "кожаных шортиков" msgstr[2] "кожаных шортиков" msgstr[3] "кожаные шортики" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "Очень короткие кожаные шортики." @@ -19458,7 +19493,7 @@ msgstr[1] "джинсов" msgstr[2] "джинсов" msgstr[3] "джинсы" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "Синие джинсы с двумя глубокими карманами." @@ -19506,7 +19541,7 @@ msgstr[1] "леггинсов" msgstr[2] "леггинсов" msgstr[3] "леггинсы" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -19657,7 +19692,7 @@ msgstr[1] "меховых штанов" msgstr[2] "меховых штанов" msgstr[3] "меховые штаны" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "Здоровенные штаны из меха." @@ -19683,7 +19718,7 @@ msgstr[1] "кожаных штанов" msgstr[2] "кожаных штанов" msgstr[3] "кожаные штаны" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -19711,7 +19746,8 @@ msgstr[1] "шорт почтальона" msgstr[2] "шорт почтальона" msgstr[3] "шорты почтальона" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "Тёмно-синие шорты, которые используют работники почтовой службы." @@ -19737,7 +19773,7 @@ msgstr[1] "шорт с карманами" msgstr[2] "шорт с карманами" msgstr[3] "шорты с карманами" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "Шорты с большими карманами." @@ -19750,7 +19786,7 @@ msgstr[1] "джинсовых шорт" msgstr[2] "джинсовых шорт" msgstr[3] "джинсовые шорты" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -19916,17 +19952,20 @@ msgstr[1] "рабских маски (застегнуты)" msgstr[2] "рабских масок (застегнуты)" msgstr[3] "рабские маски (застегнуты)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "Расстегнуть молнию" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "Вы расстёгиваете молнию на глазах и рту рабской маски." -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -21015,7 +21054,7 @@ msgstr[1] "кожаных мешка" msgstr[2] "кожаных мешков" msgstr[3] "кожаный мешок" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -22423,7 +22462,8 @@ msgstr[1] "лорики сегментаты" msgstr[2] "лорик сегментат" msgstr[3] "лорика сегментата" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -22487,7 +22527,7 @@ msgstr[1] "кирасы" msgstr[2] "кирас" msgstr[3] "кираса" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -23329,7 +23369,8 @@ msgstr[1] "пары рукогреек" msgstr[2] "пар рукогреек" msgstr[3] "пара рукогреек" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "Удобные и мягкие тканевые рукава, согревающие ваши руки." @@ -23434,7 +23475,7 @@ msgstr[1] "трусов-шорт" msgstr[2] "трусов-шорт" msgstr[3] "трусы-шорты" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -23465,7 +23506,7 @@ msgstr[1] "брифов" msgstr[2] "брифов" msgstr[3] "брифы" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "Трусы-плавки. Удобное мужское нижнее бельё." @@ -23609,7 +23650,8 @@ msgstr[1] "пары ногогреек XL" msgstr[2] "пар ногогреек XL" msgstr[3] "пара ногогреек XL" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "" @@ -23764,7 +23806,8 @@ msgstr[1] "компрессионных термошорт" msgstr[2] "компрессионных термошорт" msgstr[3] "компрессионные термошорты" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -25460,7 +25503,7 @@ msgstr[1] "тестовых батарейки" msgstr[2] "тестовых батареек" msgstr[3] "тестовые батарейки" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -26632,7 +26675,8 @@ msgstr[1] "КБМ: Доп. аккумулятор Мк. II" msgstr[2] "КБМ: Доп. аккумулятор Мк. II" msgstr[3] "КБМ: Доп. аккумулятор Мк. II" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -29038,19 +29082,19 @@ msgstr[3] "чертежи" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -34242,7 +34286,8 @@ msgstr[1] "химических удобрения" msgstr[2] "химических удобрений" msgstr[3] "химическое удобрение" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "Богатые питательными веществами гранулы для растений." @@ -34349,7 +34394,8 @@ msgstr[1] "концентрированных кислоты" msgstr[2] "концентрированной кислоты" msgstr[3] "концентрированная кислота" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "Концентрированная кислота. Не вздумайте пить." @@ -35244,7 +35290,7 @@ msgstr[1] "дешевого виски" msgstr[2] "дешевого виски" msgstr[3] "дешевого виски" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "Очень дешевое смешанное виски." @@ -35788,7 +35834,7 @@ msgstr[1] "приготовленных рыбы" msgstr[2] "приготовленных рыб" msgstr[3] "приготовленная рыба" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "Только что приготовленная рыба. Очень сытная." @@ -35885,7 +35931,7 @@ msgstr[1] "куска мяса" msgstr[2] "кусков мяса" msgstr[3] "кусок мяса" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -35914,7 +35960,8 @@ msgstr[1] "куска мяса мутанта" msgstr[2] "кусков мяса мутанта" msgstr[3] "куски мяса мутанта" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -36068,7 +36115,7 @@ msgstr[1] "приготовленных потрохов" msgstr[2] "приготовленных потрохов" msgstr[3] "приготовленные потроха" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -36264,7 +36311,8 @@ msgstr[1] "куска приготовленного лёгкого" msgstr[2] "кусков приготовленного лёгкого" msgstr[3] "кусок приготовленного лёгкого" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -36327,7 +36375,7 @@ msgstr[1] "приготовленных мозга" msgstr[2] "приготовленных мозгов" msgstr[3] "приготовленные мозги" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -36448,7 +36496,8 @@ msgstr[1] "куска мутантного сала" msgstr[2] "кусков мутантного сала" msgstr[3] "куски мутантного сала" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -36540,7 +36589,8 @@ msgstr[1] "куска заражённого мяса" msgstr[2] "кусков заражённого мяса" msgstr[3] "кусок заражённого мяса" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -37170,7 +37220,7 @@ msgstr[1] "ромашкового чая" msgstr[2] "ромашкового чая" msgstr[3] "ромашковый чай" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -37201,7 +37251,7 @@ msgstr[1] "кофе" msgstr[2] "кофе" msgstr[3] "кофе" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -37220,7 +37270,8 @@ msgstr[1] "кофезаменителя" msgstr[2] "кофезаменителя" msgstr[3] "кофезаменитель" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -37239,7 +37290,7 @@ msgstr[1] "заваренного цикория" msgstr[2] "заваренного цикория" msgstr[3] "заваренный цикорий" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -37674,7 +37725,7 @@ msgstr[1] "чистой воды" msgstr[2] "чистой воды" msgstr[3] "чистая вода" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "Свежая, чистая вода. Лучшее, что способно утолить жажду." @@ -38240,7 +38291,8 @@ msgstr[1] "варенья из клубники" msgstr[2] "варенья из клубники" msgstr[3] "варенье из клубники" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "Земляничный джем, только без сахара." @@ -38262,7 +38314,8 @@ msgstr[1] "варенья из черники" msgstr[2] "варенья из черники" msgstr[3] "варенье из черники" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "Черничный джем, только без сахара." @@ -39197,20 +39250,20 @@ msgstr[1] "шоколадных конфеты" msgstr[2] "шоколадных конфет" msgstr[3] "шоколадная конфета" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "Горстка разноцветных конфет с шоколадной начинкой." #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" +msgid_plural "chewy candy" msgstr[0] "жевательная конфета" msgstr[1] "жевательные конфеты" msgstr[2] "жевательных конфет" -msgstr[3] "жевательная конфета" +msgstr[3] "жевательные конфеты" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "Горстка разноцветных конфет с начинкой из фруктовой жвачки." @@ -39481,7 +39534,7 @@ msgstr[1] "сырных начос" msgstr[2] "сырных начос" msgstr[3] "сырных начос" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -39626,7 +39679,7 @@ msgstr[1] "чили-дога" msgstr[2] "чили-догов" msgstr[3] "чили-дог" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "Хот-дог, подаваемый с соусом «Чили Кон Карне». Ням!" @@ -39670,7 +39723,8 @@ msgstr[1] "блинчика с шоколадом" msgstr[2] "блинчиков с шоколадом" msgstr[3] "блинчик с шоколадом" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -39709,7 +39763,7 @@ msgstr[1] "картошки-фри с сыром" msgstr[2] "картошек-фри с сыром" msgstr[3] "картошка-фри с сыром" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "Картошка-фри с вкуснейшим сыром." @@ -39755,13 +39809,9 @@ msgstr "" #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "приготовленный хот-дог" -msgstr[1] "приготовленных хот-дога" -msgstr[2] "приготовленных хот-догов" -msgstr[3] "приготовленные хот-доги" +msgstr "приготовленный хот-дог" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -40373,7 +40423,8 @@ msgstr[1] "соуса чили с мясом" msgstr[2] "соусов чили с мясом" msgstr[3] "соус чили с мясом" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" @@ -40382,7 +40433,8 @@ msgstr[1] "чили кон каброн" msgstr[2] "чили кон каброн" msgstr[3] "чили кон каброн" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" @@ -40391,7 +40443,7 @@ msgstr[1] "чили кон чупакабра" msgstr[2] "чили кон чупакабра" msgstr[3] "чили кон чупакабра" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "Острое рагу из перца чили, мяса, томатов и фасоли." @@ -41429,7 +41481,7 @@ msgstr[1] "кокаина" msgstr[2] "кокаина" msgstr[3] "кокаин" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -41622,7 +41674,7 @@ msgstr[1] "жевательной резинки" msgstr[2] "жевательной резинки" msgstr[3] "жевательная резинка" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "Ярко-розовая жевательная резинка. Сладкая и вредная для зубов." @@ -43934,7 +43986,7 @@ msgstr[1] "хитиновых порошка" msgstr[2] "хитиновых порошков" msgstr[3] "хитиновый порошок" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -44002,7 +44054,7 @@ msgstr[1] "приготовленных бобов" msgstr[2] "приготовленных бобов" msgstr[3] "приготовленные бобы" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "Плотная порция приготовленных бобов с севера." @@ -44102,7 +44154,7 @@ msgstr[1] "приготовленной чечевицы" msgstr[2] "приготовленной чечевицы" msgstr[3] "приготовленная чечевица" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "Аппетитная приготовленная чечевица. Пресноватая, но питательная." @@ -44115,7 +44167,7 @@ msgstr[1] "молотого кофе" msgstr[2] "молотого кофе" msgstr[3] "молотый кофе" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -46011,7 +46063,7 @@ msgstr[1] "семян цикория" msgstr[2] "семян цикория" msgstr[3] "семена цикория" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "Немного семян цикория." @@ -46110,7 +46162,8 @@ msgstr[1] "семян перца чили" msgstr[2] "семян перца чили" msgstr[3] "семена перца чили" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "Несколько семян перца чили." @@ -46541,7 +46594,7 @@ msgstr[1] "кофейных зёрен" msgstr[2] "кофейных зёрен" msgstr[3] "кофейные зёрна" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "Немного кофейных зёрен, можно обжарить." @@ -46567,7 +46620,7 @@ msgstr[1] "семян ромашки" msgstr[2] "семян ромашки" msgstr[3] "семена ромашки" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "Немного семян ромашки." @@ -46922,13 +46975,9 @@ msgstr "Стебель тимьяна. Пахнет вкусно." #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "приготовленный рогоз" -msgstr[1] "приготовленных рогоза" -msgstr[2] "приготовленных рогозов" -msgstr[3] "приготовленный рогоз" +msgstr "приготовленный рогоз" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -46962,7 +47011,8 @@ msgstr[1] "тушёной зелени одуванчиков" msgstr[2] "тушёной зелени одуванчиков" msgstr[3] "тушёная зелень одуванчиков" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "Приготовленные листья диких одуванчиков. Вкусно и питательно." @@ -47001,7 +47051,8 @@ msgstr[1] "варёных диких овощей" msgstr[2] "варёных диких овощей" msgstr[3] "варёные дикие овощи" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "Сваренные дикие съедобные овощи. Любопытная смесь запахов и вкусов." @@ -47024,7 +47075,7 @@ msgstr[1] "приготовленной гречки" msgstr[2] "приготовленной гречки" msgstr[3] "приготовленная гречка" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -47087,7 +47138,7 @@ msgstr[1] "приготовленного риса" msgstr[2] "приготовленного риса" msgstr[3] "приготовленный рис" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "Сытная порция приготовленного длиннозёрного белого риса." @@ -47776,9 +47827,13 @@ msgstr "Вкусная пицца с корочкой расплавленног #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "гранола" +msgid_plural "granola" +msgstr[0] "гранола" +msgstr[1] "гранолы" +msgstr[2] "гранол" +msgstr[3] "гранола" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -51028,7 +51083,7 @@ msgstr[1] "каменной соли" msgstr[2] "каменной соли" msgstr[3] "каменная соль" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "" @@ -51042,7 +51097,7 @@ msgstr[1] "родонита" msgstr[2] "родонита" msgstr[3] "родонит" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -51059,7 +51114,7 @@ msgstr[1] "цинкитa" msgstr[2] "цинкитa" msgstr[3] "цинкит" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -51310,7 +51365,8 @@ msgstr[1] "недомолотое зерно" msgstr[2] "недомолотое зерно" msgstr[3] "недомолотое зерно" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "Масса из недомолотых зерен, все ещё не мука." @@ -51323,7 +51379,8 @@ msgstr[1] "тлеющих угольков" msgstr[2] "тлеющих угольков" msgstr[3] "тлеющий уголёк" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -51360,7 +51417,7 @@ msgstr[1] "счастливых четвертака" msgstr[2] "счастливых четвертаков" msgstr[3] "счастливый четвертак" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -51393,23 +51450,39 @@ msgid_plural "none" msgstr[0] "животное" msgstr[1] "животных" msgstr[2] "животных" -msgstr[3] "животные" +msgstr[3] "нет" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "огонь поблизости" +msgid_plural "none" +msgstr[0] "огонь рядом" +msgstr[1] "огонь рядом" +msgstr[2] "огонь рядом" +msgstr[3] "нет" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "мускулатура" +msgid_plural "none" +msgstr[0] "мускул" +msgstr[1] "мускула" +msgstr[2] "мускулов" +msgstr[3] "нет" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "ветер" +msgid_plural "none" +msgstr[0] "ветер" +msgstr[1] "ветра" +msgstr[2] "ветров" +msgstr[3] "нет" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "солнечный свет" +msgid_plural "none" +msgstr[0] "солнечный свет" +msgstr[1] "солнечных света" +msgstr[2] "солнечного света" +msgstr[3] "нет" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -51425,7 +51498,18 @@ msgid_plural "none" msgstr[0] "курильня и зажигалка" msgstr[1] "курильни и зажигалки" msgstr[2] "курилен и зажигалок" -msgstr[3] "курильни и зажигалки" +msgstr[3] "нет" + +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "нет" +msgstr[1] "нет" +msgstr[2] "нет" +msgstr[3] "нет" #: lang/json/GENERIC_from_json.py msgid "file" @@ -51548,7 +51632,7 @@ msgstr[1] "кожаных лоскута" msgstr[2] "кожаных лоскутов" msgstr[3] "кожаный лоскут" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "" @@ -51563,7 +51647,7 @@ msgstr[1] "лоскута войлока" msgstr[2] "лоскутов войлока" msgstr[3] "лоскут войлока" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "Небольшой лоскут войлока, можно разобрать на шерстяные нити." @@ -51665,7 +51749,8 @@ msgstr[1] "сотни керамических дисков" msgstr[2] "сотни керамических дисков" msgstr[3] "сотни керамических дисков" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -52029,7 +52114,7 @@ msgstr[1] "бетона" msgstr[2] "бетона" msgstr[3] "бетон" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "Бетон, готовый к использованию в строительстве." @@ -52075,7 +52160,7 @@ msgstr[1] "потухших осветительных снаряда" msgstr[2] "потухших осветительных снарядов" msgstr[3] "потухший осветительный снаряд" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "Это использованный магниевый осветительный снаряд. По сути — хлам." @@ -52734,7 +52819,8 @@ msgstr[1] "высококачественных линзы" msgstr[2] "высококачественных линз" msgstr[3] "высококачественная линза" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -52751,7 +52837,8 @@ msgstr[1] "малые высококачественные линзы" msgstr[2] "малых высококачественных линз" msgstr[3] "малые высококачественные линзы" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -52768,7 +52855,8 @@ msgstr[1] "пары тонированных стекол" msgstr[2] "пар тонированных стекол" msgstr[3] "пара тонированных стёкол" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -52954,7 +53042,7 @@ msgstr[1] "аквариума" msgstr[2] "аквариумов" msgstr[3] "аквариум" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -53350,7 +53438,7 @@ msgstr[1] "комка глины" msgstr[2] "комков глины" msgstr[3] "комок глины" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "Свежий кусок глины. Используется в некоторых рецептах." @@ -53376,7 +53464,7 @@ msgstr[1] "цементных растворов" msgstr[2] "цементных растворов" msgstr[3] "цементный раствор" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "Цементный раствор, готовый к применению в строительстве." @@ -53389,17 +53477,17 @@ msgstr[1] "мягких саманных кирпича" msgstr[2] "мягких саманных кирпичей" msgstr[3] "мягкие саманные кирпичи" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "Вы постукиваете по кирпичу, и он достаточно твёрдый." -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "Кирпич ещё не высох и не сможет держать вес." -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -53672,7 +53760,7 @@ msgstr[1] "обработанных шкуры" msgstr[2] "обработанных шкур" msgstr[3] "обработанная шкура" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -53691,7 +53779,7 @@ msgstr[1] "дублёные кожи" msgstr[2] "дублёных кож" msgstr[3] "дублёная кожа" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -53708,7 +53796,7 @@ msgstr[1] "обработанных меховых шкурки" msgstr[2] "обработанных меховых шкурок" msgstr[3] "обработанная меховая шкурка" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -53727,7 +53815,7 @@ msgstr[1] "дублёного меха" msgstr[2] "дублёных мехов" msgstr[3] "дублёный мех" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -53744,7 +53832,7 @@ msgstr[1] "кучки сена" msgstr[2] "кучек сена" msgstr[3] "кучка сена" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -53761,7 +53849,7 @@ msgstr[1] "соломенных куклы" msgstr[2] "соломенных кукол" msgstr[3] "соломенная кукла" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "Старая соломенная кукла. Выглядит как женщина в платье." @@ -53944,7 +54032,7 @@ msgstr[1] "скуренных косяка" msgstr[2] "скуренных косяков" msgstr[3] "скуренный косяк" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -54164,7 +54252,7 @@ msgstr[1] "бака с хладагентом" msgstr[2] "баков с хладагентом" msgstr[3] "баки с хладагентом" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -54455,7 +54543,7 @@ msgstr[1] "рекламных листовки" msgstr[2] "рекламных листовок" msgstr[3] "рекламная листовка" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "Клочок бумаги." @@ -54468,7 +54556,7 @@ msgstr[1] "записки выжившего" msgstr[2] "записок выжившего" msgstr[3] "записка выжившего" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -54496,7 +54584,7 @@ msgstr[1] "карточки учёта" msgstr[2] "карточек учёта" msgstr[3] "карточка учёта" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "Цветастая карточка учёта очков при игре в бейсбол." @@ -54509,7 +54597,7 @@ msgstr[1] "газетных листа" msgstr[2] "газетных листов" msgstr[3] "газетный лист" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -54522,7 +54610,7 @@ msgstr "" "информации там ужасно банальна или устарела, но одна вещь сразу бросается в " "глаза." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -54534,7 +54622,7 @@ msgstr "" "понятия не имеете, как он продержался так долго. Большая часть информации " "там ужасно банальна или устарела, но одна вещь сразу бросается в глаза." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -54545,7 +54633,7 @@ msgstr "" "удивительно, что он продержался так долго. Большая часть информации там " "ужасно банальна или устарела, но одна вещь сразу бросается в глаза." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -54556,7 +54644,7 @@ msgstr "" "Большая часть информации там ужасно банальна или устарела, но одна вещь " "сразу бросается в глаза." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -54567,7 +54655,7 @@ msgstr "" "месяцев, приведших к Катаклизму. Большая часть информации там ужасно " "банальна или устарела, но одна вещь сразу бросается в глаза." -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -54586,7 +54674,7 @@ msgstr[1] "рекламных листовки об убежище" msgstr[2] "рекламных листовок об убежище" msgstr[3] "рекламная листовка об убежище" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -55259,7 +55347,8 @@ msgstr[1] "крошечных паукообразных ног" msgstr[2] "крошечных паукообразных ног" msgstr[3] "крошечные паукообразные ноги" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "Крошечные заострённые ножки, наподобие тех, что у робота-жука." @@ -55272,7 +55361,8 @@ msgstr[1] "ног с обратными суставами" msgstr[2] "ног с обратными суставами" msgstr[3] "ноги с обратными суставами" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -55286,7 +55376,8 @@ msgstr[1] "всенаправленных колёс" msgstr[2] "всенаправленных колёс" msgstr[3] "всенаправленные колёса" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "Всенаправленные колёса, как у робота-полицейского." @@ -55299,7 +55390,7 @@ msgstr[1] "роторов" msgstr[2] "роторов" msgstr[3] "роторы" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "Роторы, способные поднять в воздух маленький дрон." @@ -55312,7 +55403,8 @@ msgstr[1] "андроидных ног" msgstr[2] "андроидных ног" msgstr[3] "андроидные ноги" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "Пара человекоподобных ног." @@ -55325,7 +55417,8 @@ msgstr[1] "андроидных рук" msgstr[2] "андроидных рук" msgstr[3] "андроидные руки" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "Пара человекоподобных рук." @@ -55338,7 +55431,8 @@ msgstr[1] "маленьких танковых гусениц" msgstr[2] "маленьких танковых гусениц" msgstr[3] "маленькие танковые гусеницы" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "Маленькие танковые гусеницы, наподобие тех, что у мини-танка «Бигль»." @@ -55351,7 +55445,8 @@ msgstr[1] "внутренние шасси турели" msgstr[2] "внутренних шасси турели" msgstr[3] "внутренние шасси турели" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -55368,7 +55463,8 @@ msgstr[1] "шасси робота-полицейского" msgstr[2] "шасси робота-полицейского" msgstr[3] "шасси робота-полицейского" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -55407,7 +55503,7 @@ msgstr[1] "разнообразное ПО" msgstr[2] "разнообразное ПО" msgstr[3] "разнообразное ПО" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "Разнообразное ПО для разных целей. Наверняка бесполезное." @@ -55420,7 +55516,7 @@ msgstr[1] "ВзломПРО" msgstr[2] "ВзломПРО" msgstr[3] "ВзломПРО" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "Хакерское ПО." @@ -55459,7 +55555,7 @@ msgstr[1] "данные об инфекции" msgstr[2] "данные об инфекции" msgstr[3] "данные об инфекции" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "Медицинские данные о крови зомби." @@ -55472,7 +55568,7 @@ msgstr[1] "данные лабораторных исследований" msgstr[2] "данные лабораторных исследований" msgstr[3] "данные лабораторных исследований" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "Исследовательские архивы из правительственной лаборатории." @@ -55485,7 +55581,7 @@ msgstr[1] "данные о движении поездов" msgstr[2] "данные о движении поездов" msgstr[3] "данные о движении поездов" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "" @@ -55500,7 +55596,7 @@ msgstr[1] "нейроданных" msgstr[2] "нейроданных" msgstr[3] "нейроданные" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -55519,7 +55615,8 @@ msgstr[1] "архивы данных интегральных схем" msgstr[2] "архивы данных интегральных схем" msgstr[3] "разнообразное ПО" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -59074,7 +59171,7 @@ msgstr[1] "расходного материала" msgstr[2] "расходных материалов" msgstr[3] "расходный материал" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -59634,17 +59731,20 @@ msgstr[1] "полицейских дубинки (раздвинуто)" msgstr[2] "полицейских дубинок (раздвинуто)" msgstr[3] "полицейская дубинка (раздвинуто)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "Сложить" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "Вы сложили свою дубинку." -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -59969,7 +60069,8 @@ msgstr[1] "окованных сталью посоха" msgstr[2] "окованных сталью посохов" msgstr[3] "окованный сталью посох" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -60245,7 +60346,7 @@ msgstr[1] "посоха" msgstr[2] "посохов" msgstr[3] "посох" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -60262,7 +60363,7 @@ msgstr[1] "камня в носке" msgstr[2] "камней в носке" msgstr[3] "камень в носке" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "" @@ -60277,7 +60378,8 @@ msgstr[1] "заточки из зубных щёток" msgstr[2] "заточек из зубных щёток" msgstr[3] "заточка из зубной щётки" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "Предмет личной гигиены, переделанный в заточку." @@ -60622,7 +60724,7 @@ msgstr[1] "нагинаты" msgstr[2] "нагинат" msgstr[3] "нагината" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -60633,7 +60735,7 @@ msgstr "" "катаны и других японских клинков. Изредка использовалось самураями в ранние " "периоды, а также их жёнами для обороны дома." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -60644,7 +60746,7 @@ msgstr "" "катаны и других японских клинков. Лезвие немного болтается, и всё оружие " "сделано довольно небрежно." -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -60662,7 +60764,8 @@ msgstr[1] "нагинаты выживальщика" msgstr[2] "нагинат выживальщика" msgstr[3] "нагината выживальщика" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -60751,7 +60854,7 @@ msgstr[1] "дори" msgstr[2] "дори" msgstr[3] "дори" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "" @@ -60765,7 +60868,7 @@ msgstr[1] "цзи" msgstr[2] "цзи" msgstr[3] "цзи" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -60853,7 +60956,7 @@ msgstr[1] "цзяня" msgstr[2] "цзяней" msgstr[3] "цзянь" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -60993,7 +61096,7 @@ msgstr[1] "нодати" msgstr[2] "нодати" msgstr[3] "нодати" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " @@ -61002,7 +61105,7 @@ msgstr "" "Тупая и дешёвая подделка огромного изогнутого двуручного меча из Японии. " "Удивительно лёгок для своего размера." -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -61167,7 +61270,7 @@ msgstr[1] "абордажных сабли" msgstr[2] "абордажных сабель" msgstr[3] "абордажная сабля" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -61289,7 +61392,7 @@ msgstr[1] "криса" msgstr[2] "крисов" msgstr[3] "крис" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -61323,7 +61426,7 @@ msgstr[1] "когтей тигра" msgstr[2] "когтей тигра" msgstr[3] "когти тигра" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -61358,7 +61461,8 @@ msgstr[1] "пары латунных кастетов" msgstr[2] "пар латунных кастетов" msgstr[3] "пара латунных кастетов" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -61395,7 +61499,8 @@ msgstr[1] "пары кастетов с гвоздями" msgstr[2] "пар кастетов с гвоздями" msgstr[3] "пара кастетов с гвоздями" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -61412,7 +61517,8 @@ msgstr[1] "пары стальных кастетов" msgstr[2] "пар стальных кастетов" msgstr[3] "пара стальных кастетов" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -61525,7 +61631,7 @@ msgstr[1] "метательных ножа" msgstr[2] "метательных ножей" msgstr[3] "метательный нож" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -61562,7 +61668,8 @@ msgstr[1] "листа стекла" msgstr[2] "листов стекла" msgstr[3] "лист стекла" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " @@ -61571,7 +61678,7 @@ msgstr "" "Вы разламываете стекло и раскладываете осколки на земле, чтобы на них кто-" "нибудь наступил." -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -61585,7 +61692,8 @@ msgstr[1] "листа ударопрочного стекла" msgstr[2] "листов ударопрочного стекла" msgstr[3] "лист ударопрочного стекла" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "Большой лист стекла, армированного стальной проволокой." @@ -61598,7 +61706,8 @@ msgstr[1] "куска ударопрочного стекла" msgstr[2] "кусков ударопрочного стекла" msgstr[3] "кусок ударопрочного стекла" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "" @@ -61713,7 +61822,7 @@ msgstr[1] "обрезка меди" msgstr[2] "обрезков меди" msgstr[3] "обрезок меди" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "" @@ -61790,7 +61899,7 @@ msgstr[1] "матраса" msgstr[2] "матрасов" msgstr[3] "матрасы" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "Одно- или двуспальный матрас." @@ -61803,7 +61912,7 @@ msgstr[1] "пуховых матраса" msgstr[2] "пуховых матраса" msgstr[3] "пуховые матрасы" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "Одно- или двуспальный пуховый матрас." @@ -62218,21 +62327,28 @@ msgstr[1] "закрытые банки (маринованные яйца)" msgstr[2] "закрытых банок (маринованные яйца)" msgstr[3] "закрытая банка (маринованные яйца)" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "Открыть" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "Вы открыли банку, тем самым разгерметизировав её." -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -62249,7 +62365,8 @@ msgstr[1] "закрытые банки (маринованные огурчик msgstr[2] "закрытых банок (маринованные огурчики)" msgstr[3] "закрытая банка (маринованные огурчики)" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -62266,7 +62383,8 @@ msgstr[1] "закрытые банки (квашёнка)" msgstr[2] "закрытых банок (квашёнка)" msgstr[3] "закрытая банка (квашёнка)" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -63058,7 +63176,7 @@ msgstr[1] "коробки с машинками на РУ" msgstr[2] "коробок с машинками на РУ" msgstr[3] "коробка с машинкой на РУ" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -63190,7 +63308,8 @@ msgstr[1] "зажимы для штатива" msgstr[2] "зажимы для штатива" msgstr[3] "зажимы для штатива" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -63273,7 +63392,8 @@ msgstr[1] "пары вязальных спиц" msgstr[2] "пар вязальных спиц" msgstr[3] "вязальные спицы" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -63390,7 +63510,8 @@ msgstr[1] "прялки с веретеном" msgstr[2] "прялок с веретеном" msgstr[3] "прялка с веретеном" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -63527,7 +63648,7 @@ msgstr[1] "аккумуляторных ящика" msgstr[2] "аккумуляторных ящиков" msgstr[3] "аккумуляторный ящик" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -63544,7 +63665,7 @@ msgstr[1] "деревянных лодочных корпуса" msgstr[2] "деревянных лодочных корпусов" msgstr[3] "деревянные лодочные корпуса" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -63562,7 +63683,7 @@ msgstr[1] "пластиковых лодочных корпуса" msgstr[2] "пластиковых лодочных корпусов" msgstr[3] "пластиковые лодочные корпуса" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -63600,7 +63721,7 @@ msgstr[1] "вёсел" msgstr[2] "вёсел" msgstr[3] "вёсла" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "Вёсла для лодки." @@ -63613,7 +63734,7 @@ msgstr[1] "паруса" msgstr[2] "парусов" msgstr[3] "паруса" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "Паруса для лодки." @@ -63626,7 +63747,8 @@ msgstr[1] "надувных секции" msgstr[2] "надувных секций" msgstr[3] "надувная секция" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "Надувная секция лодки." @@ -63639,7 +63761,8 @@ msgstr[1] "подушки безопасности" msgstr[2] "подушек безопасности" msgstr[3] "подушка безопасности" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "Подушка безопасности." @@ -63850,7 +63973,8 @@ msgstr[1] "системы управления" msgstr[2] "систем управления" msgstr[3] "система управления" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "" @@ -63922,7 +64046,8 @@ msgstr[1] "комплекта электронного управления ав msgstr[2] "комплектов электронного управления автомобилем" msgstr[3] "комплект электронного управления автомобилем" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -63939,7 +64064,7 @@ msgstr[1] "системы роботизированного вождения" msgstr[2] "систем роботизированного вождения" msgstr[3] "система роботизированного вождения" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -64162,7 +64287,7 @@ msgstr[1] "отвала" msgstr[2] "отвалов" msgstr[3] "отвал" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -64179,7 +64304,7 @@ msgstr[1] "сеялки" msgstr[2] "сеялок" msgstr[3] "сеялка" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -64197,7 +64322,7 @@ msgstr[1] "жатки" msgstr[2] "жаток" msgstr[3] "жатка" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -64250,7 +64375,7 @@ msgstr[1] "плуга" msgstr[2] "плугов" msgstr[3] "плуг" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "" @@ -64436,7 +64561,8 @@ msgstr[1] "спецсигнала (красных)" msgstr[2] "спецсигналов (красных)" msgstr[3] "спецсигнал (красный)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -64453,7 +64579,8 @@ msgstr[1] "спецсигнала (синих)" msgstr[2] "спецсигналов (синих)" msgstr[3] "спецсигнал (синий)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -64501,7 +64628,8 @@ msgstr[1] "ободов для колёс" msgstr[2] "ободов для колёс" msgstr[3] "обода для колёс" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "Ободы колёс для использования вручную на креслах-каталках." @@ -65285,7 +65413,7 @@ msgstr[1] "автомобильных кондиционера" msgstr[2] "автомобильных кондиционеров" msgstr[3] "автомобильный кондиционер" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "Монтируемый на автомобиль кондиционер" @@ -65298,7 +65426,7 @@ msgstr[1] "автомобильных обогревателя" msgstr[2] "автомобильных обогревателей" msgstr[3] "автомобильные обогреватели" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "Обогреватель воздуха для установки в автомобиль." @@ -65768,14 +65896,12 @@ msgstr[3] "Криптокоины" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" "PrepNet активно участвовало в уклонении от уплаты налогов, используя " -"неотслеживаемые интернет-валюты. Если бы это движение выросло, оно могло бы " -"нанести ущерб налоговой базе США, но катаклизм случился раньше. Это " -"материальные монеты с выбитыми на них последовательностями случайных чисел." +"неотслеживаемые интернет-валюты. Это материальные монеты с выбитыми на них " +"последовательностями случайных чисел и RFID меткой внутри." #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py msgid "vehicle refrigerator" @@ -81583,7 +81709,7 @@ msgstr[1] "ягнёнка" msgstr[2] "ягнят" msgstr[3] "ягнёнок" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -91489,7 +91615,8 @@ msgstr[3] "шахтёрская каска (вкл)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -92166,12 +92293,14 @@ msgstr[1] "фазовые иммерсионные костюмы (вкл)" msgstr[2] "фазовых иммерсионных костюмов (вкл)" msgstr[3] "фазовый иммерсионный костюм (вкл)" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "Костюм выключается." -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -104601,7 +104730,7 @@ msgid "" "A combination kit of a washboard and a scrubbing tool. Everything you need " "to clean items after the apocalypse." msgstr "" -"Стиральная доска и чистящий инструмент — то, что надо для мытья вещей после " +"Стиральная доска и чистящий инструмент, то что надо для мытья вещей после " "апокалипсиса." #: lang/json/TOOL_from_json.py lang/json/trap_from_json.py @@ -120921,10 +121050,10 @@ msgstr "" "Эта турбина при помощи ветра высасывает из чердака горячий и влажный воздух." #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "сено" +msgid "bale of hay" +msgstr "стог сена" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "Стог сена. Если всё совсем плохо, то вы можете спать на нём." @@ -196477,16 +196606,16 @@ msgid "Clothing Store" msgstr "Магазин Одежды" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." -msgstr "Послушник." +msgid "You there. Quiet down. Can you hear it? The song?" +msgstr "Ты тут. Тихо. Ты слышишь? Песнь?" #: lang/json/talk_topic_from_json.py msgid "You're back. Have you come to listen to the song?" msgstr "Ты снова тут. Ты хочешь послушать песнь?" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" -msgstr "Ты тут. Тихо. Ты слышишь? Песнь?" +msgid "Acolyte." +msgstr "Послушник." #: lang/json/talk_topic_from_json.py msgid "What? What do you mean? What song?" @@ -196663,21 +196792,19 @@ msgid "Yeah, alright." msgstr "Да-да, точно." #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." -msgstr "Тебе ещё предстоит спеть песню, если желаешь." +msgid "An acolyte should not take on too many songs at once." +msgstr "Послушнику не следует браться за много песен сразу." #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." -msgstr "Если хочешь, у меня есть ещё песня для тебя." +msgid "That is all for now." +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." -msgstr "Я знаю несколько полезных костей, если хочешь услышать побольше." - -#: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" -msgstr "Ещё есть невырезанные кости и неспетые песни. Присоединишься ко мне?" +"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 "Do you wish to take on more songs?" @@ -196688,19 +196815,21 @@ msgid "Do you believe you can take on the burden of additional bones?" 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." -msgstr "" -"Пока что песня… Утихла. Возможно, на костях мира будет высечено больше нот." +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." -msgstr "Послушнику не следует браться за много песен сразу." +msgid "There is an additional song you could take on, if you'd like." +msgstr "Если хочешь, у меня есть ещё песня для тебя." #: lang/json/talk_topic_from_json.py -msgid "That is all for now." -msgstr "Пока что всё." +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." +msgstr "Тебе ещё предстоит спеть песню, если желаешь." #: lang/json/talk_topic_from_json.py msgid "I see." @@ -196779,6 +196908,10 @@ msgstr "" msgid "I see. Very well then." msgstr "Ясно. Очень хорошо." +#: lang/json/talk_topic_from_json.py +msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgstr "Только носящие мой знак покажут, что они достойны моих умений." + #: lang/json/talk_topic_from_json.py msgid "" "You bear my mark, meaning I believe you have potential to learn to truly " @@ -196787,10 +196920,6 @@ msgstr "" "У тебя мой знак, значит, у тебя есть потенциал учиться по-настоящему слушать" " песню. Да, пока что я помогу тебе своими умениями." -#: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." -msgstr "Только носящие мой знак покажут, что они достойны моих умений." - #: lang/json/talk_topic_from_json.py msgid "I am glad to hear it. Let's go then." msgstr "Приятно слышать. Тогда пойдём." @@ -197043,14 +197172,6 @@ msgstr "" " Также, поскольку мы друзья, я без вопросов дам тебе любой предмет из моего инвентаря. \n" " Ах да, если я хочу есть или пить и у меня есть припасы, я их съем. То же самое, если мне надо зарядить бионику, а у меня есть топливо. Так что тебе, наверное, стоит смотреть, что ты мне даёшь, лады?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." -msgstr "" -"Эй, я же врач! Я знаю, как лечить травмы. Принеси мне бинты и бутылку " -"антисептика, и я подлатаю тебя, если поранишься." - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I can perform first aid. You give me some bandages or a bottle of " @@ -197059,6 +197180,14 @@ msgstr "" "Да, я могу оказать первую помощь. Принеси мне бинты и бутылку антисептика, я" " обработаю твои раны как умею." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +msgstr "" +"Эй, я же врач! Я знаю, как лечить травмы. Принеси мне бинты и бутылку " +"антисептика, и я подлатаю тебя, если поранишься." + #: lang/json/talk_topic_from_json.py msgid "" " But remember, I like you, but I like me more - so I'm going to use those " @@ -197274,16 +197403,16 @@ msgstr "Спасибо за пояснение. Я хочу узнать кое msgid "Thanks. I have some things for you to do." msgstr "Спасибо. Я хочу, чтоб ты сделал кое-что ещё." -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "Привет, ." - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "СТОЯТЬ, руки вверх! Ха, испугался?… Закона больше нет…" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "Привет, ." + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "Что ты здесь делаешь?" @@ -197363,24 +197492,24 @@ msgstr "" "иногда появляется странник, уверенный, что найдёт лучшую долю." #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "Нет, просто, , нет…" +msgid "Anything to do before I go to sleep?" +msgstr "Что-нибудь ещё, пока я не пошёл спать?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "Дай мне поспать, !" +msgid "Just few minutes more..." +msgstr "Ещё пару минут…" #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "Давай быстрее, мне нужно идти спать." #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "Ещё пару минут…" +msgid "Just let me sleep, !" +msgstr "Дай мне поспать, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "Что-нибудь ещё, пока я не пошёл спать?" +msgid "No, just no..." +msgstr "Нет, просто, , нет…" #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -197497,93 +197626,93 @@ msgid "Let's go." msgstr "Пошли." #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." -msgstr "*не будет атаковать врагов." +msgid "*will engage all enemies." +msgstr "*будет атаковать всех врагов." #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." -msgstr "*будет атаковать ближайших врагов." +msgid "*will engage enemies close enough to attack without moving." +msgstr "*будет атаковать врагов, которых можно достать без передвижения." #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." -msgstr "*будет атаковать слабых врагов." +msgid "*will engage distant enemies without moving." +msgstr "*будет атаковать врагов, которых можно достать без передвижения." #: lang/json/talk_topic_from_json.py msgid "*will engage enemies you attack." msgstr "*будет атаковать врагов, которых вы атакуете." #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "*будет атаковать врагов, которых можно достать без передвижения." - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." -msgstr "*будет атаковать врагов, которых можно достать без передвижения." +msgid "*will engage weak enemies." +msgstr "*будет атаковать слабых врагов." #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." -msgstr "*будет атаковать всех врагов." +msgid "*will engage nearby enemies." +msgstr "*будет атаковать ближайших врагов." #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " -msgstr "ПЕРЕГРУЗКА:" +msgid "*will not engage enemies." +msgstr "*не будет атаковать врагов." #: lang/json/talk_topic_from_json.py msgid " " msgstr " " #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid " OVERRIDE: " +msgstr "ПЕРЕГРУЗКА:" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "Что нужно делать?" @@ -197694,14 +197823,13 @@ msgid "Attack anything you want." msgstr "Нападай на кого хочешь." #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." -msgstr "*будет беречь 100% энергии для защитной или вспомогательной бионики." +msgid "*will not reserve any power for defense or utility CBMs." +msgstr "*не будет беречь энергию для защитной или вспомогательной бионики." #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." -msgstr "*будет беречь 75% энергии для защитной или вспомогательной бионики." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgstr "*будет беречь 25% энергии для защитной или вспомогательной бионики." #: lang/json/talk_topic_from_json.py #, no-python-format @@ -197710,12 +197838,13 @@ msgstr "*будет беречь 50% энергии для защитной ил #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." -msgstr "*будет беречь 25% энергии для защитной или вспомогательной бионики." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgstr "*будет беречь 75% энергии для защитной или вспомогательной бионики." #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." -msgstr "*не будет беречь энергию для защитной или вспомогательной бионики." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgstr "*будет беречь 100% энергии для защитной или вспомогательной бионики." #: lang/json/talk_topic_from_json.py msgid "" @@ -197766,13 +197895,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." -msgstr "* будет перезаряжать КБМ до 90% от полного запаса" +msgid "*will recharge power CBMs until has 10% of total power." +msgstr "*1 будет перезаряжать КБМ до 10% от полного запаса" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." -msgstr "*1 будет перезаряжать КБМ до 75% от полного запаса" +msgid "*will recharge power CBMs until has 25% of total power." +msgstr "*1 будет перезаряжать КБМ до 25% от полного запаса" #: lang/json/talk_topic_from_json.py #, no-python-format @@ -197781,13 +197910,13 @@ msgstr "*1 будет перезаряжать КБМ до 50% от полног #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." -msgstr "*1 будет перезаряжать КБМ до 25% от полного запаса" +msgid "*will recharge power CBMs until has 75% of total power." +msgstr "*1 будет перезаряжать КБМ до 75% от полного запаса" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." -msgstr "*1 будет перезаряжать КБМ до 10% от полного запаса" +msgid "*will recharge power CBMs until has 90% of total power." +msgstr "* будет перезаряжать КБМ до 90% от полного запаса" #: lang/json/talk_topic_from_json.py msgid " When should consume supplies to recharge power CBMs?" @@ -197822,20 +197951,20 @@ msgid "" msgstr "Припасы почти закончились. Заряжайся до 10% максимального заряда." #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." -msgstr "*будет целиться, когда удобно." - -#: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." -msgstr "*будет стрелять только после длительного прицеливания." +msgid "*will not bother to aim at all." +msgstr "*не будет тратить время на прицеливание." #: lang/json/talk_topic_from_json.py msgid "*will take time and aim carefully." msgstr "*будет тратить время на прицеливание." #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." -msgstr "*не будет тратить время на прицеливание." +msgid "*will only shoot after taking a long time to aim." +msgstr "*будет стрелять только после длительного прицеливания." + +#: lang/json/talk_topic_from_json.py +msgid "*will aim when it's convenient." +msgstr "*будет целиться, когда удобно." #: lang/json/talk_topic_from_json.py msgid " How should aim?" @@ -197878,81 +198007,81 @@ msgid "OVERRIDE: " msgstr "ПЕРЕГРУЗКА:" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "Следуй тем же правилам, что и…" @@ -198121,14 +198250,14 @@ msgstr "*пшшш-пшшш* принято, выдвигаюсь, приём." msgid "Sure thing, I'll make my way there." msgstr "Хорошо, я выдвигаюсь туда." -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -198306,28 +198435,28 @@ msgid "I don't care." msgstr "Мне всё равно." #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "У меня есть ещё одна работёнка для тебя. Хочешь послушать?" - -#: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -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 "У меня для тебя есть и другая работа. Хочешь послушать?" +msgid "I don't have any jobs for you." +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 don't have any jobs for you." -msgstr "У меня нет работы для тебя." +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 more jobs for you." -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 another job for you. Want to hear about it?" +msgstr "У меня есть ещё одна работёнка для тебя. Хочешь послушать?" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -198338,10 +198467,6 @@ msgstr "Ну, ладно." msgid "Never mind, I'm not interested." msgstr "Неважно, мне не интересно." -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "Ты сейчас на меня не работаешь." - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "Какое задание?" @@ -198350,6 +198475,10 @@ msgstr "Какое задание?" msgid "What about it?" msgstr "Что насчёт него?" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "Ты сейчас на меня не работаешь." + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "Я это сделаю!" @@ -198566,49 +198695,49 @@ msgstr "Хмм, ладно." msgid "Thanks!" msgstr "Спасибо!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "Меня мучает жажда, дай мне чего-нибудь попить." +msgid "I have some reason for not telling you." +msgstr "У меня есть причины не рассказывать тебе об этом." #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "Я очень голоден, дай мне чего-нибудь поесть." +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "Ничего в голову не лезет. Может позже спросишь?" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "Я слишком устал, дай мне сначала отдохнуть." #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "Ничего в голову не лезет. Может позже спросишь?" +msgid "I'm too hungry, give me something to eat." +msgstr "Я очень голоден, дай мне чего-нибудь поесть." #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." -msgstr "У меня есть причины не рассказывать тебе об этом." +msgid "I'm too thirsty, give me something to drink." +msgstr "Меня мучает жажда, дай мне чего-нибудь попить." + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "Смотри на дорогу, бро!" #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "Ну, ладно." #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "Не раньше, чем я получу антибиотики…" +msgid "Why should I travel with you?" +msgstr "И почему я должен пойти с тобой?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "Ты об этом уже спрашивал; спроси снова попозже." #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "И почему я должен пойти с тобой?" +msgid "Not until I get some antibiotics..." +msgstr "Не раньше, чем я получу антибиотики…" #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -198698,21 +198827,21 @@ msgstr "Нет, мы здесь будем в порядке." msgid "On second thought, never mind." msgstr "Если ещё раз подумать, то неважно." -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "Я не могу полноценно обучать тебя, пока ты за рулём!" - #: lang/json/talk_topic_from_json.py msgid "I can't train you properly while I'm operating a vehicle!" msgstr "Я не могу тебя учить, когда я за рулём!" +#: lang/json/talk_topic_from_json.py +msgid "I have some reason for denying you training." +msgstr "У меня есть причины не учить тебя." + #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "Дайте мне немного времени, и я вам покажу что-то новое…" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "У меня есть причины не учить тебя." +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "Я не могу полноценно обучать тебя, пока ты за рулём!" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -198750,14 +198879,14 @@ msgstr "Я бы предпочёл, держать это при себе." msgid "I understand…" msgstr "Я понимаю…" -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "Ты уже спрашивал о снаряжении; спроси попозже." - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "С какой стати я буду делиться с тобой своим имуществом?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "Ты уже спрашивал о снаряжении; спроси попозже." + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "Ладно, хорошо." @@ -198902,10 +199031,6 @@ msgstr "Приятно иметь с тобой дело!" msgid "You might be seeing more of me…" msgstr "Думаю, мы ещё встретимся…" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "Снова привет. *жжж*" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " @@ -198914,6 +199039,10 @@ msgstr "" "Я… Я свободен. *Жжжт* Я действительно свободен! *бжжж* Слушай, ты первый " "человек, которого я вижу за долгое время." +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "Снова привет. *жжж*" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "Эй, давай немножко поболтаем." @@ -200013,28 +200142,28 @@ msgid "This is a low driving test response." msgstr "Это тестовый ответ низкого уровня вождения." #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." -msgstr "Привет, дружище, приятно увидеться." +msgid "Greeting citizen, what brings you to the FoodLair?" +msgstr "Здравствуй, гражданин, что привело тебя в Дом Поешь-ки?" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" -msgstr "Так ты вернулся… Объяснись!" +msgid "Still here? Take your time, it's rough out there." +msgstr "Всё ещё тут? Не спеши, снаружи сурово." #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" -msgstr "Что это за магия?" +msgid "Greetings friend, it's nice to see you." +msgstr "Привет, дружище, приятно увидеться." #: lang/json/talk_topic_from_json.py msgid "Welcome home Foodkid!" msgstr "Привет, Поешь-ка-младший!" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." -msgstr "Всё ещё тут? Не спеши, снаружи сурово." +msgid "What sorcery is this?" +msgstr "Что это за магия?" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" -msgstr "Здравствуй, гражданин, что привело тебя в Дом Поешь-ки?" +msgid "So you're back… Explain yourself!" +msgstr "Так ты вернулся… Объяснись!" #: lang/json/talk_topic_from_json.py msgid "Greetings… Foodperson?" @@ -201785,10 +201914,6 @@ msgstr "" "север. Теоретически, наверно, я до сих пор к ней иду, хотя по правде я " "просто пытаюсь не умереть." -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "Я просто не могу сейчас об этом говорить. Не могу." - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -201797,14 +201922,16 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" "Я работал в больнице, когда всё началось. Немного как в тумане. Какое-то " "время шли жуткие доклады, невероятная дичь про пациентов, воскресавших после" " смерти, но в целом дела шли своим чередом. Потом, ближе к концу, обстановка" " резко накалилась. Мы думали, Китай напал на нас, и именно так нам и " "сообщали. К нам поступали обезумевшие люди, покрытые ранами от пуль и " -"укусов. Примерно на половине своей смены я… В общем, я не выдержал." +"укусов. Примерно на половине своей смены я… в общем, я не выдержал. Я видел " +"такие кошмарные раны, и я… , я даже не могу об этом говорить." #: lang/json/talk_topic_from_json.py msgid "" @@ -201814,16 +201941,18 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" "Я работал в больнице, когда всё началось. Немного как в тумане. Какое-то " "время шли жуткие доклады, невероятная дичь про пациентов, воскресавших после" " смерти, но в целом дела шли своим чередом. Потом, ближе к концу, обстановка" " резко накалилась. Мы думали, Китай напал на нас, и именно так нам и " "сообщали. К нам поступали обезумевшие люди, покрытые ранами от пуль и " -"укусов. Примерно на половине своей смены я… в общем, я не выдержал. Я видел " -"такие кошмарные раны, и я… , я даже не могу об этом говорить." +"укусов. Примерно на половине своей смены я… В общем, я не выдержал." + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "Я просто не могу сейчас об этом говорить. Не могу." #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." @@ -202305,18 +202434,18 @@ msgstr "Спасибо, что поделился рассказом. plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Мой муж выжил вместе со мной, но его сожрали эти чудовищные, , " +"Моя жена выжила вместе со мной, но её сожрали эти чудовищные, , " "растения за несколько дней до встречи с тобой. Не лучший год для меня." #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" -"Моя жена выжила вместе со мной, но её сожрали эти чудовищные, , " +"Мой муж выжил вместе со мной, но его сожрали эти чудовищные, , " "растения за несколько дней до встречи с тобой. Не лучший год для меня." #: lang/json/talk_topic_from_json.py @@ -202392,9 +202521,10 @@ msgid "I'm sorry you lost someone." msgstr "Мне жаль, что тебе пришлось кого-то потерять." #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" -msgstr "Я сказал, я не хочу говорить. Чего тут непонятного?" +msgid "Just another tale of love and loss. Not one I like to tell." +msgstr "" +"Просто ещё один рассказ про любовь и смерть. Не то, о чем мне " +"нравится говорить." #: lang/json/talk_topic_from_json.py msgid "" @@ -202405,10 +202535,9 @@ msgstr "" " будет." #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." -msgstr "" -"Просто ещё один рассказ про любовь и смерть. Не то, о чем мне " -"нравится говорить." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" +msgstr "Я сказал, я не хочу говорить. Чего тут непонятного?" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -202431,32 +202560,13 @@ msgid "" "Oh, . This doesn't have anything to do with you, or with us." msgstr "Да . Тебя или нас это вообще не должно касаться." -#: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." -msgstr "Отлично, прекрасно. У меня был муж. Я потеряла его." - #: lang/json/talk_topic_from_json.py msgid "All right, fine. I had someone. I lost her." msgstr "Отлично, прекрасно. У меня была жена. Я потерял её." #: lang/json/talk_topic_from_json.py -msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " -"zone. Things I can't describe lurching through the streets, crushing people" -" and cars. Soldiers trying to stop them, but hitting people in the " -"crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " -" made it alive." -msgstr "" -"Он был дома, когда упали бомбы, а мир превратился в преисподнюю. Я была на " -"работе. Я пыталась добраться до нашего дома, но город превратился в поле " -"боя. Неописуемые существа двигались по улицам, давя людей и машины. Солдаты " -"пытались остановить их, но с тем же успехом убивали людей перекрёстным " -"огнём. А потом случайные жертвы восставали и присоединялись к врагу. Если бы" -" речь не шла о моём муже, я бы просто убежала, но я сделала что смогла и " -"проскочила. Я на самом деле, , выжила." +msgid "All right, fine. I had someone. I lost him." +msgstr "Отлично, прекрасно. У меня был муж. Я потеряла его." #: lang/json/talk_topic_from_json.py msgid "" @@ -202477,6 +202587,25 @@ msgstr "" " речь не шла о моей жене, я бы просто убежал, но я сделал что смог и " "проскочил. Я на самом деле, , выжил." +#: lang/json/talk_topic_from_json.py +msgid "" +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " +"zone. Things I can't describe lurching through the streets, crushing people" +" and cars. Soldiers trying to stop them, but hitting people in the " +"crossfire as much as anything. And then the collateral damage would get " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " +" made it alive." +msgstr "" +"Он был дома, когда упали бомбы, а мир превратился в преисподнюю. Я была на " +"работе. Я пыталась добраться до нашего дома, но город превратился в поле " +"боя. Неописуемые существа двигались по улицам, давя людей и машины. Солдаты " +"пытались остановить их, но с тем же успехом убивали людей перекрёстным " +"огнём. А потом случайные жертвы восставали и присоединялись к врагу. Если бы" +" речь не шла о моём муже, я бы просто убежала, но я сделала что смогла и " +"проскочила. Я на самом деле, , выжила." + #: lang/json/talk_topic_from_json.py msgid "You must have seen some shit." msgstr "Тебе пришлось насмотреться всякой херни." @@ -202542,26 +202671,6 @@ msgstr "По пути туда наверняка пришлось насмот msgid "Did you make it into the house?" msgstr "У тебя получилось проникнуть в дом?" -#: lang/json/talk_topic_from_json.py -msgid "" -"I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " -"the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " -"have to do to the dead now. And then I packed up the last few fragments of " -"my life, and I try to never look back." -msgstr "" -"Да, получилось. Я потратила несколько часов, чтобы найти вход. А хочешь " -"знать, в чём самый пиздец? Типа, вот самый-самый? Мой муж был ещё жив. Он " -"всё это время был в подвале, придавленный куском обвалившегося пола. И он " -"потерял много крови, он бредил, когда я его нашла. Я не смогла его вытащить," -" так что я кормила и поила его и просто сидела рядом и держала его за руку, " -"пока он не умер. А потом… Что ж, потом я сделала то, что сейчас обычно " -"приходится делать с мёртвыми. После этого я собрала несколько последних " -"кусочков моей жизни и стараюсь никогда не оглядываться назад." - #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " @@ -202582,6 +202691,26 @@ msgstr "" "обычно приходится делать с мёртвыми. После этого я собрал несколько " "последних кусочков моей жизни и стараюсь никогда не оглядываться назад." +#: lang/json/talk_topic_from_json.py +msgid "" +"I did. Took a few hours to get an opening. And you wanna know the fucked " +"up part? Like, out of all this? My husband was still alive. He'd been in " +"the basement the whole time, pinned under a collapsed piece of floor. And " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " +"have to do to the dead now. And then I packed up the last few fragments of " +"my life, and I try to never look back." +msgstr "" +"Да, получилось. Я потратила несколько часов, чтобы найти вход. А хочешь " +"знать, в чём самый пиздец? Типа, вот самый-самый? Мой муж был ещё жив. Он " +"всё это время был в подвале, придавленный куском обвалившегося пола. И он " +"потерял много крови, он бредил, когда я его нашла. Я не смогла его вытащить," +" так что я кормила и поила его и просто сидела рядом и держала его за руку, " +"пока он не умер. А потом… Что ж, потом я сделала то, что сейчас обычно " +"приходится делать с мёртвыми. После этого я собрала несколько последних " +"кусочков моей жизни и стараюсь никогда не оглядываться назад." + #: lang/json/talk_topic_from_json.py msgid "" "I was at school for . Funny thing, actually: I was gearing " @@ -203426,6 +203555,22 @@ msgstr "" "Вознесение прошло, а я остался. Так что теперь я буду бродить по Аду на " "Земле. Хотелось бы мне с большим рвением посещать воскресную школу." +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" +"Я жил один на старой семейной ферме вдали от города. Моя жена умерла чуть " +"более месяца до того, как всё началось… Рак. Я потерял её такой молодой, но " +"теперь я хотя бы наконец вижу в этом что-то хорошее. Короче, я всё равно " +"просидел какое-то время взаперти. Когда по новостям заговорили про китайское" +" биооружие и спящих агентов и показали бунты в Бостоне и всё такое, я " +"устроился поудобнее с банкой супа и переключил канал." + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -203443,22 +203588,6 @@ msgstr "" "китайское биооружие и спящих агентов и показали бунты в Бостоне и всё такое," " я устроилась поудобнее с банкой супа и переключила канал." -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" -"Я жил один на старой семейной ферме вдали от города. Моя жена умерла чуть " -"более месяца до того, как всё началось… Рак. Я потерял её такой молодой, но " -"теперь я хотя бы наконец вижу в этом что-то хорошее. Короче, я всё равно " -"просидел какое-то время взаперти. Когда по новостям заговорили про китайское" -" биооружие и спящих агентов и показали бунты в Бостоне и всё такое, я " -"устроился поудобнее с банкой супа и переключил канал." - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -203564,14 +203693,6 @@ msgstr "Мне жаль Бака. " msgid "I'm sorry about Buck. " msgstr "Мне жаль Бака. " -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "" -"Как я говорил, если ты хочешь услышать историю, выкладывай виски. Помни, " -"полную бутылку." - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " @@ -203580,6 +203701,14 @@ msgstr "" "Слушай. Я тебе доходчиво объясняю. Я работаю на тебя, лады? Я не хочу к " "кому-то привязываться. Ты платишь не за дружбу." +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "" +"Как я говорил, если ты хочешь услышать историю, выкладывай виски. Помни, " +"полную бутылку." + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -203990,20 +204119,6 @@ msgstr "" "трусом, но сейчас я знаю, что если б я остался и помог, превратился бы в ещё" " один слюнявый труп." -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm" -" just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." -msgstr "" -"Что ж, у меня есть странная надежда, может, и тупая. Я видела, как мой жених" -" уезжал со своей сестрой — моей подружкой невесты — в её пикапе, когда " -"началась вся хрень. Так что, пока я любым образом их не встречу, я всё ещё " -"буду верить, что они где-то там, и у них всё хорошо. Это больше, чем есть у " -"многих из нас." - #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancée " @@ -204018,10 +204133,28 @@ msgstr "" " ещё буду верить, что они где-то там, и у них всё хорошо. Это больше, чем " "есть у многих из нас." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm" +" just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" +"Что ж, у меня есть странная надежда, может, и тупая. Я видела, как мой жених" +" уезжал со своей сестрой — моей подружкой невесты — в её пикапе, когда " +"началась вся хрень. Так что, пока я любым образом их не встречу, я всё ещё " +"буду верить, что они где-то там, и у них всё хорошо. Это больше, чем есть у " +"многих из нас." + #: lang/json/talk_topic_from_json.py msgid "What were you saying before that?" msgstr "О чём ты там говорил?" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "Добро пожаловать! Не видел тебя раньше, чем могу помочь?" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "Привет." @@ -204042,10 +204175,6 @@ msgstr "Добро пожаловать!" msgid "How's the weather?" msgstr "Как погода?" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "Добро пожаловать! Не видел тебя раньше, чем могу помочь?" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "Что это за место?" @@ -204139,16 +204268,6 @@ msgstr "" msgid "At least I tried." msgstr "Я хотя бы попытался." -#: lang/json/talk_topic_from_json.py -msgid "" -"You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." -msgstr "" -"Тебе придется спросить у нашего лидера, Елены. Она тут принимает решения. Но" -" как я сказал, твои шансы низкие, как и чьи угодно. Последний член " -"присоединился уже очень давно." - #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " @@ -204161,6 +204280,16 @@ msgstr "" "раньше, они были бы выше. Последний член присоединился всего несколько дней " "назад." +#: lang/json/talk_topic_from_json.py +msgid "" +"You have to ask our leader, Helena, first. She's the one who makes those " +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." +msgstr "" +"Тебе придется спросить у нашего лидера, Елены. Она тут принимает решения. Но" +" как я сказал, твои шансы низкие, как и чьи угодно. Последний член " +"присоединился уже очень давно." + #: lang/json/talk_topic_from_json.py msgid "" "From me? Nothing. But we have a tailor, herbalist and a hunter. Go see " @@ -204218,6 +204347,10 @@ msgstr "" "до а, и ан обратной стороне у них напечатено наше имя. Куда " "удобнее чем доллары, их теперь только на растопку пускать." +#: lang/json/talk_topic_from_json.py +msgid "Hey! What are you doing up here? You are not allowed to come here." +msgstr "Эй! Ты что тут делаешь? Тебе сюда нельзя." + #: lang/json/talk_topic_from_json.py msgid "You're back." msgstr "Ты снова тут." @@ -204226,10 +204359,6 @@ msgstr "Ты снова тут." msgid "So…?" msgstr "И…?" -#: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." -msgstr "Эй! Ты что тут делаешь? Тебе сюда нельзя." - #: lang/json/talk_topic_from_json.py msgid "How much food do you have in storage?" msgstr "Сколько у вас еды в хранилище?" @@ -204259,6 +204388,14 @@ msgstr "Могу ли я одолжить что-нибудь со склада? msgid "Has anyone stolen from here?" msgstr "Здесь что-нибудь украли?" +#: lang/json/talk_topic_from_json.py +msgid "" +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." +msgstr "" +"Извини, но никому не разрешено брать что-либо отсюда. Мы бы хотели помочь, " +"но у нас уже и так достаточно голодных ртов." + #: lang/json/talk_topic_from_json.py msgid "" "I am afraid you can't. Look, we are running low on our rations, and we " @@ -204269,14 +204406,6 @@ msgstr "" "ещё больше. Даже если ты просто хочешь «одолжить». Плохо, что ты не пришел " "сюда раньше, мы тогда могли бы помочь." -#: lang/json/talk_topic_from_json.py -msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." -msgstr "" -"Извини, но никому не разрешено брать что-либо отсюда. Мы бы хотели помочь, " -"но у нас уже и так достаточно голодных ртов." - #: lang/json/talk_topic_from_json.py msgid "I have money." msgstr "У меня есть деньги." @@ -204317,14 +204446,6 @@ msgstr "" msgid "I think I'll be going." msgstr "Думаю, мне пора." -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." -msgstr "" -"Теперь даже и не знаю. Понимаешь, у нас было двадцать полных ящиков " -"продуктов. Это было несколько месяцев назад. Мы почти все съели." - #: lang/json/talk_topic_from_json.py msgid "" "That information is a bit private, but you can see for yourself. We have " @@ -204333,6 +204454,14 @@ msgstr "" "Об этом не стоит болтать, но у нас около 20 ящиков, полных хорошо хранящейся" " еды." +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." +msgstr "" +"Теперь даже и не знаю. Понимаешь, у нас было двадцать полных ящиков " +"продуктов. Это было несколько месяцев назад. Мы почти все съели." + #: lang/json/talk_topic_from_json.py msgid "Where did all this food come from?" msgstr "Откуда здесь вся эта еда?" @@ -204412,14 +204541,14 @@ msgstr "" msgid "That's good to hear." msgstr "Приятно слышать." -#: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" -msgstr "Вы здесь, чтобы защитить нас?" - #: lang/json/talk_topic_from_json.py msgid "Pleased to meet you." msgstr "Приятно познакомиться." +#: lang/json/talk_topic_from_json.py +msgid "Are you here to protect us?" +msgstr "Вы здесь, чтобы защитить нас?" + #: lang/json/talk_topic_from_json.py msgid "I'm just trying to get by." msgstr "Я просто пытаюсь выжить." @@ -204478,14 +204607,14 @@ msgstr "" msgid "That's the most hopeful thing I've heard so far." msgstr "Это самое обнадеживающее, что я слышал за последнее время." -#: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." -msgstr "Так же, как и ты, готов поспорить." - #: lang/json/talk_topic_from_json.py msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "CRISPR? Радиация? Может быть, кролики всему причиной." +#: lang/json/talk_topic_from_json.py +msgid "Same way you got yours, I bet." +msgstr "Так же, как и ты, готов поспорить." + #: lang/json/talk_topic_from_json.py msgid "So it goes." msgstr "Такие дела." @@ -204494,10 +204623,6 @@ msgstr "Такие дела." msgid "You're disgusting." msgstr "Вы отвратительны." -#: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." -msgstr "Не хочу грубить, но тебе стоит посмотреть в зеркало." - #: lang/json/talk_topic_from_json.py msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" @@ -204505,13 +204630,17 @@ msgstr "" "выживанию." #: lang/json/talk_topic_from_json.py -msgid "Hey, ." -msgstr "Эй, ." +msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgstr "Не хочу грубить, но тебе стоит посмотреть в зеркало." #: lang/json/talk_topic_from_json.py msgid "I can't believe my eyes. Please get me outta here…" msgstr "Глазам не верю. Пожалуйста, вытащи меня отсюда…" +#: lang/json/talk_topic_from_json.py +msgid "Hey, ." +msgstr "Эй, ." + #: lang/json/talk_topic_from_json.py msgid "I've come to take you home, lets go." msgstr "Я пришёл, чтобы отвести тебя домой, пошли." @@ -204537,18 +204666,18 @@ msgid "Sounds good, Barry." msgstr "Хорошо, Барри." #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." -msgstr "Я вижу этот значок. Похоже, тебе следует убраться вон с этой земли." +msgid "Hello Ma'am, what brings you here?" +msgstr "Привет, мэм, что вас сюда привело?" #: lang/json/talk_topic_from_json.py msgid "Hello Sir, what brings you here?" msgstr "Привет, сэр, что вас сюда привело?" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" -msgstr "Привет, мэм, что вас сюда привело?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." +msgstr "Я вижу этот значок. Похоже, тебе следует убраться вон с этой земли." #: lang/json/talk_topic_from_json.py msgid "Yeah, I'm a Marshal, what are you going to do about it?" @@ -204629,16 +204758,16 @@ msgstr "Твоя кузница работает?" msgid "Where can I find Chris?" msgstr "Где найти Криса?" +#: lang/json/talk_topic_from_json.py +msgid "Hi, what's up?" +msgstr "Привет, как дела?" + #: lang/json/talk_topic_from_json.py msgid "" "I see that badge. You need to leave our land, my relatives have no fondness" " for Marshals." msgstr "Я вижу твой значок. Прочь с нашей земли, мы тут маршалов не любим." -#: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" -msgstr "Привет, как дела?" - #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " @@ -204755,16 +204884,16 @@ msgstr "" "насчёт конца света." #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" -msgstr "У тебя значок маршала США?" +msgid "Hi, what brings you here?" +msgstr "Здорово, что тебя сюда привело?" #: lang/json/talk_topic_from_json.py msgid "Hello, what brings you here?" msgstr "Привет, что тебя сюда привело?" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" -msgstr "Здорово, что тебя сюда привело?" +msgid "Is that a U.S. Marshal's badge you're wearing?" +msgstr "У тебя значок маршала США?" #: lang/json/talk_topic_from_json.py msgid "Yes, I'm a marshal." @@ -205115,14 +205244,14 @@ msgstr "Пока что всё. Давай поговорим о чём-нибу msgid "That's all for now. I'd best get going." msgstr "Пока что всё. Мне пора." -#: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." -msgstr "Убирайся с нашей собственности, маршал." - #: lang/json/talk_topic_from_json.py msgid "Hello, We don't see many people these days." msgstr "Здравствуй, в последние дни народу не видать." +#: lang/json/talk_topic_from_json.py +msgid "Leave our property, Marshal." +msgstr "Убирайся с нашей собственности, маршал." + #: lang/json/talk_topic_from_json.py msgid "Hi, it looks like you are doing well here." msgstr "Привет, похоже, у вас тут всё хорошо." @@ -205351,8 +205480,12 @@ msgid "Tell me about your dad." msgstr "Расскажи про своего отца." #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "Маршал, я надеюсь, вы здесь, чтобы помочь нам." +msgid "" +"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 "" @@ -205363,12 +205496,8 @@ 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 " -"you'll get out while you can." -msgstr "" -"Сэр, я не знаю как, чёрт возьми, вы добрались сюда, но если в вас есть хоть " -"капля рассудка, уходите отсюда, пока можете." +msgid "Marshal, I hope you're here to assist us." +msgstr "Маршал, я надеюсь, вы здесь, чтобы помочь нам." #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -205448,16 +205577,16 @@ msgstr "" "Что бы они ни сделали это, должно быть, сработало, так как мы все ещё живы…" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm rather surprised to see you here." -msgstr "Маршал, я удивлён видеть Вас здесь." +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "Мэм, вам не разрешено здесь находиться… Вы должны уйти." #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "Сэр, вам не разрешено здесь находиться… Вы должны уйти." #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "Мэм, вам не разрешено здесь находиться… Вы должны уйти." +msgid "Marshal, I'm rather surprised to see you here." +msgstr "Маршал, я удивлён видеть Вас здесь." #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -205503,22 +205632,6 @@ msgstr "" "чтобы защитить федеральные секреты и поддержать целостность всей сети. Мы " "надеемся, что несколько сообщений с открытым текстом всё же можно поймать." -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "Здравствуйте, маршал." - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "Маршал, боюсь я сейчас не могу говорить." - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "Я здесь не за главного, маршал." - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "Я как и полагается, направляю все вопросы своему лидеру, маршал." - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "Привет, гражданин… Я не уверен, что тебе можно здесь находиться. " @@ -205531,6 +205644,15 @@ msgstr "Займись своими делами, здесь нечего лов msgid "If you need something you'll need to talk to someone else." msgstr "Если тебе что-то нужно, поговори с кем либо ещё." +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "Мэм." + +#: lang/json/talk_topic_from_json.py +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 "Sir." msgstr "Сэр." @@ -205542,13 +205664,20 @@ msgstr "" "вербовку." #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "Мэм." +msgid "Hello, marshal." +msgstr "Здравствуйте, маршал." #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" -msgstr "" -"Эй мисс, вы не думаете, что будет безопасней вам присоединиться ко мне?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "Маршал, боюсь я сейчас не могу говорить." + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "Я здесь не за главного, маршал." + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." +msgstr "Я как и полагается, направляю все вопросы своему лидеру, маршал." #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -205606,18 +205735,16 @@ msgid "I've no use for weaklings. Run. Now." msgstr "Мне слабаки ни к чему. Бегом. Живо." #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "" -"Итак, удалось ли уговорить остальных пойти в твоё безумное приключение?" +msgid "Please, help me. I need food." +msgstr "Пожалуйста, помоги мне. Мне нужна еда." #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" msgstr "" -"Мне неловко это говорить после всего, что ты сделал для меня, но… Нет ли у " -"тебя чего покушать?" +"Пожалуйста, помоги мне. Мне надо поесть. Разве ты не их шериф? Ты мне не " +"поможешь?" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -205625,15 +205752,17 @@ msgstr "Ещё раз спасибо. Я правда признателен з #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" msgstr "" -"Пожалуйста, помоги мне. Мне надо поесть. Разве ты не их шериф? Ты мне не " -"поможешь?" +"Мне неловко это говорить после всего, что ты сделал для меня, но… Нет ли у " +"тебя чего покушать?" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "Пожалуйста, помоги мне. Мне нужна еда." +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "" +"Итак, удалось ли уговорить остальных пойти в твоё безумное приключение?" #: lang/json/talk_topic_from_json.py msgid "" @@ -205652,20 +205781,20 @@ msgstr "Уйди от меня." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." msgstr "" "Они меня не пускают. Говорят, места нет, всё занято. Мне позволили пожить " -"тут, пока я прибираюсь и не развожу суету, но мне приходится выпрашивать " -"еду, чтоб выжить." +"тут, пока я прибираюсь и не развожу суету, но мне так хочется есть." #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." msgstr "" "Они меня не пускают. Говорят, места нет, всё занято. Мне позволили пожить " -"тут, пока я прибираюсь и не развожу суету, но мне так хочется есть." +"тут, пока я прибираюсь и не развожу суету, но мне приходится выпрашивать " +"еду, чтоб выжить." #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -205784,6 +205913,10 @@ msgstr "" "Спасибо за предложение, но я, наверно, попытаю счастья здесь и не буду снова" " рисковать. Я помню и не спешу встретиться с ним снова." +#: lang/json/talk_topic_from_json.py +msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgstr "Прости, мне слишком хочется есть, чтоб решаться на такую вещь." + #: lang/json/talk_topic_from_json.py msgid "" "That's quite the offer, but I don't think I'd survive the trip. I don't " @@ -205792,10 +205925,6 @@ msgstr "" "Неплохое предложение, но не думаю, что переживу поход. Похоже, ты не " "представляешь, насколько я бесполезна в этом мире." -#: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." -msgstr "Прости, мне слишком хочется есть, чтоб решаться на такую вещь." - #: lang/json/talk_topic_from_json.py msgid "I can keep you safe. I'll take you there myself." msgstr "Я обеспечу тебе защиту и лично туда отведу." @@ -205844,17 +205973,17 @@ 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?" -msgstr "Дружище, говорил ли я тебе про картон? Нет ли у тебя его с собой?" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "Как продвигаются дела? У меня уже впечатляющее количество картона." #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "Мы сделали это! Мы закончили список!" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "Как продвигаются дела? У меня уже впечатляющее количество картона." +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…" @@ -205884,10 +206013,6 @@ msgstr "Ты что, правда носишь костюм динозавра?" msgid "Do you need something to eat?" msgstr "Хочешь поесть?" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "О, отлично. Вкусняшки и хрустяшки. Круто, круто." - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " @@ -205895,6 +206020,10 @@ msgid "" msgstr "" "Ага, я сильно голоден, а они кладут наркоту в еду. Я вижу, ты не как они." +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "О, отлично. Вкусняшки и хрустяшки. Круто, круто." + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "А можно тебя ещё кое о чём спросить?" @@ -205999,14 +206128,6 @@ msgstr "" "Ты спрашиваешь меня, что я вижу, но я не скажу, что ты видишь. Иногда надо " "защититься." -#: lang/json/talk_topic_from_json.py -msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" -msgstr "" -"Что ж… У меня всё было пучком, но остальные ушли, и теперь хозяева не велят " -"мне строить себе убежище. Поможешь с ними справиться?" - #: lang/json/talk_topic_from_json.py msgid "" "That's it! I'm just gonna need a little time to get it all set up. Thanks." @@ -206016,6 +206137,14 @@ msgstr "" "Точно! Мне просто нужно немного времени, чтоб всё устроить. Спасибо. Ты " "очень мне помог. Я чувствую себя куда более собой с такой помощью." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" +msgstr "" +"Что ж… У меня всё было пучком, но остальные ушли, и теперь хозяева не велят " +"мне строить себе убежище. Поможешь с ними справиться?" + #: lang/json/talk_topic_from_json.py msgid "" "Why don't you leave this place? Come with me, I could use some help out " @@ -206035,18 +206164,21 @@ msgstr "" "налаживается!" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "Отъебись, гондон." +msgid "Don't bother with these assholes." +msgstr "Забей на тех мудаков." #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" -msgstr "" -"Йо. Кто-нибудь горит желанием отправиться с этой остановки до твоего " -"палаточного города?" +msgid "Hey there, not-asshole. Good to see you again." +msgstr "Эй, привет, не-мудила. Рада снова тебя видеть." #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." -msgstr "Привет. Рад снова тебя видеть." +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" +msgstr "" +"Слушай, прости за тот нервяк. Ты, может, и мудила, но ты ни при чём. У меня " +"адски падает сахар в крови, меня немного штормит. Мы друзья?" #: lang/json/talk_topic_from_json.py msgid "" @@ -206055,21 +206187,18 @@ msgid "" msgstr "Осторожно, мне снова хочется жрать, и я не отвечаю за свои действия." #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" -msgstr "" -"Слушай, прости за тот нервяк. Ты, может, и мудила, но ты ни при чём. У меня " -"адски падает сахар в крови, меня немного штормит. Мы друзья?" +msgid "Hey there. Good to see you again." +msgstr "Привет. Рад снова тебя видеть." #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." -msgstr "Эй, привет, не-мудила. Рада снова тебя видеть." +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgstr "" +"Йо. Кто-нибудь горит желанием отправиться с этой остановки до твоего " +"палаточного города?" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "Забей на тех мудаков." +msgid "Fuck off, dickwaddle." +msgstr "Отъебись, гондон." #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -206442,6 +206571,14 @@ msgid "" "that?" msgstr "Это опасно. Какая мне выгода с такого риска?" +#: lang/json/talk_topic_from_json.py +msgid "" +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." +msgstr "" +"Хрен знает, научный интерес? Если ничего не принесёшь, не парься. Как " +"видишь, у меня тут море удовольствий." + #: lang/json/talk_topic_from_json.py msgid "" "If you get me a sample, I'll join your crazy camp expedition. Hell, if you " @@ -206454,14 +206591,6 @@ msgstr "" " изучения этих штук. Сгодится почти что угодно, но если оно и правда такое " "опасное, как ты описываешь, то не неси споровые органы." -#: lang/json/talk_topic_from_json.py -msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." -msgstr "" -"Хрен знает, научный интерес? Если ничего не принесёшь, не парься. Как " -"видишь, у меня тут море удовольствий." - #: lang/json/talk_topic_from_json.py msgid "It just so happens I have a chunk of fungal matter on me right now." msgstr "Так уж вышло, что у меня прямо сейчас при себе грибной кусок." @@ -206511,14 +206640,14 @@ msgstr "" msgid "I'll see what I can do." msgstr "Посмотрю, что получится сделать." -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "Ещё раз спасибо за заморенного червячка, дружище." - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "Эй, что думаешь про то, что выживает сильнейший?" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "Ещё раз спасибо за заморенного червячка, дружище." + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "Почему ты спрашиваешь?" @@ -206535,14 +206664,6 @@ msgstr "Приятно снова тебя увидеть, как дела?" msgid "Nice to see you. I gotta be going though." msgstr "И мне тоже приятно тебя видеть. Но мне пора." -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "" -"О, ну ты знаешь, как обычно: сижу тут, пока не помру с голоду, режусь в " -"карты с Дэйвом, всё такое." - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " @@ -206551,6 +206672,14 @@ msgstr "" "Потому что я никак не сильнейший, поэтому я буду сидеть тут, пока не помру с" " голоду. Поможешь несчастному больному бедолаге?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "" +"О, ну ты знаешь, как обычно: сижу тут, пока не помру с голоду, режусь в " +"карты с Дэйвом, всё такое." + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "Я могу помочь… хочешь чего-нибудь поесть?" @@ -206571,15 +206700,15 @@ msgstr "Как ты вообще сюда добрался, если так бо msgid "Why are you camped out here if they won't let you in?" msgstr "Почему ты тут живёшь, если они тебя не пускают?" -#: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." -msgstr "Это ужасно мило с твоей стороны, ты правда чудесный человек." - #: lang/json/talk_topic_from_json.py msgid "" "Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "Ого, ух ты! Ты настоящее сокровище, знаешь? Спасибо за саму мысль." +#: lang/json/talk_topic_from_json.py +msgid "That's awful kind of you, you really are a wonderful person." +msgstr "Это ужасно мило с твоей стороны, ты правда чудесный человек." + #: lang/json/talk_topic_from_json.py msgid "" "It's good to know there are still people like you in the world, it really " @@ -206940,6 +207069,10 @@ msgstr "Точно. Пошли." msgid "What's your take on the situation here?" msgstr "Как ты тут оказалась?" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "О, эммм… Привет. Похоже, ты тут впервые. Я Алиша." + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "О, привет, это снова ты." @@ -206952,10 +207085,6 @@ msgstr "Ты вернулся и всё ещё живой! Ого-го." msgid "Aw hey, look who's back." msgstr "Эй, посмотрите, кто вернулся." -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "О, эммм… Привет. Похоже, ты тут впервые. Я Алиша." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "Приятно познакомиться, ребёнок. Как дела?" @@ -206973,16 +207102,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "Привет, Алиша. Я не могу остаться поговорить." #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "Я не ребёнок, ясно? Мне шестнадцать." +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "Я не ребёнок, ясно? Мне четырнадцать." #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "Я не ребёнок, ясно? Мне пятнадцать." #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "Я не ребёнок, ясно? Мне четырнадцать." +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "Я не ребёнок, ясно? Мне шестнадцать." #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -206992,6 +207121,18 @@ msgstr "Прости, не хотел тебя обидеть. Как дела?" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "Прости, не хотел тебя обидеть. Я пойду." +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" +"Я без понятия, что тут творится. Я вообще не уверена, зачем мы тут вообще. " +"Они говорят, нам надо подождать, пока нас не переведут в убежище внизу, но " +"мы тут торчим целые дни, и ни слова о том, сколько нам ещё ждать. Всё очень " +"тупо, и никто ничего мне сказать не может." + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -207005,18 +207146,6 @@ msgstr "" "месяца. Я не знаю, что мы тут делаем. Я перечитала все книги, что были. " "Снаружи полно зомби, так что мы застряли. Мы слышим их по ночам." -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" -"Я без понятия, что тут творится. Я вообще не уверена, зачем мы тут вообще. " -"Они говорят, нам надо подождать, пока нас не переведут в убежище внизу, но " -"мы тут торчим целые дни, и ни слова о том, сколько нам ещё ждать. Всё очень " -"тупо, и никто ничего мне сказать не может." - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -207065,8 +207194,9 @@ msgstr "" "третьем лице?" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" -msgstr "И снова здравствуй, красавчик" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgstr "Ого! Прекрасная леди, рад знакомству. Меня зовут Алонсо." #: lang/json/talk_topic_from_json.py msgid "" @@ -207077,9 +207207,8 @@ msgstr "" "Алонсо." #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." -msgstr "Ого! Прекрасная леди, рад знакомству. Меня зовут Алонсо." +msgid "Hello again, gorgeous" +msgstr "И снова здравствуй, красавчик" #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Alonso." @@ -207106,11 +207235,6 @@ msgstr "Я тоже рада знакомству. Здорово. В Центр msgid "Actually I'm just heading out." msgstr "Вообще-то, я просто прохожу мимо." -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." -msgstr "Ну, стало куда лучше, когда ты тут. Приятно видеть знакомое лицо." - #: lang/json/talk_topic_from_json.py msgid "" "Now that you are here, everything. Is there anything Alonso can… *do for " @@ -207119,31 +207243,36 @@ msgstr "" "Теперь ты здесь, и всё прекрасно. Может ли Алонсо… *Помочь тебе* в чём-то?" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" -msgstr "Ты знаешь меня, и мне лучше быть собой, ага?" +msgid "" +"Well, it's a lot better now that you're here. Nice to see a familiar face." +msgstr "Ну, стало куда лучше, когда ты тут. Приятно видеть знакомое лицо." #: lang/json/talk_topic_from_json.py msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "Алонсо ничего не может с собой поделать перед такой милашкой, как ты." +#: lang/json/talk_topic_from_json.py +msgid "You know me, I gotta be me, right?" +msgstr "Ты знаешь меня, и мне лучше быть собой, ага?" + #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" -"Ой, чувак, ну чего ты? Я просто пытаюсь придать загадочность, ясно? Никто не" -" хочет дружить с развратником из Бруклина, но загадочный Алонсо — совсем " +"Ой, блин, ну чего ты? Я просто пытаюсь придать загадочность, ясно? Никто не " +"хочет дружить с развратником из Бруклина, но загадочный Алонсо — совсем " "другое дело." #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" -"Ой, блин, ну чего ты? Я просто пытаюсь придать загадочность, ясно? Никто не " -"хочет дружить с развратником из Бруклина, но загадочный Алонсо — совсем " +"Ой, чувак, ну чего ты? Я просто пытаюсь придать загадочность, ясно? Никто не" +" хочет дружить с развратником из Бруклина, но загадочный Алонсо — совсем " "другое дело." #: lang/json/talk_topic_from_json.py @@ -207170,6 +207299,14 @@ msgstr "Ладно. Ради тебя я буду парнем из Брукли msgid "Thanks. I'd better get going." msgstr "Спасибо. Я пойду, пожалуй." +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" +"Алонсо не хочет беседовать о прошлом, только о будущем. Впереди тёмные дни, " +"но возможно, мы вместе принесём немного света?" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -207180,11 +207317,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" -"Алонсо не хочет беседовать о прошлом, только о будущем. Впереди тёмные дни, " -"но возможно, мы вместе принесём немного света?" +"В этом центре Алонсо слегка одиноко. Однако к нам приходят смелые сильные " +"путники вроде тебя, и их вид скрашивает Алонсо дни." #: lang/json/talk_topic_from_json.py msgid "" @@ -207195,12 +207332,8 @@ msgstr "" "всегда скрашивают мой день." #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." -msgstr "" -"В этом центре Алонсо слегка одиноко. Однако к нам приходят смелые сильные " -"путники вроде тебя, и их вид скрашивает Алонсо дни." +msgid "Ah, another new face. Hello. I am Boris." +msgstr "Эй, ещё одно новое лицо. Привет. Меня зовут Борис." #: lang/json/talk_topic_from_json.py msgid "Well, well. I'm glad you are back." @@ -207214,10 +207347,6 @@ msgstr "И снова здравствуй, дружище." msgid "It is good to see you again." msgstr "Приятно снова тебя видеть." -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "Эй, ещё одно новое лицо. Привет. Меня зовут Борис." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "Рад знакомству, Борис." @@ -207297,15 +207426,6 @@ msgstr "Прости. Что ты там говорил?" msgid "I'm sorry. I'd better get going." msgstr "Прости. Мне пора идти." -#: lang/json/talk_topic_from_json.py -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 "" -"Что ж, раз уж зашёл разговор, задняя комната расчищена, и я б мог там " -"устроиться и начать работать. Я подумаю над этим, возвращайся попозже." - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -207322,6 +207442,15 @@ msgstr "" "что толку не вышло. Караваны привозят еду, так что они важнее, тут спору " "нет." +#: lang/json/talk_topic_from_json.py +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 "" +"Что ж, раз уж зашёл разговор, задняя комната расчищена, и я б мог там " +"устроиться и начать работать. Я подумаю над этим, возвращайся попозже." + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -207355,6 +207484,10 @@ msgstr "Насчёт той хлебной закваски, за которой msgid "Got any more bread I can trade flour for?" msgstr "Есть ли ещё хлеб в обмен на муку?" +#: lang/json/talk_topic_from_json.py +msgid "Hi there. I'm Dana, nice to see a new face." +msgstr "Привет. Меня зовут Дана, рада увидеть кого-то новенького." + #: lang/json/talk_topic_from_json.py msgid "Hello, nice to see you again." msgstr "Привет, приятно снова тебя видеть." @@ -207363,10 +207496,6 @@ msgstr "Привет, приятно снова тебя видеть." msgid "It's good to see you're still around." msgstr "Рад видеть, что ты ещё жив." -#: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." -msgstr "Привет. Меня зовут Дана, рада увидеть кого-то новенького." - #: lang/json/talk_topic_from_json.py msgid "Dana, hey? Nice to meet you." msgstr "Дана? Приятно познакомиться." @@ -207423,11 +207552,14 @@ msgstr "Сочувствую твоей утрате." #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" -"Нет, с тех пор, как мы виделись — нет. Извини. Приходи через денёк или два, " -"и я придержу для тебя несколько буханок, но они быстро расходятся." +"Немножко. Я раздобыла хлебную закваску почти сразу, как приехала, и из нее " +"уже получается довольно приличный хлеб. Я вчера напекла немного, я могу " +"обменять буханку свежего хлеба на, скажем, около восьми чашек муки." #: lang/json/talk_topic_from_json.py msgid "" @@ -207439,14 +207571,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" -"Немножко. Я раздобыла хлебную закваску почти сразу, как приехала, и из нее " -"уже получается довольно приличный хлеб. Я вчера напекла немного, я могу " -"обменять буханку свежего хлеба на, скажем, около восьми чашек муки." +"Нет, с тех пор, как мы виделись — нет. Извини. Приходи через денёк или два, " +"и я придержу для тебя несколько буханок, но они быстро расходятся." #: lang/json/talk_topic_from_json.py msgid "That sounds like a great deal, here's some flour for you." @@ -207470,6 +207599,15 @@ msgstr "" " но в общем масштабе могло быть и хуже. У нас с Пабло всё ещё есть мы, это " "куда больше, чем у многих." +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" +"Здорово, держи буханку моего знаменитого в местных кругах, не совсем " +"дозревшего хлеба на закваске. Честно, не так уж плохо. Всем местным " +"нравится." + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -207496,15 +207634,6 @@ msgstr "" "Надеюсь, тебе понравится так же, как и мне. Это нынче самый охрененно " "вкусный хлеб в мире." -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" -"Здорово, держи буханку моего знаменитого в местных кругах, не совсем " -"дозревшего хлеба на закваске. Честно, не так уж плохо. Всем местным " -"нравится." - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -207545,10 +207674,6 @@ msgstr "" "троице повезло завести тут друзей, но мы всё равно остаёмся незнакомцами, " "сидящими в тесноте. Скоро кто-то кого-то убьёт, помяни моё слово." -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "Слышно ли что-нибудь насчёт работы на ранчо?" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -207559,6 +207684,10 @@ msgstr "" "потолок без перспектив на будущее и надеюсь, что кто-то внизу помрёт и " "освободит мне койку. Если там нужны работники, звучит заманчиво." +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "Слышно ли что-нибудь насчёт работы на ранчо?" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -207606,10 +207735,6 @@ msgstr "" "действительно снова забеременею, я всерьёз подумаю насчёт убраться отсюда и " "пойти с тобой." -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "Всегда рад тебя видеть, друг." - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " @@ -207618,6 +207743,10 @@ msgstr "" "Наконец-то! Рад видеть новое лицо у нас. Добро пожаловать в Центр, друг мой," " я Драко." +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "Всегда рад тебя видеть, друг." + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "Рад знакомству, Драко." @@ -207898,15 +208027,15 @@ msgstr "Могу я чем-то помочь?" msgid "Well then, I'll leave you here where it's safe." msgstr "Ну что ж, я оставлю тебя тут в безопасности." +#: lang/json/talk_topic_from_json.py +msgid "Man, just imagine what I could do with a new guitar." +msgstr "Блин, просто представь, если бы у меня была новая гитара." + #: lang/json/talk_topic_from_json.py msgid "" "My savior! My patron of the arts! You're always welcome here, friend." msgstr "Мой спаситель! Мой меценат! Дружище, тебе тут всегда будут рады." -#: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." -msgstr "Блин, просто представь, если бы у меня была новая гитара." - #: lang/json/talk_topic_from_json.py msgid "Let's talk about getting you that guitar." msgstr "Давай поговорим насчёт той гитары." @@ -208017,14 +208146,6 @@ msgstr "Могу помочь." msgid "Find somebody else, dude." msgstr "Ищи где-нибудь ещё, чувак." -#: lang/json/talk_topic_from_json.py -msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." -msgstr "" -"Без проблем, хорошо. Сейчас у меня всё в порядке. Спроси меня попозже, и я, " -"может, достану для тебя немного денег." - #: lang/json/talk_topic_from_json.py msgid "" "Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " @@ -208034,6 +208155,14 @@ msgstr "" "достать несколько мерчей за, допустим, пять косяков или равноценной хорошей " "травки." +#: lang/json/talk_topic_from_json.py +msgid "" +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." +msgstr "" +"Без проблем, хорошо. Сейчас у меня всё в порядке. Спроси меня попозже, и я, " +"может, достану для тебя немного денег." + #: lang/json/talk_topic_from_json.py msgid "You have yourself a deal. Here's the marijuana." msgstr "По рукам. Держи марихуану." @@ -208082,6 +208211,14 @@ msgstr "Как тебе удалось очутиться в центре?" msgid "Is there anything I can do to help you out?" msgstr "Нужна ли какая-нибудь помощь?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "" +"Эй, эй, новое лицо. Привет, я Фатима. Надеюсь, ты просто в гости? Здорово " +"встречать новых людей, но у нас больше нет свободных мест." + #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "Снова привет." @@ -208094,14 +208231,6 @@ msgstr "Приятно видеть, что ты ещё жив." msgid "Oh, hi." msgstr "Ой, привет." -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "" -"Эй, эй, новое лицо. Привет, я Фатима. Надеюсь, ты просто в гости? Здорово " -"встречать новых людей, но у нас больше нет свободных мест." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "Тоже приятно познакомиться, Фатима. Я тут мимоходом." @@ -208176,6 +208305,10 @@ msgstr "" " Дженни говорила про какой-то проект, где бы я могла помочь, но признаю, мне" " страшно выходить наружу." +#: lang/json/talk_topic_from_json.py +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgstr "Привет! Эй, привет! Я Гарри, Гарри Вильнёв." + #: lang/json/talk_topic_from_json.py msgid "Well, hello." msgstr "Ну, привет." @@ -208184,10 +208317,6 @@ msgstr "Ну, привет." msgid "Good to see you again." msgstr "Рад снова тебя видеть." -#: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." -msgstr "Привет! Эй, привет! Я Гарри, Гарри Вильнёв." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Garry." msgstr "Рад знакомству, Гарри." @@ -208262,14 +208391,6 @@ msgstr "" " что тут временно, но начинает казаться, что мы задержимся надолго. Если " "доживём." -#: lang/json/talk_topic_from_json.py -msgid "Hi." -msgstr "Привет." - -#: lang/json/talk_topic_from_json.py -msgid "Hey again." -msgstr "И снова привет!" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, hello. I don't think I've seen you around before. I'm Guneet, people " @@ -208278,6 +208399,14 @@ msgstr "" "Ой, привет! Я не видел тебя тут раньше. Я Гунит, но местные зовут меня " "Гунни." +#: lang/json/talk_topic_from_json.py +msgid "Hi." +msgstr "Привет." + +#: lang/json/talk_topic_from_json.py +msgid "Hey again." +msgstr "И снова привет!" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "Рад встрече с тобой, Гунни." @@ -208333,15 +208462,15 @@ msgstr "" "носим тюрбаны и выжили все вместе. Они думают, раз мы вместе, то ничего не " "потеряли. Мой отец тоже так считает, а мама в сомнениях." -#: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." -msgstr "Рад снова тебя видеть." - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "Привет. Я раньше тебя тут не видела. Я Дженни, Дженни Форсетт." +#: lang/json/talk_topic_from_json.py +msgid "Nice to see you again." +msgstr "Рад снова тебя видеть." + #: lang/json/talk_topic_from_json.py msgid "Nice meeting you. What are you doing on that computer?" msgstr "Приятно познакомиться. Что ты там делаешь с компьютером?" @@ -208540,6 +208669,19 @@ msgstr "" "выбирали быть вместе. Я не знаю, как долго мы так протянем, пока кто-нибудь " "не сорвётся." +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" +"Что ж, у нас тут горстка народу. Мы потихоньку образуем небольшую общину. Я " +"неплохо работаю вместе с Фатимой и здорово тусуюсь с Даной, Драко и Алишей. " +"Я маловато знаю Бориченко, Сингхов, Ванессу, Йен и Ризею, но мы болтали пару" +" раз. Что ты хочешь знать? " + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -208559,19 +208701,6 @@ msgstr "" "Ризея всегда спорят, кто будет что-то решать, как будто их спрашивали. Что " "ты хочешь знать?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" -"Что ж, у нас тут горстка народу. Мы потихоньку образуем небольшую общину. Я " -"неплохо работаю вместе с Фатимой и здорово тусуюсь с Даной, Драко и Алишей. " -"Я маловато знаю Бориченко, Сингхов, Ванессу, Йен и Ризею, но мы болтали пару" -" раз. Что ты хочешь знать? " - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "Можешь рассказать про Свободных Торговцев?" @@ -208660,6 +208789,18 @@ msgstr "" "куча безумных идей. Возможно, мне она нравится, потому что у неё больше всех" " осталось надежды на светлое будущее." +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" +"По-моему, Борис и Гарри женаты. Они типа сами по себе, и мне кажется, они " +"слегка заносчивые. Стэн, похоже, брат Бориса, но я не уверена. Он вроде " +"довольно милый, но немногословный. Но пока я в них толком не разобралась. Я " +"знаю, когда не стоит совать нос куда не нужно." + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -208677,15 +208818,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" -"По-моему, Борис и Гарри женаты. Они типа сами по себе, и мне кажется, они " -"слегка заносчивые. Стэн, похоже, брат Бориса, но я не уверена. Он вроде " -"довольно милый, но немногословный. Но пока я в них толком не разобралась. Я " -"знаю, когда не стоит совать нос куда не нужно." +"Я правда не хочу к ним лезть. Они никогда особо ни с кем не разговаривают, " +"кроме своей маленькой семейки. Просто сидят в своём углу и говорят на " +"панджабском. Они довольно милые и помогают, чем могут, просто никак не " +"общаются с остальными." #: lang/json/talk_topic_from_json.py msgid "" @@ -208703,15 +208844,22 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" -"Я правда не хочу к ним лезть. Они никогда особо ни с кем не разговаривают, " -"кроме своей маленькой семейки. Просто сидят в своём углу и говорят на " -"панджабском. Они довольно милые и помогают, чем могут, просто никак не " -"общаются с остальными." +"Ванесса… Что ж, наверное, она милая. То есть она меня бесит, но нам " +"приходится быть вместе, так что я стараюсь быть помягче. Йен и Ризея спорят," +" кто тут будет главным, но я просто с головой ухожу в сборку чего-нибудь и " +"держусь подальше от этой политики. Толку от неё никакого. Алонсо нормальный," +" он точно положил глаз на меня, а ещё на каждую женщину. Не в моём вкусе, " +"группа слишком маленькая. Джон — ходячий стереотип, полагаю, в его душе что-" +"то есть, но я туда пока не добралась." #: lang/json/talk_topic_from_json.py msgid "" @@ -208735,32 +208883,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." -msgstr "" -"Ванесса… Что ж, наверное, она милая. То есть она меня бесит, но нам " -"приходится быть вместе, так что я стараюсь быть помягче. Йен и Ризея спорят," -" кто тут будет главным, но я просто с головой ухожу в сборку чего-нибудь и " -"держусь подальше от этой политики. Толку от неё никакого. Алонсо нормальный," -" он точно положил глаз на меня, а ещё на каждую женщину. Не в моём вкусе, " -"группа слишком маленькая. Джон — ходячий стереотип, полагаю, в его душе что-" -"то есть, но я туда пока не добралась." +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." +msgstr "Здоров, приятель. Меня звать Клеменс. Джон Клеменс. Я скотовод." #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "Здоров, приятель." -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "Здоров, приятель. Меня звать Клеменс. Джон Клеменс. Я скотовод." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "Рад знакомству, Джон." @@ -208820,14 +208949,14 @@ msgstr "" "в хлеву… нам нужны пастбища, штоб гулять на свободе, если ты п'нимаешь, к " "чему я. П'ка пастбищ нет, тут буит довольно напряжно." -#: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." -msgstr "Здравствуйте, сэр. Я Мандип Сингх." - #: lang/json/talk_topic_from_json.py msgid "Hello ma'am. I am Mandeep Singh." msgstr "Здравствуйте, мадам. Я Мандип Сингх." +#: lang/json/talk_topic_from_json.py +msgid "Hello sir. I am Mandeep Singh." +msgstr "Здравствуйте, сэр. Я Мандип Сингх." + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Mandeep." msgstr "Приятно познакомиться, Мандип." @@ -208873,6 +209002,10 @@ msgstr "" " семья прошли через апокалипсис почти невредимыми. Из-за этого и ещё " "нескольких вещей нам тяжело завести тут друзей." +#: lang/json/talk_topic_from_json.py +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgstr "А, да ты тут новенький! Извини, меня зовут Мангальприт." + #: lang/json/talk_topic_from_json.py msgid "Hi there." msgstr "Приветик." @@ -208881,10 +209014,6 @@ msgstr "Приветик." msgid "Oh, hello there." msgstr "О, привет." -#: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." -msgstr "А, да ты тут новенький! Извини, меня зовут Мангальприт." - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Mangalpreet." msgstr "Приятно познакомиться, Мангальприт." @@ -209131,16 +209260,16 @@ msgstr "" msgid "What brings you around here? We don't see a lot of new faces." msgstr "Что тебя сюда привело? У нас тут немного новых лиц." -#: lang/json/talk_topic_from_json.py -msgid "Need to talk?" -msgstr "Надо поговорить?" - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" "Приветик. Непохоже, чтоб мы встречались. Я Ризея, меня обычно зовут Ри." +#: lang/json/talk_topic_from_json.py +msgid "Need to talk?" +msgstr "Надо поговорить?" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Rhy." msgstr "Приятно встретиться, Ри." @@ -209255,6 +209384,12 @@ msgstr "" msgid "Do you want to talk about your story?" msgstr "Не хочешь ли рассказать свою историю?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." +msgstr "Привет. Извини, если мы уже виделись, я правда не помню. Я… Я Стэн." + #: lang/json/talk_topic_from_json.py msgid "Hm? Oh, hi." msgstr "Ммм? А, привет." @@ -209263,12 +209398,6 @@ msgstr "Ммм? А, привет." msgid "...Hi." msgstr "…Привет." -#: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." -msgstr "Привет. Извини, если мы уже виделись, я правда не помню. Я… Я Стэн." - #: lang/json/talk_topic_from_json.py msgid "Stan, hey? Nice to meet you." msgstr "О, Стэн? Приятно познакомиться." @@ -209397,10 +209526,6 @@ msgstr "Хммм, можно поменять причёску, пожалуйс msgid "Hmm, can we change this shave a little please?" msgstr "Хммм, можно по-другому побрить, пожалуйста?" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "О, ты вернулся." - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " @@ -209409,6 +209534,10 @@ msgstr "" "Ну зашибись. Теперь ещё одного кормить? Прям то, чего нам не хватало. Что ж," " я Ванесса." +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "О, ты вернулся." + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "Меня вам кормить не придётся, но приятно познакомиться." @@ -209452,17 +209581,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "Подстрижёшь меня?" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" -"Угу, я застряла в сраном кирпичном доме с двумя дюжинами левых людей, миру " -"конец, а еды недостаточно. Я хотя бы могу чем-то заняться, а лишние деньги " -"помогают набить брюхо. Народу нравится хорошая стрижка." - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -209474,6 +209592,17 @@ msgstr "" "доме с двумя дюжинами левых людей, миру конец, а еды недостаточно. Чего тут," " блядь, непонятного?" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" +"Угу, я застряла в сраном кирпичном доме с двумя дюжинами левых людей, миру " +"конец, а еды недостаточно. Я хотя бы могу чем-то заняться, а лишние деньги " +"помогают набить брюхо. Народу нравится хорошая стрижка." + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -209693,14 +209822,6 @@ msgstr "" "головой, которым места не нашлось. Мы выделили им небольшой уголок, но это " "неидеально." -#: lang/json/talk_topic_from_json.py -msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." -msgstr "" -"Знаю. Без понятия, как тебе удалось убедить их убраться, но и мои " -"поставщики, и я благодарим тебя. Надеюсь, вышло не очень неприглядно." - #: lang/json/talk_topic_from_json.py msgid "" "Even once we got things sorted out, there weren't enough beds for everyone, " @@ -209711,6 +209832,14 @@ msgstr "" "точно не хватало еды. Времена были непростые. Мы делаем что можем для тех " "ребят… у них хотя бы есть укрытие." +#: lang/json/talk_topic_from_json.py +msgid "" +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." +msgstr "" +"Знаю. Без понятия, как тебе удалось убедить их убраться, но и мои " +"поставщики, и я благодарим тебя. Надеюсь, вышло не очень неприглядно." + #: lang/json/talk_topic_from_json.py msgid "" "Well, there's the downstairs section, we can't fit more people down there so" @@ -210118,14 +210247,14 @@ msgstr "Ведите себя прилично, или вам не поздор 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." -msgstr "Мадам, вам действительно не стоит тут гулять." - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "Ну что, все прикинул?" +#: lang/json/talk_topic_from_json.py +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 "Я слышал, это место было центром для беженцев…" @@ -210154,14 +210283,14 @@ msgstr "Я подумал, что вам может понадобиться п msgid "Well, I'd better be going. Bye." msgstr "Мне лучше идти. Пока." -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "Добро пожаловать, маршал…" - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "Добро пожаловать…" +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "Добро пожаловать, маршал…" + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -210467,14 +210596,14 @@ msgstr "" " людей — ну, к солнышку, свежему воздуху, тяжёлой работе… но как можешь " "догадаться, людей немного пугает перспектива встречи с ордой зомби." -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "Маршал…" - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "Гражданин…" +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "Маршал…" + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "Могу я поторговать за припасы?" @@ -210543,14 +210672,14 @@ msgstr "" "Мы не можем. На продажу ничего лишнего нет, и мне нечем расплатиться за " "покупки у тебя. Я не думаю, что ты собрался пожертвовать?" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "Точно, у вас тут блестящий жетон!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "Ха, у вас такой важный вид." +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "Точно, у вас тут блестящий жетон!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "Вообще-то я новичок." @@ -210628,6 +210757,10 @@ msgstr "" "хочет меня здесь видеть, когда я не занимаюсь торговлей, но… Многих людей " "это устраивает." +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "Шшш. Некоторые люди здесь ненавидят… Мутации. Был тут один инцидент." + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " @@ -210636,10 +210769,6 @@ msgstr "" "Держу пари, ты так же добился своего. Молчи об этом, некоторые здесь смотрят" " свысока на таких, как мы." -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "Шшш. Некоторые люди здесь ненавидят… Мутации. Был тут один инцидент." - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "Извините за вопрос" @@ -210664,22 +210793,22 @@ msgstr "Я куплю." msgid "Who needs rebar?" msgstr "Кому это нужна арматура?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "Да что с тобой говорить. Пошёл ты." - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "Иди нахрен!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "Кажется я учуял свинью. Шучу… Пожалуйста, не арестовывайте меня." +msgid "As if you're one to talk. Screw You." +msgstr "Да что с тобой говорить. Пошёл ты." #: lang/json/talk_topic_from_json.py msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "Эй, кажется вы здесь недавно. Могу я вам помочь?" +#: lang/json/talk_topic_from_json.py +msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "Кажется я учуял свинью. Шучу… Пожалуйста, не арестовывайте меня." + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "Ты… чуешь меня?" @@ -211009,6 +211138,18 @@ msgstr "Думаю, вы здесь главный." msgid "Glad to have you aboard." msgstr "Добро пожаловать на борт." +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "" +"Погоди. Мне всё равно, как ты сюда пробрался, но дальше ты не пройдёшь. " +"Убирайся." + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "Мы не передумали. Убирайся." + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "Итак, что-нибудь нужно?" @@ -211089,18 +211230,6 @@ msgstr "Повтори-ка?" msgid "If/you speak to/understand… you/me. Yes?" msgstr "…сли… Ты гов…ишь с… Ты… Я… Да?" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "Мы не передумали. Убирайся." - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "" -"Погоди. Мне всё равно, как ты сюда пробрался, но дальше ты не пройдёшь. " -"Убирайся." - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "Стоп! Что?!" @@ -211397,6 +211526,14 @@ msgstr "На самом деле у меня нет на это времени, msgid "Keep it civil, merc." msgstr "Веди себя вежливо, наёмник." +#: lang/json/talk_topic_from_json.py +msgid "Here to trade, I hope?" +msgstr "Надеюсь, ты тут для торговли?" + +#: lang/json/talk_topic_from_json.py +msgid "Safe travels, scavenger." +msgstr "Безопасного пути, странник." + #: lang/json/talk_topic_from_json.py msgid "" "Still plenty of outlaws in the roads, perhaps you should tend to your job, " @@ -211412,21 +211549,6 @@ msgstr "Что-нибудь нужно, маршал?" msgid "Oh, a U.S. marshal, how quaint." msgstr "О, маршал США, как необычно." -#: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" -msgstr "Надеюсь, ты тут для торговли?" - -#: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." -msgstr "Безопасного пути, странник." - -#: lang/json/talk_topic_from_json.py -msgid "" -"I keep to my own business, and you keep to yours, marshal. Seems like a " -"fair deal?" -msgstr "" -"Я занимаюсь своими делами, а ты своими, маршал. Звучит справедливо, так?" - #: lang/json/talk_topic_from_json.py msgid "" "We have been supplying this lab here with food from a few hunting and " @@ -211437,6 +211559,13 @@ msgstr "" "фермерских общин. Дороги небезопасные, но это прибыльно и куда выгоднее, чем" " шарить по городам за объедки." +#: lang/json/talk_topic_from_json.py +msgid "" +"I keep to my own business, and you keep to yours, marshal. Seems like a " +"fair deal?" +msgstr "" +"Я занимаюсь своими делами, а ты своими, маршал. Звучит справедливо, так?" + #: lang/json/talk_topic_from_json.py msgid "Keep safe, then." msgstr "Тогда береги себя." @@ -211682,16 +211811,16 @@ msgid "I'll talk with them then…" msgstr "Я поговорю с ними, тогда…" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "Могу я помочь вам, маршал?" +msgid "Morning ma'am, how can I help you?" +msgstr "Доброе утро, мэм, чем я могу вам помочь?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "Доброе утро, сэр, чем я могу вам помочь?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "Доброе утро, мэм, чем я могу вам помочь?" +msgid "Can I help you, marshal?" +msgstr "Могу я помочь вам, маршал?" #: lang/json/talk_topic_from_json.py msgid "" @@ -211824,14 +211953,14 @@ msgstr "Есть какая-нибудь работа для меня?" msgid "Not now." msgstr "Не сейчас." -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "Возвращайтесь позже, мне нужно позаботиться о паре вещей сначала. " - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "Я могу осмотреть вас или ваших компаньонов, если вы получили травму." +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "Возвращайтесь позже, мне нужно позаботиться о паре вещей сначала. " + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$200, 30 минут] Подлатайте меня." @@ -212107,8 +212236,8 @@ msgid "Ok." msgstr "Ладно." #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" -msgstr "Что за крипто-коины?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." +msgstr "Криптомонеты? Что за бред, интернет то больше не работает нигде." #: lang/json/talk_topic_from_json.py msgid "" @@ -212136,13 +212265,15 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" -"Здесь в ходу крипто-коины. Еще до катаклизма была попытка абстрагироваться " -"от обычных денег и создать электронные. Потом мы решили, что и дальше будем" -" их использовать. Бартер тоже полезен только до определенного предела." +"Здесь в ходу так называемые крипто-коины. Еще до катаклизма была попытка " +"абстрагироваться от обычных денег и создать электронные. Теперь мы просто " +"шутим, называя ихтак. Бартер тоже полезен только до определенного предела. " +"А однажды мы восстановим Сеть." #: lang/json/talk_topic_from_json.py msgid "Heya, scav." @@ -212247,14 +212378,14 @@ msgstr "Да снизойдет благословение. Да очистиш msgid "I must purge this place before I can move on." msgstr "Я должен очистить это место перед тем, как смогу продолжить." -#: lang/json/talk_topic_from_json.py -msgid "Oh, you again." -msgstr "А, опять ты." - #: lang/json/talk_topic_from_json.py msgid "Huh? *mumble mumble* … Who are you?" msgstr "А? *невнятно бормочет* …Ты еще кто?" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you again." +msgstr "А, опять ты." + #: lang/json/talk_topic_from_json.py msgid "I'm busy, what is it?" msgstr "Я занят, в чем дело?" @@ -212263,14 +212394,14 @@ msgstr "Я занят, в чем дело?" msgid "And leave my tower and all my research? I think not." msgstr "И оставить мою башню и мои исследования? Я так не думаю." -#: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." -msgstr "Ах, снова привет." - #: lang/json/talk_topic_from_json.py msgid "Do you seek power as well?" msgstr "Ты тоже ищешь силу?" +#: lang/json/talk_topic_from_json.py +msgid "Ah, hello again." +msgstr "Ах, снова привет." + #: lang/json/talk_topic_from_json.py msgid "Yes, yes… *electrical crackling* Isn't it beautiful?" msgstr "Да, да… *помехи*. Разве не красиво?" @@ -221282,12 +221413,6 @@ msgstr "проникновение маны" msgid "mana weaving" msgstr "плетение маны" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "отсутствует" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -228367,16 +228492,18 @@ msgstr "[<] страница %1$d из %2$d [>]" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s] сорт.: %s >" +msgid "< [%s] Sort: %s >" +msgstr "< [%s] Сорт.: %s >" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F] Фильтр" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "[%s] Фильтр" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R] Сброс" +#, c-format +msgid "[%s] Reset" +msgstr "[%s] Сброс" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -228412,8 +228539,9 @@ msgid "Unsorted (recently added first)" msgstr "нет (недавно добавленные первыми)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] помощь >" +#, c-format +msgid "< [%s] Show help >" +msgstr "< [%s] Помощь >" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -231510,6 +231638,15 @@ msgstr "" msgid " BIONICS " msgstr "БИОНИКА" +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" +"[%s] Переназначить, [%s] Переключить вкладки, [%s] Переключить экономию " +"топлива, [%s] Переключить автозапуск" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -231519,28 +231656,14 @@ msgstr "" "Выберите бионику для переназначения или нажмите ПРОБЕЛ для отмены." #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." -msgstr "" -"Активация ! изучить, " -"= переназначить, TAB поменять " -"вкладки, s переключить режим экономии топлива, " -"A переключить автозапуск." +#, c-format +msgid "Activating [%s] Examine, %s" +msgstr "Активация [%s] Изучение, %s" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." -msgstr "" -"Изучить ! активировать, " -"= переназначить, TAB поменять " -"вкладки, s переключить режим экономии топлива, " -"A переключить автозапуск." +#, c-format +msgid "Examining [%s] Activate, %s" +msgstr "Изучение [%s] Активация, %s" #: src/bionics_ui.cpp #, c-format @@ -231639,10 +231762,10 @@ msgstr "Вы не можете переключить автозапуск на #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" "Вы не можете активировать %s!\n" -"Для получения информации о %s — нажмите «!», затем «%c»" +"Для получения информации о %s, нажмите «%s», затем «%c»." #: src/bonuses.cpp msgid "Accuracy" @@ -244345,8 +244468,8 @@ msgid "You can't crack a safe while deaf!" msgstr "Вы не можете взломать сейф из-за глухоты!" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" -msgstr "Вы не можете взломать сейф с затычками в ушах!" +msgid "You can't crack a safe while listening to music!" +msgstr "Вы не можете взломать сейф, слушая музыку!" #: src/iexamine.cpp msgid "Attempt to crack the safe?" @@ -246657,13 +246780,8 @@ msgstr "Без вариантов." #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]Фильтр" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]Фильтр: " +msgid "[%s] Filter: " +msgstr "[%s] Фильтр: " #: src/inventory_ui.cpp msgid "Next column" @@ -265955,6 +266073,18 @@ msgstr "" "Используйте эту опцию, если выбранный шрифт не содержит в себе необходимых " "символов." +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "Включить ASCII арт в описании предметов" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" +"При включении, в описании предмета появится изображение предмета в виде " +"ASCII арта." + #: src/options.cpp msgid "Use tiles" msgstr "Использовать тайлы" @@ -267908,10 +268038,6 @@ msgstr "Усталость:" msgid "Heat :" msgstr "Тепло :" -#: src/panels.cpp -msgid "Sound :" -msgstr "Шум :" - #: src/panels.cpp msgid "Deaf!" msgstr "Глухота!" @@ -272869,8 +272995,9 @@ msgid "Remove attached curtains first." msgstr "Сначала демонтируйте присоединённые занавески." #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "Сначала демонтируйте присоединённую часть." +#, c-format +msgid "Remove the attached %s first." +msgstr "Сначала демонтируйте %s." #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/zh_CN.po b/lang/po/zh_CN.po index 56f75f1e896c1..d0c62837ea998 100644 --- a/lang/po/zh_CN.po +++ b/lang/po/zh_CN.po @@ -52,17 +52,17 @@ # Amans Tofu , 2020 # 曾泰瑋 , 2020 # AT, 2020 -# cainiao , 2020 # L rient <1972308206@qq.com>, 2020 # VoidForge , 2020 +# cainiao , 2020 # msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" -"Last-Translator: VoidForge , 2020\n" +"Last-Translator: cainiao , 2020\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" @@ -752,7 +752,7 @@ msgid "oxygen" msgid_plural "oxygen" msgstr[0] "氧气" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "" @@ -841,7 +841,7 @@ msgid "nitrox" msgid_plural "nitrox" msgstr[0] "氮氧混合气" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "" @@ -853,7 +853,7 @@ msgid "tinder" msgid_plural "tinder" msgstr[0] "火绒" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "一堆易燃材料,经过粉碎研磨撕裂等各种过程后,更加易于燃烧." @@ -875,7 +875,7 @@ msgid "metal RPG die" msgid_plural "metal RPG dice" msgstr[0] "金属RPG骰子" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "" @@ -911,7 +911,7 @@ msgid "sulfur" msgid_plural "sulfur" msgstr[0] "硫磺" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -954,7 +954,7 @@ msgid "limestone" msgid_plural "limestone" msgstr[0] "石灰岩" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -967,7 +967,7 @@ msgid "quicklime" msgid_plural "quicklime" msgstr[0] "生石灰" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -984,7 +984,7 @@ msgid "sand" msgid_plural "sand" msgstr[0] "黄沙" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -998,7 +998,7 @@ msgid "soil" msgid_plural "soil" msgstr[0] "泥土" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -1024,7 +1024,7 @@ msgid "zinc powder" msgid_plural "zinc powder" msgstr[0] "锌粉" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -1037,7 +1037,7 @@ msgid "zinc oxide" msgid_plural "zinc oxide" msgstr[0] "氧化锌" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -1049,7 +1049,8 @@ msgid "manganese dioxide" msgid_plural "manganese dioxide" msgstr[0] "二氧化锰" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -1062,7 +1063,8 @@ msgid "potassium chloride" msgid_plural "potassium chloride" msgstr[0] "氯化钾" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -1077,7 +1079,8 @@ msgid "potassium hydroxide" msgid_plural "potassium hydroxide" msgstr[0] "氢氧化钾" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -1090,7 +1093,7 @@ msgid "sulfuric acid" msgid_plural "sulfuric acid" msgstr[0] "硫酸" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1133,7 +1136,7 @@ msgid "nitric acid" msgid_plural "nitric acid" msgstr[0] "硝酸" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1230,7 +1233,7 @@ msgid "saltpeter" msgid_plural "saltpeter" msgstr[0] "硝石" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1243,7 +1246,7 @@ msgid "niter" msgid_plural "niter" msgstr[0] "硝石矿" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1303,7 +1306,7 @@ msgid "thermite" msgid_plural "thermite" msgstr[0] "铝热剂" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1347,7 +1350,8 @@ msgid "match head powder" msgid_plural "match head powder" msgstr[0] "火柴火药" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1416,7 +1420,7 @@ msgid "soap flakes" msgid_plural "soap flakes" msgstr[0] "肥皂片" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "一块切成适当薄片的肥皂,适合在洗衣机里使用." @@ -1438,7 +1442,7 @@ msgid "wood ash" msgid_plural "wood ashes" msgstr[0] "木灰" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1548,7 +1552,7 @@ msgid "lamp oil" msgid_plural "lamp oil" msgstr[0] "灯油" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "一份轻型无烟灯油,在油灯中使用." @@ -1558,7 +1562,7 @@ msgid "motor oil" msgid_plural "motor oil" msgstr[0] "机油" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "机油,被称为机器中的血液.具有防锈,缓冲,密封,清洁等重要特性." @@ -1568,7 +1572,7 @@ msgid "napalm" msgid_plural "napalm" msgstr[0] "凝固汽油" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -4627,7 +4631,7 @@ msgid "red paint" msgid_plural "red paint" msgstr[0] "红油漆" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "一罐红色的油漆。" @@ -4647,7 +4651,7 @@ msgid "white paint" msgid_plural "white paint" msgstr[0] "白油漆" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "一罐白色的油漆。" @@ -4667,7 +4671,7 @@ msgid "purple paint" msgid_plural "purple paint" msgstr[0] "紫油漆" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "一罐紫色的油漆。" @@ -4677,7 +4681,7 @@ msgid "yellow paint" msgid_plural "yellow paint" msgstr[0] "黄油漆" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "一罐黄色的油漆。" @@ -4745,7 +4749,7 @@ msgid_plural "gold" msgstr[0] "金块" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -4762,7 +4766,7 @@ msgid "zinc" msgid_plural "zinc" msgstr[0] "锌" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -4776,7 +4780,7 @@ msgid "lead" msgid_plural "lead" msgstr[0] "铅块" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -4788,7 +4792,7 @@ msgid "magnesium powder" msgid_plural "magnesium powder" msgstr[0] "镁粉" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -4800,7 +4804,7 @@ msgid "silver" msgid_plural "silver" msgstr[0] "银块" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -4977,7 +4981,7 @@ msgid "leather scraps" msgid_plural "leather scraps" msgstr[0] "皮革碎片" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -4989,7 +4993,7 @@ msgid "lycra scraps" msgid_plural "lycra scraps" msgstr[0] "莱卡碎片" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -5001,7 +5005,7 @@ msgid "neoprene scraps" msgid_plural "neoprene scraps" msgstr[0] "氯丁橡胶碎片" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -5013,7 +5017,8 @@ msgid "synthetic fabric scraps" msgid_plural "synthetic fabric scraps" msgstr[0] "化纤碎片" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -5048,7 +5053,8 @@ msgid "patchwork cotton clothing parts" msgid_plural "patchwork cotton clothing parts" msgstr[0] "棉布拼布" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -5070,7 +5076,8 @@ msgid "patchwork faux fur clothing parts" msgid_plural "patchwork faux fur clothing parts" msgstr[0] "人造毛皮拼布" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -5092,7 +5099,8 @@ msgid "patchwork felt clothing parts" msgid_plural "patchwork felt clothing parts" msgstr[0] "毛毡拼布" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -5127,7 +5135,8 @@ msgid "patchwork lycra clothing parts" msgid_plural "patchwork lycra clothing parts" msgstr[0] "莱卡拼布" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -5152,7 +5161,8 @@ msgid "patchwork neoprene clothing parts" msgid_plural "patchwork neoprene clothing parts" msgstr[0] "氯丁橡胶拼布" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -5177,7 +5187,8 @@ msgid "patchwork Nomex clothing parts" msgid_plural "patchwork Nomex clothing parts" msgstr[0] "芳纶拼布" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -5199,7 +5210,8 @@ msgid "patchwork synthetic fabric clothing parts" msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "化纤拼布" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -6967,12 +6979,14 @@ msgid_plural "ammo satchels" msgstr[0] "弹匣包（腰）" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -6987,7 +7001,8 @@ msgstr[0] "弹匣包（腰）" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -6996,11 +7011,14 @@ msgid "You stash your %s." msgstr "你收好了%s。" #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -7032,7 +7050,8 @@ msgid "chest ammo pouch" msgid_plural "chest ammo pouches" msgstr[0] "弹匣包（胸）" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -7044,7 +7063,7 @@ msgid "chest rig" msgid_plural "chest rig" msgstr[0] "携行具" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -7059,12 +7078,13 @@ msgid "javelin bag" msgid_plural "javelin bags" msgstr[0] "标枪包" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "存储标枪" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -7088,7 +7108,7 @@ msgid "leg ammo pouch" msgid_plural "leg ammo pouches" msgstr[0] "弹匣包（腿）" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -7260,7 +7280,8 @@ msgid "pair of 2-by-arm guards" msgid_plural "pairs of 2-by-arm guards" msgstr[0] "木料护臂" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -7535,7 +7556,7 @@ msgid "grenade pouch" msgid_plural "grenade pouches" msgstr[0] "榴弹袋" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -7559,12 +7580,14 @@ msgid "large grenade pouch" msgid_plural "large grenade pouches" msgstr[0] "大型榴弹袋" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "存放手雷" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "一个能存放四颗各式手雷的大型榴弹袋。" @@ -7956,6 +7979,8 @@ msgid "pair of armored boots" msgid_plural "pairs of armored boots" msgstr[0] "护甲靴" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -8047,6 +8072,8 @@ msgid "pair of XL survivor boots" msgid_plural "pairs of XL survivor boots" msgstr[0] "幸存者长靴（XL）" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -8451,7 +8478,8 @@ msgid "pair of ankle socks" msgid_plural "pairs of ankle socks" msgstr[0] "护踝袜" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -9657,7 +9685,8 @@ msgid "pair of armored fingerless gloves" msgid_plural "pairs of armored fingerless gloves" msgstr[0] "无指皮护手" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -9933,7 +9962,8 @@ msgid "pair of XL survivor gloves" msgid_plural "pairs of XL survivor gloves" msgstr[0] "幸存者手套（XL）" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -10263,7 +10293,7 @@ msgid "kippah" msgid_plural "kippahs" msgstr[0] "基帕" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "一件犹太教教徒的传统服饰的轻薄圆形无边便帽。" @@ -10273,7 +10303,7 @@ msgid "kufi cap" msgid_plural "kufi caps" msgstr[0] "圆顶小帽" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "" @@ -10554,7 +10584,7 @@ msgid "galea" msgid_plural "galeae" msgstr[0] "罗马头盔" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -11164,7 +11194,7 @@ msgid "diver's watch" msgid_plural "diver's watches" msgstr[0] "潜水表" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -14753,7 +14783,8 @@ msgid "pair of 2-by-shin guards" msgid_plural "pairs of 2-by-shin guards" msgstr[0] "木料护胫" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -14782,7 +14813,8 @@ msgid "chainmail leggings" msgid_plural "pairs of chainmail leggings" msgstr[0] "锁环护胫" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -14794,7 +14826,7 @@ msgid "leather chaps" msgid_plural "leather chaps" msgstr[0] "皮护腿" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -14806,7 +14838,7 @@ msgid "fencing pants" msgid_plural "fencing pants" msgstr[0] "击剑裤" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "一条内有导电金属网加固的，防止击剑等运动时发生意外的击剑防护裤。" @@ -14891,7 +14923,8 @@ msgid "light survivor cargo pants" msgid_plural "light survivor cargo pants" msgstr[0] "轻型幸存者工装长裤" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -14903,7 +14936,8 @@ msgid "motorcycle pants" msgid_plural "pairs of motorcycle pants" msgstr[0] "摩托车手裤子" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "一件为摩托车手和越野自行车手所使用的裤子，凯夫拉材质提供了出色的防护能力。" @@ -14937,7 +14971,7 @@ msgid "breeches" msgid_plural "breeches" msgstr[0] "马术长裤" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -14959,7 +14993,7 @@ msgid "hot pants" msgid_plural "hot pants" msgstr[0] "热裤" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "" @@ -14971,7 +15005,7 @@ msgid "fur hot pants" msgid_plural "fur hot pants" msgstr[0] "毛皮热裤" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "一件短裆、紧身的毛皮制短裤。" @@ -14981,7 +15015,8 @@ msgid "leather hot pants" msgid_plural "leather hot pants" msgstr[0] "皮革热裤" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "一件短裆、紧身的皮制短裤。" @@ -14991,7 +15026,7 @@ msgid "jeans" msgid_plural "jeans" msgstr[0] "牛仔裤" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "" @@ -15031,7 +15066,7 @@ msgid "leggings" msgid_plural "leggings" msgstr[0] "尼龙绑腿" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -15151,7 +15186,7 @@ msgid "fur pants" msgid_plural "fur pants" msgstr[0] "毛皮长裤" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "一条有着厚实毛皮内衬、相当保暖的裤子。" @@ -15171,7 +15206,7 @@ msgid "leather pants" msgid_plural "leather pants" msgstr[0] "皮裤" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -15193,7 +15228,8 @@ msgid "mail carrier shorts" msgid_plural "mail carrier shorts" msgstr[0] "邮差短裤" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "一条常见于邮政人员穿着的深蓝色轻便短裤。" @@ -15213,7 +15249,7 @@ msgid "cargo shorts" msgid_plural "cargo shorts" msgstr[0] "工装短裤" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "" @@ -15224,7 +15260,7 @@ msgid "denim shorts" msgid_plural "denim shorts" msgstr[0] "牛仔短裤" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -15356,17 +15392,20 @@ msgid "bondage mask (zipped)" msgid_plural "bondage masks (zipped)" msgstr[0] "紧缚面罩（已拉链）" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "拉开拉链" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "你将面罩眼部和嘴部的拉链拉开。" -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -16200,7 +16239,7 @@ msgid "leather pouch" msgid_plural "leather pouches" msgstr[0] "皮革小袋" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -17224,7 +17263,8 @@ msgid "lorica segmentata" msgid_plural "lorica segmentata" msgstr[0] "罗马片甲" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -17272,7 +17312,7 @@ msgid "cuirass" msgid_plural "cuirasses" msgstr[0] "钢制胸甲" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -17898,7 +17938,8 @@ msgid "pair of arm warmers" msgid_plural "pairs of arm warmers" msgstr[0] "臂套" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "一对舒适合身柔软的布套，可以保持你的手臂温暖。" @@ -17979,7 +18020,7 @@ msgid "boy shorts" msgid_plural "boy shorts" msgstr[0] "女式平角内裤" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -18001,7 +18042,7 @@ msgid "briefs" msgid_plural "briefs" msgstr[0] "男用内裤" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "一条男性普遍穿着的舒适三角内裤。" @@ -18107,7 +18148,8 @@ msgid "pair of XL leg warmers" msgid_plural "pairs of XL leg warmers" msgstr[0] "腿套（XL）" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "一对舒适合身柔软、可以保持你的腿部温暖加大版的布套，即便你的肢体已经发生变异也可以保暖。" @@ -18218,7 +18260,8 @@ msgid "compression shorts" msgid_plural "compression shorts" msgstr[0] "塑身短裤" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -19435,7 +19478,7 @@ msgid "test battery" msgid_plural "test batteries" msgstr[0] "测试用电池" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -20260,7 +20303,8 @@ msgid "Power Storage CBM Mk. II" msgid_plural "Power Storage CBM Mk. II" msgstr[0] "Mk.II 型储能模块CBM" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -21981,19 +22025,19 @@ msgstr[0] "原理图" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -25998,7 +26042,8 @@ msgid "commercial fertilizer" msgid_plural "commercial fertilizer" msgstr[0] "商品肥料" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "富含营养的颗粒状植物肥料。" @@ -26076,7 +26121,8 @@ msgid "concentrated acid" msgid_plural "concentrated acid" msgstr[0] "浓酸" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "浓缩酸液。不要喝。" @@ -26750,7 +26796,7 @@ msgid "cheap whiskey" msgid_plural "cheap whiskey" msgstr[0] "廉价威士忌" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "一种廉价的混合威士忌。" @@ -27201,7 +27247,7 @@ msgid "cooked fish" msgid_plural "cooked fish" msgstr[0] "熟鱼肉" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "新鲜的鱼再加上高超的手艺，就成了这道营养的美食。" @@ -27287,7 +27333,7 @@ msgid "chunk of meat" msgid_plural "chunks of meat" msgstr[0] "肉块" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -27310,7 +27356,8 @@ msgid "chunk of mutant meat" msgid_plural "chunks of mutant meat" msgstr[0] "变异肉块" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -27425,7 +27472,7 @@ msgid "cooked offal" msgid_plural "cooked offal" msgstr[0] "熟内脏" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -27572,7 +27619,8 @@ msgid "cooked piece of lung" msgid_plural "cooked pieces of lung" msgstr[0] "熟肺片" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -27621,7 +27669,7 @@ msgid "cooked brains" msgid_plural "cooked brains" msgstr[0] "熟脑" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -27720,7 +27768,8 @@ msgid "chunk of mutant fat" msgid_plural "chunks of mutant fat" msgstr[0] "变异脂肪块" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -27791,7 +27840,8 @@ msgid "chunk of tainted meat" msgid_plural "chunks of tainted meat" msgstr[0] "被感染的肉块" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -28292,7 +28342,7 @@ msgid "chamomile tea" msgid_plural "chamomile tea" msgstr[0] "甘菊茶" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -28315,7 +28365,7 @@ msgid "coffee" msgid_plural "coffee" msgstr[0] "咖啡" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -28328,7 +28378,8 @@ msgid "coffee substitute" msgid_plural "coffee substitute" msgstr[0] "咖啡代用品" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -28341,7 +28392,7 @@ msgid "chicory brew" msgid_plural "chicory brew" msgstr[0] "菊苣酿" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -28703,7 +28754,7 @@ msgid "clean water" msgid_plural "clean water" msgstr[0] "净水" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "一份新鲜且纯净的水。" @@ -29152,7 +29203,8 @@ msgid "cooked strawberry" msgid_plural "cooked strawberries" msgstr[0] "煮草莓" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "这就像草莓果酱，只是不加糖。" @@ -29171,7 +29223,8 @@ msgid "cooked blueberry" msgid_plural "cooked blueberries" msgstr[0] "煮蓝莓" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "这就像蓝莓果酱，只是不加糖。" @@ -29909,17 +29962,17 @@ msgid "chocolate candy" msgid_plural "chocolate candies" msgstr[0] "巧克力糖" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "一把巧克力夹心糖果。" #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" +msgid_plural "chewy candy" msgstr[0] "软糖" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "一把五颜六色的果味软糖。" @@ -30139,7 +30192,7 @@ msgid "cheese nachos" msgid_plural "cheese nachos" msgstr[0] "奶酪辣味玉米片" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -30252,7 +30305,7 @@ msgid "chili dogs" msgid_plural "chili dogs" msgstr[0] "辣椒热狗" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "一个浇头是辣椒肉酱的热狗，香辣可口。" @@ -30285,7 +30338,8 @@ msgid "chocolate pancake" msgid_plural "chocolate pancakes" msgstr[0] "巧克力馅饼" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -30317,7 +30371,7 @@ msgid "cheese fries" msgid_plural "cheese fries" msgstr[0] "奶酪薯条" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "一些油炸薯条，上面裹着一层奶酪。" @@ -30356,10 +30410,9 @@ msgstr "一份经过简单的明火烤熟加工的热狗，味道尝起来显然 #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "熟热狗" +msgstr "熟热狗" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -30834,19 +30887,21 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "墨西哥辣肉酱" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "墨西哥辣人酱" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "墨西哥辣肉酱（变异肉）" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "利用肉类、辣椒、番茄和豆子熬制而成。" @@ -31658,7 +31713,7 @@ msgid "cocaine" msgid_plural "cocaine" msgstr[0] "可卡因" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -31804,7 +31859,7 @@ msgid "chewing gum" msgid_plural "chewing gum" msgstr[0] "口香糖" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "亮粉色的口香糖。含糖，甜，对你的牙齿不好。" @@ -33719,7 +33774,7 @@ msgid "chitin powder" msgid_plural "chitin powder" msgstr[0] "甲壳粉" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -33772,7 +33827,7 @@ msgid "cooked beans" msgid_plural "cooked beans" msgstr[0] "炖豆子" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "一份丰盛的煮黄豆。" @@ -33844,7 +33899,7 @@ msgid "cooked lentils" msgid_plural "cooked lentils" msgstr[0] "熟扁豆" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "一些美味的煮扁豆，普通但营养丰富。" @@ -33854,7 +33909,7 @@ msgid "coffee powder" msgid_plural "coffee powder" msgstr[0] "咖啡粉" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -35382,7 +35437,7 @@ msgid "chicory seeds" msgid_plural "chicory seeds" msgstr[0] "菊苣菜种子" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "一些菊苣菜种子。" @@ -35461,7 +35516,8 @@ msgid "chili pepper seeds" msgid_plural "chili pepper seeds" msgstr[0] "辣椒种子" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "一些辣椒种子。" @@ -35796,7 +35852,7 @@ msgid "coffee beans" msgid_plural "coffee beans" msgstr[0] "咖啡豆" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "一些咖啡豆，可以进行烘焙加工。" @@ -35816,7 +35872,7 @@ msgid "chamomile seeds" msgid_plural "chamomile seeds" msgstr[0] "黄春菊种子" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "一些黄春菊种子。" @@ -36107,10 +36163,9 @@ msgstr "百里香，一种采择自百里香属品种植物、具有烹饪及药 #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "煮香蒲秆" +msgstr "煮香蒲秆" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -36134,7 +36189,8 @@ msgid "cooked dandelion greens" msgid_plural "cooked dandelion greens" msgstr[0] "煮蒲公英叶" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "一份煮熟的蒲公英叶片，美味且营养丰富，有助于健康。" @@ -36167,7 +36223,8 @@ msgid "cooked wild vegetables" msgid_plural "cooked wild vegetables" msgstr[0] "炖野菜" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "一份摘挑后再煮熟的野菜，可以直接食用或用作其他料理之中。" @@ -36187,7 +36244,7 @@ msgid "cooked buckwheat" msgid_plural "cooked buckwheat" msgstr[0] "煮荞麦" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -36235,7 +36292,7 @@ msgid "cooked rice" msgid_plural "cooked rice" msgstr[0] "熟米饭" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "一份热腾腾香喷喷的米饭。" @@ -36786,9 +36843,10 @@ msgstr "一份铺满融化奶酪的美味披萨。" #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "格兰诺拉燕麦卷" +msgid_plural "granola" +msgstr[0] "格兰诺拉燕麦卷" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -39270,7 +39328,7 @@ msgid "rock salt" msgid_plural "rock salt" msgstr[0] "岩盐" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "一大把岩盐结晶。可以被提炼为食盐。" @@ -39280,7 +39338,7 @@ msgid "rhodonite" msgid_plural "rhodonite" msgstr[0] "蔷薇辉石" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -39292,7 +39350,7 @@ msgid "zincite" msgid_plural "zincite" msgstr[0] "红锌矿" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -39478,7 +39536,8 @@ msgid "semi ground grains" msgid_plural "semi ground grains" msgstr[0] "谷物糊" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "一种由碾碎的谷物制成的糊状物，还不是面粉。" @@ -39488,7 +39547,8 @@ msgid "smoldering embers" msgid_plural "smoldering embers" msgstr[0] "熏烤余烬" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -39517,7 +39577,7 @@ msgid "coin" msgid_plural "coins" msgstr[0] "金币" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -39543,19 +39603,23 @@ msgstr[0] "无" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "靠近火源" +msgid_plural "none" +msgstr[0] "无" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "肌肉" +msgid_plural "none" +msgstr[0] "无" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "风" +msgid_plural "none" +msgstr[0] "无" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "阳光" +msgid_plural "none" +msgstr[0] "无" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -39567,6 +39631,14 @@ msgid "a smoking device and a source of flame" msgid_plural "none" msgstr[0] "无" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "无" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -39650,7 +39722,7 @@ msgid "leather patch" msgid_plural "leather patches" msgstr[0] "皮革片" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "一小块皮革片，可用于缝制坚实的衣物。" @@ -39660,7 +39732,7 @@ msgid "felt patch" msgid_plural "felt patches" msgstr[0] "毛毡片" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "小块的毛毡片，可以拆解出羊毛纤维。" @@ -39737,7 +39809,8 @@ msgid "set of 100 ceramic disk" msgid_plural "ceramic disks" msgstr[0] "陶瓷盘套件" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -39999,7 +40072,7 @@ msgid "concrete" msgid_plural "concrete" msgstr[0] "混凝土" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "一堆混凝土，已经准备好，随时可以用到工程建设项目中。" @@ -40035,7 +40108,7 @@ msgid "dead flare" msgid_plural "dead flares" msgstr[0] "照明弹（燃尽）" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "一个已经燃烧完毕的照明弹。本质上是垃圾，且不可回收。" @@ -40507,7 +40580,8 @@ msgid "high-quality lens" msgid_plural "high-quality lenses" msgstr[0] "高清镜头" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -40519,7 +40593,8 @@ msgid "small high-quality lens" msgid_plural "small high-quality lenses" msgstr[0] "小型高清镜头" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -40531,7 +40606,8 @@ msgid "pair of tinted glass" msgid_plural "pairs of tinted glass" msgstr[0] "有色玻璃镜片" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -40663,7 +40739,7 @@ msgid "fish bowl" msgid_plural "fish bowls" msgstr[0] "金鱼缸" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -40949,7 +41025,7 @@ msgid "lump of clay" msgid_plural "lumps of clay" msgstr[0] "黏土块" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "一块新鲜的黏土，用来制造许多东西。" @@ -40969,7 +41045,7 @@ msgid "mortar" msgid_plural "mortar" msgstr[0] "灰泥" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "一堆灰泥，已经准备好，随时可以用到工程建设项目中。" @@ -40979,17 +41055,17 @@ msgid "soft adobe brick" msgid_plural "soft adobe bricks" msgstr[0] "软黏土砖" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "你试了试，这块砖似乎已足够结实可以使用。" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "这块砖还太湿，承受不了重量。" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -41197,7 +41273,7 @@ msgid "cured hide" msgid_plural "cured hides" msgstr[0] "硬皮" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -41210,7 +41286,7 @@ msgid "tanned hide" msgid_plural "tanned hides" msgstr[0] "鞣制皮革" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -41222,7 +41298,7 @@ msgid "cured pelt" msgid_plural "cured pelts" msgstr[0] "硬化毛皮" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -41235,7 +41311,7 @@ msgid "tanned pelt" msgid_plural "tanned pelts" msgstr[0] "鞣制毛皮" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -41247,7 +41323,7 @@ msgid "pile of straw" msgid_plural "piles of straw" msgstr[0] "稻草堆" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -41259,7 +41335,7 @@ msgid "straw doll" msgid_plural "straw dolls" msgstr[0] "稻草娃娃" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "一个老旧的稻草娃娃。看上去是个穿裙子的女性。" @@ -41408,7 +41484,7 @@ msgid "joint roach" msgid_plural "joint roaches" msgstr[0] "大麻烟蒂" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -41564,7 +41640,7 @@ msgid "refrigerant tank" msgid_plural "refrigerant tanks" msgstr[0] "制冷剂罐" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -41770,7 +41846,7 @@ msgid "flyer" msgid_plural "flyers" msgstr[0] "传单" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "无用的废纸。" @@ -41780,7 +41856,7 @@ msgid "survivor's note" msgid_plural "survivor's notes" msgstr[0] "幸存者笔记" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -41802,7 +41878,7 @@ msgid "score card" msgid_plural "score cards" msgstr[0] "记分卡" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "彩色印刷的记分卡。" @@ -41812,7 +41888,7 @@ msgid "newspaper page" msgid_plural "newspaper pages" msgstr[0] "报纸" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -41821,7 +41897,7 @@ msgid "" " briefly." msgstr "一张报纸。可能是本地被丧尸淹没之前印刷的最后几期之一。大多是些琐碎或者过时的信息。但有一件事吸引你的目光。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -41830,7 +41906,7 @@ msgid "" " briefly." msgstr "一张报纸。上面的日期居然是好几年前的，你很奇怪它是如何保存这么久的。大多是些琐碎或者过时的信息。但有一件事吸引你的目光。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -41838,7 +41914,7 @@ msgid "" "terribly trivial, or out of date, but one thing catches your eye briefly." msgstr "一张报纸。上面的日期是几年前的，能完整的保存下来真是蛮奇怪的。大多是些琐碎或者过时的信息。但有一件事吸引你的目光。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -41846,7 +41922,7 @@ msgid "" "but one thing catches your eye briefly." msgstr "一张报纸。上面的日期是一年前的，能完整的保存下来真是蛮奇怪的。大多是些琐碎或者过时的信息。但有一件事吸引你的目光。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -41854,7 +41930,7 @@ msgid "" "trivial, or out of date, but one thing catches your eye briefly." msgstr "一张报纸。上面的日期是大灾变之前几个月。大多是些琐碎或者过时的信息。但有一件事吸引你的目光。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -41867,7 +41943,7 @@ msgid "vault leaflet" msgid_plural "vault leaflets" msgstr[0] "避难所传单" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -42376,7 +42452,8 @@ msgid "set of tiny spidery legs" msgid_plural "sets of tiny spidery legs" msgstr[0] "小型蜘蛛机械腿" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "一组小而尖的腿，就像在掠夺者机器人用的那种。" @@ -42386,7 +42463,8 @@ msgid "set of reverse-jointed legs" msgid_plural "sets of reverse-jointed legs" msgstr[0] "反向关节腿" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -42397,7 +42475,8 @@ msgid "set of omni wheels" msgid_plural "sets of omni wheels" msgstr[0] "全向车轮组" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "一组全向车轮组，就像在警用机器人用的那种。" @@ -42407,7 +42486,7 @@ msgid "set of rotors" msgid_plural "sets of rotors" msgstr[0] "转子组" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "一组能够驱动小型无人机的转子。" @@ -42417,7 +42496,8 @@ msgid "set of android legs" msgid_plural "sets of android legs" msgstr[0] "仿生腿套件" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "一组类人型的腿。" @@ -42427,7 +42507,8 @@ msgid "set of android arms" msgid_plural "sets of android arms" msgstr[0] "仿生臂套件" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "一组类人型的手臂。" @@ -42437,7 +42518,8 @@ msgid "set of small tank tread" msgid_plural "sets of small tank tread" msgstr[0] "小型坦克履带组" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "一组小型坦克履带，就像“\"猎兔犬\"型无人坦克用的那种。" @@ -42447,7 +42529,8 @@ msgid "turret interior chassis" msgid_plural "turret interior chassis" msgstr[0] "炮塔支架" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -42459,7 +42542,8 @@ msgid "police bot chassis" msgid_plural "police bot chassis" msgstr[0] "警用机器人底盘" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -42487,7 +42571,7 @@ msgid "misc software" msgid_plural "misc software" msgstr[0] "杂项软件" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "一堆有趣的小型软件打包，没什么用处。" @@ -42497,7 +42581,7 @@ msgid "hackPRO" msgid_plural "hackPRO" msgstr[0] "高级黑客工具" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "一套黑客软件。" @@ -42527,7 +42611,7 @@ msgid "infection data" msgid_plural "infection data" msgstr[0] "感染数据" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "丧尸血液的医疗数据。" @@ -42537,7 +42621,7 @@ msgid "lab data" msgid_plural "lab data" msgstr[0] "实验数据" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "一份来自政府实验室的实验数据。" @@ -42547,7 +42631,7 @@ msgid "train data" msgid_plural "train data" msgstr[0] "列车数据" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "一份关于地铁列车路线和时刻表的后勤数据。" @@ -42557,7 +42641,7 @@ msgid "neural data" msgid_plural "neural data" msgstr[0] "神经数据" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -42573,7 +42657,8 @@ msgid "integrated circuit datasheet archives" msgid_plural "misc software" msgstr[0] "集成电路参数表" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -45252,7 +45337,7 @@ msgid "spare parts" msgid_plural "spare parts" msgstr[0] "零件" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -45658,17 +45743,20 @@ msgid "expandable baton (extended)" msgid_plural "expandable batons (extended)" msgstr[0] "甩棍（展开）" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "折叠" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "你折好你的甩棍。" -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -45904,7 +45992,8 @@ msgid "ironshod quarterstaff" msgid_plural "ironshod quarterstaves" msgstr[0] "镔铁棍" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -46120,7 +46209,7 @@ msgid "quarterstaff" msgid_plural "quarterstaves" msgstr[0] "武术长棍" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -46134,7 +46223,7 @@ msgid "rock in a sock" msgid_plural "rocks in socks" msgstr[0] "袜装石锤" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "一对套在一起的袜子，里面装了个石头。绝对是绝境下才会使用的武器。" @@ -46144,7 +46233,8 @@ msgid "sharpened toothbrush" msgid_plural "sharpened toothbrushes" msgstr[0] "磨尖牙刷" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "" @@ -46402,7 +46492,7 @@ msgid "naginata" msgid_plural "naginata" msgstr[0] "薙刀" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -46411,7 +46501,7 @@ msgid "" msgstr "" "一根坚固耐用的长柄武器，顶部是一个弯曲的采用和武士刀一样其他日式刀具制造方法制成的利刃。在镰仓时代为步兵与僧侣的主力兵器，在江户时代则成为了武士家女性作为教养的必学项目。" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -46419,7 +46509,7 @@ msgid "" "feels a bit shoddily made." msgstr "一把坚硬的带弯曲刀刃的长柄刀，用与武士刀和其他日本刀刃相同的方式制成。这把刀的刀刃有点晃动，感觉有点粗制滥造。" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -46432,7 +46522,8 @@ msgid "survivor naginata" msgid_plural "survivor naginata" msgstr[0] "幸存者薙刀" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -46499,7 +46590,7 @@ msgid "dory" msgid_plural "dories" msgstr[0] "希腊长矛" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "一把精心制造的长矛，枪头由青铜制成。源自希腊。" @@ -46509,7 +46600,7 @@ msgid "ji" msgid_plural "ji" msgstr[0] "中式戟" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -46571,7 +46662,7 @@ msgid "jian" msgid_plural "jian" msgstr[0] "剑" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -46671,14 +46762,14 @@ msgid "nodachi" msgid_plural "nodachi" msgstr[0] "野太刀" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " "from Japan. It is surprisingly light for its size." msgstr "一柄日本武士骑马作战时所用的野太刀，长约五尺，亦称\"大太刀\"。此款外观、造型和材料与正品有差异，为廉价复制品。" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -46796,7 +46887,7 @@ msgid "cutlass" msgid_plural "cutlasses" msgstr[0] "短弯刀" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -46885,7 +46976,7 @@ msgid "kris" msgid_plural "krises" msgstr[0] "蛇剑" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -46911,7 +47002,7 @@ msgid "tiger claws" msgid_plural "tiger claws" msgstr[0] "虎爪" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -46935,7 +47026,8 @@ msgid "pair of brass knuckles" msgid_plural "pairs of brass knuckles" msgstr[0] "铜指虎" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -46960,7 +47052,8 @@ msgid "pair of nail knuckles" msgid_plural "pairs of nail knuckles" msgstr[0] "钉指虎" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -46972,7 +47065,8 @@ msgid "pair of steel knuckles" msgid_plural "pairs of steel knuckles" msgstr[0] "铁指虎" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -47055,7 +47149,7 @@ msgid "throwing knife" msgid_plural "throwing knives" msgstr[0] "飞刀" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -47080,14 +47174,15 @@ msgid "sheet of glass" msgid_plural "sheets of glass" msgstr[0] "玻璃片" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "你打破玻璃板并将碎片放在地上，让它能被经过的东西压碎。" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -47098,7 +47193,8 @@ msgid "sheet of reinforced glass" msgid_plural "sheets of reinforced glass" msgstr[0] "钢化玻璃片" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "一大片的钢化玻璃。" @@ -47108,7 +47204,8 @@ msgid "pane of reinforced glass" msgid_plural "panes of reinforced glass" msgstr[0] "钢化玻璃碎块" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "一小块钢化玻璃。" @@ -47188,7 +47285,7 @@ msgid "scrap copper" msgid_plural "scrap copper" msgstr[0] "废铜料" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "一小块的铜，可以用来制造或修理物品。" @@ -47243,7 +47340,7 @@ msgid "mattress" msgid_plural "mattresses" msgstr[0] "床垫" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "这是一张单人床的床垫。" @@ -47253,7 +47350,7 @@ msgid "down mattress" msgid_plural "down mattresses" msgstr[0] "羽绒床垫" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "这是一张单人床的羽绒床垫。" @@ -47557,21 +47654,28 @@ msgid "sealed jar of eggs" msgid_plural "sealed jars of eggs" msgstr[0] "密封腌蛋罐头" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "拆罐头" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "你打开了罐子，内容物暴露在空气中。" -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -47583,7 +47687,8 @@ msgid "sealed jar of pickles" msgid_plural "sealed jars of pickles" msgstr[0] "密封腌黄瓜" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -47595,7 +47700,8 @@ msgid "sealed jar of sauerkraut" msgid_plural "sealed jars of sauerkraut" msgstr[0] "密封德式酸菜" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -48177,7 +48283,7 @@ msgid "radio car box" msgid_plural "radio car boxes" msgstr[0] "遥控玩具车盒" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -48273,7 +48379,8 @@ msgid "set of ring stand clamps" msgid_plural "sets of ring stand clamps" msgstr[0] "铁架台夹具组" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -48333,7 +48440,8 @@ msgid "knitting needles" msgid_plural "pairs of knitting needles" msgstr[0] "棒针" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -48417,7 +48525,8 @@ msgid "distaff and spindle" msgid_plural "distaves and spindles" msgstr[0] "纺线杆和纺锤" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -48514,7 +48623,7 @@ msgid "storage battery case" msgid_plural "storage battery cases" msgstr[0] "蓄电池箱" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -48526,7 +48635,7 @@ msgid "wood boat hull" msgid_plural "wood boat hulls" msgstr[0] "木制船壳" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -48538,7 +48647,7 @@ msgid "plastic boat hull" msgid_plural "plastic boat hulls" msgstr[0] "塑料船壳" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -48564,7 +48673,7 @@ msgid "oars" msgid_plural "oars" msgstr[0] "桨" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "船桨，严格说是橹。" @@ -48574,7 +48683,7 @@ msgid "sail" msgid_plural "sails" msgstr[0] "船帆" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "船的帆。" @@ -48584,7 +48693,8 @@ msgid "inflatable section" msgid_plural "inflatable section" msgstr[0] "充气节" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "充气艇的一截。" @@ -48594,7 +48704,8 @@ msgid "inflatable airbag" msgid_plural "inflatable airbag" msgstr[0] "充气气囊" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "一个充气气囊" @@ -48746,7 +48857,8 @@ msgid "vehicle controls" msgid_plural "sets of vehicle controls" msgstr[0] "载具控制器" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "一整套用于控制载具的装置设备。可以用来制造物品。" @@ -48797,7 +48909,8 @@ msgid "drive by wire controls" msgid_plural "sets of drive by wire controls" msgstr[0] "电传线控控制器" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -48809,7 +48922,7 @@ msgid "robot driving unit" msgid_plural "robot driving units" msgstr[0] "机器人驾驶单元" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -48966,7 +49079,7 @@ msgid "vehicle scoop" msgid_plural "vehicle scoops" msgstr[0] "车铲" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -48978,7 +49091,7 @@ msgid "seed drill" msgid_plural "seed drills" msgstr[0] "播种机" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -48991,7 +49104,7 @@ msgid "reaper" msgid_plural "reapers" msgstr[0] "收割机" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -49029,7 +49142,7 @@ msgid "plow" msgid_plural "plows" msgstr[0] "犁具" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "一个由轮子及钢刀拼装而成的沉重部件，能够翻鬆泥土。" @@ -49166,7 +49279,8 @@ msgid "emergency vehicle light (red)" msgid_plural "emergency vehicle lights (red)" msgstr[0] "警灯（红）" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -49178,7 +49292,8 @@ msgid "emergency vehicle light (blue)" msgid_plural "emergency vehicle lights (blue)" msgstr[0] "警灯（蓝）" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -49212,7 +49327,8 @@ msgid "set of hand rims" msgid_plural "sets of hand rims" msgstr[0] "轮辋" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "轮椅上用的特殊带把手的轮子。" @@ -49778,7 +49894,7 @@ msgid "vehicle cooler" msgid_plural "vehicle coolers" msgstr[0] "车载冷却器" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "车载区域冷却器。" @@ -49788,7 +49904,7 @@ msgid "vehicle heater" msgid_plural "vehicle heaters" msgstr[0] "车载加热器" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "一个车载区域加热器。" @@ -50127,11 +50243,10 @@ msgstr[0] "加密币" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" -"PrepNet一直在大量使用无法追踪的互联网数字货币来避税。如果该运动持续下去的话，它很可能会大大削弱美国税基，但大灾变先其一步到来了。这些实体硬币上面印有随机数序列表明其对应的数字货币。" +"PrepNet一直在大量使用无法追踪的互联网数字货币来避税。这些实体硬币上面印有随机数序列，表明了其内部嵌入的RFID芯片所对应的数字货币。" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py msgid "vehicle refrigerator" @@ -61719,7 +61834,7 @@ msgid "lamb" msgid_plural "lambs" msgstr[0] "小羊羔" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -69214,7 +69329,8 @@ msgstr[0] "采矿头盔（开）" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -69757,12 +69873,14 @@ msgid "phase immersion suit (on)" msgid_plural "phase immersion suits (on)" msgstr[0] "相位沉浸服（开）" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "防护服正在关机。" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -92951,10 +93069,10 @@ msgid "" msgstr "涡轮机利用风力将湿热的空气从阁楼中吸出。" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "干草" +msgid "bale of hay" +msgstr "干草堆" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "一捆干草。在万般无奈时，你可以在上面睡一觉。" @@ -157034,16 +157152,16 @@ msgid "Clothing Store" msgstr "服装店" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." -msgstr "助手。" +msgid "You there. Quiet down. Can you hear it? The song?" +msgstr "那里的家伙，安静点。你能听到吗？这歌声？" #: lang/json/talk_topic_from_json.py msgid "You're back. Have you come to listen to the song?" msgstr "你又回来了。你是来这听歌的吗？" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" -msgstr "那里的家伙，安静点。你能听到吗？这歌声？" +msgid "Acolyte." +msgstr "助手。" #: lang/json/talk_topic_from_json.py msgid "What? What do you mean? What song?" @@ -157194,21 +157312,18 @@ msgid "Yeah, alright." msgstr "是的，好吧。" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." -msgstr "尚有歌未被你所唱，如果你想的话。" +msgid "An acolyte should not take on too many songs at once." +msgstr "一名助手一次不应该唱太多的歌。" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." -msgstr "你尚可再唱一首歌，如果你想的话。" +msgid "That is all for now." +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." -msgstr "我知道有一些有用的骨头，如果你想知道更多的话。" - -#: lang/json/talk_topic_from_json.py -msgid "There are bones to etch, songs to sing. Wish to join me?" -msgstr "有骨待刻，有曲当歌。想加入吗？" +"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 "Do you wish to take on more songs?" @@ -157219,18 +157334,21 @@ msgid "Do you believe you can take on the burden of additional bones?" 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." -msgstr "现在歌……很安静。也许随着时间的推移，更多的音符会刻在这个世界的骨头上。" +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." -msgstr "一名助手一次不应该唱太多的歌。" +msgid "There is an additional song you could take on, if you'd like." +msgstr "你尚可再唱一首歌，如果你想的话。" #: lang/json/talk_topic_from_json.py -msgid "That is all for now." -msgstr "到此为止。" +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." +msgstr "尚有歌未被你所唱，如果你想的话。" #: lang/json/talk_topic_from_json.py msgid "I see." @@ -157301,16 +157419,16 @@ msgstr "觉悟之路是需要你自己走。如果我帮助你，最终会阻碍 msgid "I see. Very well then." msgstr "我明白了。好吧。" +#: lang/json/talk_topic_from_json.py +msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgstr "只有那些有我印记的人才能证明自己配得上我的技能。" + #: lang/json/talk_topic_from_json.py msgid "" "You bear my mark, meaning I believe you have potential to learn to truly " "listen to the Song. Yes, I will lend my skills to you, for now." msgstr "你身上有我的印记，意味着我相信你有潜力学会真正倾听这首歌。是的，我将把助你一臂之力，暂时的。" -#: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." -msgstr "只有那些有我印记的人才能证明自己配得上我的技能。" - #: lang/json/talk_topic_from_json.py msgid "I am glad to hear it. Let's go then." msgstr "听你这么说我很高兴。我们出发吧。" @@ -157551,18 +157669,18 @@ msgstr "" "当然，我会把任何携带物品交易给你，我们是朋友，没问题。\n" "哦对了，如果饿了、渴了，我会吃掉我携带着的饮食。同理也会消耗燃料为生化插件充能。所以也许你应该注意下你给我的物品，是吧？" -#: lang/json/talk_topic_from_json.py -msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." -msgstr "嘿，我是名医生！我知道如何治疗创伤。只要你给我一些绷带或一瓶消毒剂，我就能在你受伤时治好你。" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I can perform first aid. You give me some bandages or a bottle of " "antiseptic, I'll treat your wounds as best I can." msgstr "是的，我懂得一些急救知识。我知道如何治疗创伤。只要你给我一些绷带或一瓶消毒剂，我就能在你受伤时治好你。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +msgstr "嘿，我是名医生！我知道如何治疗创伤。只要你给我一些绷带或一瓶消毒剂，我就能在你受伤时治好你。" + #: lang/json/talk_topic_from_json.py msgid "" " But remember, I like you, but I like me more - so I'm going to use those " @@ -157774,16 +157892,16 @@ msgstr "谢谢你的解释。我想了解其他事情。" msgid "Thanks. I have some things for you to do." msgstr "谢谢，我有一些事情要你做。" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "嗨，。" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "站住，举起手来！哈哈，吓到你了吗，我们……已经没有法律了……" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "嗨，。" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "你在这里干什么？" @@ -157855,24 +157973,24 @@ msgid "" msgstr "是的，还有其他一些人像我一样躲在镇里。我们有时候会做些交易……有时会有陌生人路过这，以为他们能找到比之前待得更好的地方。" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "不行就是不行……" +msgid "Anything to do before I go to sleep?" +msgstr "睡觉前再做些什么？" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "赶紧让我睡觉吧，！" +msgid "Just few minutes more..." +msgstr "再等几分钟……" #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "快点，我想回去睡觉" #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "再等几分钟……" +msgid "Just let me sleep, !" +msgstr "赶紧让我睡觉吧，！" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "睡觉前再做些什么？" +msgid "No, just no..." +msgstr "不行就是不行……" #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -157986,93 +158104,93 @@ msgid "Let's go." msgstr "一起走吧。" #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." -msgstr "*不攻击敌人。" +msgid "*will engage all enemies." +msgstr "*会攻击所有敌人。" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." -msgstr "*会攻击靠近的敌人。" +msgid "*will engage enemies close enough to attack without moving." +msgstr "*会攻击在攻击范围的敌人。" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." -msgstr "*会攻击较弱的敌人。" +msgid "*will engage distant enemies without moving." +msgstr "*会攻击在攻击范围的远程敌人。" #: lang/json/talk_topic_from_json.py msgid "*will engage enemies you attack." msgstr "*会攻击你正在攻击的敌人。" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "*会攻击在攻击范围的远程敌人。" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." -msgstr "*会攻击在攻击范围的敌人。" +msgid "*will engage weak enemies." +msgstr "*会攻击较弱的敌人。" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." -msgstr "*会攻击所有敌人。" +msgid "*will engage nearby enemies." +msgstr "*会攻击靠近的敌人。" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " -msgstr "临时指令：" +msgid "*will not engage enemies." +msgstr "*不攻击敌人。" #: lang/json/talk_topic_from_json.py msgid " " msgstr " " #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid " OVERRIDE: " +msgstr "临时指令：" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "应该做些什么？" @@ -158181,14 +158299,13 @@ msgid "Attack anything you want." msgstr "按你自己的打法来吧。" #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." -msgstr "*将100%能量留给防御型或实用型生化插件。" +msgid "*will not reserve any power for defense or utility CBMs." +msgstr "*不保留能量给防御型或实用型生化插件。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." -msgstr "*将75%能量留给防御型或实用型生化插件。" +msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgstr "*将25%能量留给防御型或实用型生化插件。" #: lang/json/talk_topic_from_json.py #, no-python-format @@ -158197,12 +158314,13 @@ msgstr "*将50%能量留给防御型或实用型生化插件。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." -msgstr "*将25%能量留给防御型或实用型生化插件。" +msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgstr "*将75%能量留给防御型或实用型生化插件。" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." -msgstr "*不保留能量给防御型或实用型生化插件。" +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgstr "*将100%能量留给防御型或实用型生化插件。" #: lang/json/talk_topic_from_json.py msgid "" @@ -158241,13 +158359,13 @@ msgstr "疯狂使用生化插件武器。不将能量留给防御型或实用型 #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." -msgstr "*将的生化能量充到90%上限水平。" +msgid "*will recharge power CBMs until has 10% of total power." +msgstr "*将的生化能量充到10%上限水平。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." -msgstr "*将的生化能量充到75%上限水平。" +msgid "*will recharge power CBMs until has 25% of total power." +msgstr "*将的生化能量充到25%上限水平。" #: lang/json/talk_topic_from_json.py #, no-python-format @@ -158256,13 +158374,13 @@ msgstr "*将的生化能量充到50%上限水平。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." -msgstr "*将的生化能量充到25%上限水平。" +msgid "*will recharge power CBMs until has 75% of total power." +msgstr "*将的生化能量充到75%上限水平。" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." -msgstr "*将的生化能量充到10%上限水平。" +msgid "*will recharge power CBMs until has 90% of total power." +msgstr "*将的生化能量充到90%上限水平。" #: lang/json/talk_topic_from_json.py msgid " When should consume supplies to recharge power CBMs?" @@ -158297,20 +158415,20 @@ msgid "" msgstr "我们几乎没有补给了。将生化能量充到10%凑合用吧。" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." -msgstr "*将尽可能瞄准。" - -#: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." -msgstr "*将在长时间瞄准后才射击。" +msgid "*will not bother to aim at all." +msgstr "*不会费心瞄准。" #: lang/json/talk_topic_from_json.py msgid "*will take time and aim carefully." msgstr "*将仔细瞄准后射击。" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." -msgstr "*不会费心瞄准。" +msgid "*will only shoot after taking a long time to aim." +msgstr "*将在长时间瞄准后才射击。" + +#: lang/json/talk_topic_from_json.py +msgid "*will aim when it's convenient." +msgstr "*将尽可能瞄准。" #: lang/json/talk_topic_from_json.py msgid " How should aim?" @@ -158353,81 +158471,81 @@ msgid "OVERRIDE: " msgstr "临时指令：" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "遵守和这名同伴一样的规则。" @@ -158596,14 +158714,14 @@ msgstr "*电流声* 收到，我会赶过去的。完毕。" msgid "Sure thing, I'll make my way there." msgstr "好的，我会赶过去的。" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -158772,28 +158890,28 @@ msgid "I don't care." msgstr "我不在乎。" #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "我还有件事要拜托你，要听听看吗？" - -#: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -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 "我还有些其它的工作想交给你，要听听看吗？" +msgid "I don't have any jobs for you." +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 don't have any jobs for you." -msgstr "我没有工作可以给你。" +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 more jobs for you." -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 another job for you. Want to hear about it?" +msgstr "我还有件事要拜托你，要听听看吗？" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -158804,10 +158922,6 @@ msgstr "哦，好的。" msgid "Never mind, I'm not interested." msgstr "[拒绝]算了，我没兴趣。" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "你现在没有为我做任何事情。" - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "哪个工作？" @@ -158816,6 +158930,10 @@ msgstr "哪个工作？" msgid "What about it?" msgstr "怎么样了？" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "你现在没有为我做任何事情。" + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "[确认]我去做吧！" @@ -159024,49 +159142,49 @@ msgstr "嗯嗯，好吧。" msgid "Thanks!" msgstr "谢谢啦！" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "我渴了，给我来点喝的吧。" +msgid "I have some reason for not telling you." +msgstr "我不方便对你说。" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "我饿了，给我来点吃的吧。" +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "我现在什么都想不到，下次再问我吧。" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "我累了，让我去睡一会吧。" #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "我现在什么都想不到，下次再问我吧。" +msgid "I'm too hungry, give me something to eat." +msgstr "我饿了，给我来点吃的吧。" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." -msgstr "我不方便对你说。" +msgid "I'm too thirsty, give me something to drink." +msgstr "我渴了，给我来点喝的吧。" + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "专心开车，兄弟！" #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "啊，好吧。" #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "除非你给我一点抗生素……" +msgid "Why should I travel with you?" +msgstr "为什么我应该跟你同行？" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "你刚才问过我了，我仍在考虑中，一会再问我吧。" #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "为什么我应该跟你同行？" +msgid "Not until I get some antibiotics..." +msgstr "除非你给我一点抗生素……" #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -159156,21 +159274,21 @@ msgstr "不要，在这挺好的。" msgid "On second thought, never mind." msgstr "[取消]回头想一想，算了吧。" -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "你开车的时候，我没法好好儿训练你！" - #: lang/json/talk_topic_from_json.py msgid "I can't train you properly while I'm operating a vehicle!" msgstr "我开车的时候没法训练你！" +#: lang/json/talk_topic_from_json.py +msgid "I have some reason for denying you training." +msgstr "我不教你是有原因的。" + #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "给我点时间，我会给你看点新玩意……" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "我不教你是有原因的。" +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "你开车的时候，我没法好好儿训练你！" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -159208,14 +159326,14 @@ msgstr "我还是留着给自己吧。" msgid "I understand…" msgstr "我明白……" -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "你刚刚问我要过东西了，晚点再说吧。" - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "为何我应该跟你分享自己的装备？" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "你刚刚问我要过东西了，晚点再说吧。" + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "好的，算了。" @@ -159358,16 +159476,16 @@ msgstr "交易愉快！" msgid "You might be seeing more of me…" msgstr "我们还会再见的……" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "再次问好。 *滋滋滋*" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "我……我自由了。 *滋滋滋* 我真的自由了！ *噗滋滋滋* 看啊，你是这么长时间以来我见到的第一个活人。" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "再次问好。 *滋滋滋*" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "嘿，我们聊聊吧。" @@ -160422,28 +160540,28 @@ msgid "This is a low driving test response." msgstr "低驾驶技能测试回应。" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." -msgstr "你好朋友，很高兴见到你。" +msgid "Greeting citizen, what brings you to the FoodLair?" +msgstr "欢迎市民，什么风把你吹到了美食之城？" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" -msgstr "所以你又回来了……马上给我个解释！" +msgid "Still here? Take your time, it's rough out there." +msgstr "还在这里？慢慢来，外面很乱。" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" -msgstr "这是什么巫术？" +msgid "Greetings friend, it's nice to see you." +msgstr "你好朋友，很高兴见到你。" #: lang/json/talk_topic_from_json.py msgid "Welcome home Foodkid!" msgstr "欢迎回家，食物小子！" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." -msgstr "还在这里？慢慢来，外面很乱。" +msgid "What sorcery is this?" +msgstr "这是什么巫术？" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" -msgstr "欢迎市民，什么风把你吹到了美食之城？" +msgid "So you're back… Explain yourself!" +msgstr "所以你又回来了……马上给我个解释！" #: lang/json/talk_topic_from_json.py msgid "Greetings… Foodperson?" @@ -161872,10 +161990,6 @@ msgid "" msgstr "" "然后是军队。他们出现了，并征用我的土地作为某种前线基地，要求我撤离到联邦紧急事务管理局营地里。我甚至没有试图和他们争论一下……我只有我爸爸的旧猎枪，而他们有高科技武器。不过，我听到他们中的一个人开玩笑说联邦紧急事务管理局营地和奥斯威辛集中营没什么两样。我悄悄地从避难车队司机眼底下溜掉，决定去北方我姐姐那里。理论上我想我还是朝着那走，不过老实说，我只是在忙着别让自己死了。" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "我现在没法谈这件事。我做不到。" - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -161884,9 +161998,10 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" -"我那时候在医院工作，然后事情就这么糟了。整个事都有点模模糊糊的。一段时间以来一直都有一些奇怪的报道，那些听起来令人难以置信的关于病人死后复活的事情，但大多数人还是照常工作。然后，到了末日来临前，一切都突然出现了。我们以为这是一次来自中国的攻击，而这也是我们所获知的消息。送来急救的人都发疯了，身上满是子弹和咬伤的伤口。在我班快上到一半的时候我……我崩溃了。" +"我那时候在医院工作，然后事情就这么糟了。整个事都有点模模糊糊的。一段时间以来一直都有一些奇怪的报道，那些听起来令人难以置信的关于病人死后复活的事情，但大多数人还是照常工作。然后，到了末日来临前，一切都突然出现了。我们以为这是一次来自中国的攻击，而这也是我们所获知的消息。送来急救的人都发疯了，身上满是子弹和咬伤的伤口。在我班快上到一半的时候我……我崩溃了。我曾经见过比这更可怕的伤，但我……，我甚至没法谈起它。" #: lang/json/talk_topic_from_json.py msgid "" @@ -161896,10 +162011,13 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." msgstr "" -"我那时候在医院工作，然后事情就这么糟了。整个事都有点模模糊糊的。一段时间以来一直都有一些奇怪的报道，那些听起来令人难以置信的关于病人死后复活的事情，但大多数人还是照常工作。然后，到了末日来临前，一切都突然出现了。我们以为这是一次来自中国的攻击，而这也是我们所获知的消息。送来急救的人都发疯了，身上满是子弹和咬伤的伤口。在我班快上到一半的时候我……我崩溃了。我曾经见过比这更可怕的伤，但我……，我甚至没法谈起它。" +"我那时候在医院工作，然后事情就这么糟了。整个事都有点模模糊糊的。一段时间以来一直都有一些奇怪的报道，那些听起来令人难以置信的关于病人死后复活的事情，但大多数人还是照常工作。然后，到了末日来临前，一切都突然出现了。我们以为这是一次来自中国的攻击，而这也是我们所获知的消息。送来急救的人都发疯了，身上满是子弹和咬伤的伤口。在我班快上到一半的时候我……我崩溃了。" + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." +msgstr "我现在没法谈这件事。我做不到。" #: lang/json/talk_topic_from_json.py msgid "It might help to get it off your chest." @@ -162265,15 +162383,15 @@ msgstr "谢谢你告诉我这一切。" #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." -msgstr "我丈夫和我一起逃了出来，但在我遇见你前几天被一只 植物怪物吃掉了。今年对我来说不是个好年头。" +msgstr "我妻子和我一起逃了出来，但在我遇见你前几天被一只 植物怪物吃掉了。今年对我来说不是个好年头。" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." -msgstr "我妻子和我一起逃了出来，但在我遇见你前几天被一只 植物怪物吃掉了。今年对我来说不是个好年头。" +msgstr "我丈夫和我一起逃了出来，但在我遇见你前几天被一只 植物怪物吃掉了。今年对我来说不是个好年头。" #: lang/json/talk_topic_from_json.py msgid "I'm sorry to hear it." @@ -162335,9 +162453,8 @@ msgid "I'm sorry you lost someone." msgstr "听到你失去了爱人我很难过。" #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" -msgstr "我说过了，我不想谈这件事。你怎么不明白呢？" +msgid "Just another tale of love and loss. Not one I like to tell." +msgstr "只不过是另一个 爱情与失落的故事。我现在没心情讲故事了。" #: lang/json/talk_topic_from_json.py msgid "" @@ -162346,8 +162463,9 @@ msgid "" msgstr "如我所说，这是一个 故事，但我想再讲一遍不会让我丧命。" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." -msgstr "只不过是另一个 爱情与失落的故事。我现在没心情讲故事了。" +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" +msgstr "我说过了，我不想谈这件事。你怎么不明白呢？" #: lang/json/talk_topic_from_json.py msgid "You said you lost someone." @@ -162370,40 +162488,40 @@ msgid "" "Oh, . This doesn't have anything to do with you, or with us." msgstr "哦，。这和你无关，也和我们无关。" -#: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." -msgstr "好吧，好吧。我曾经有个爱人。我失去了他。" - #: lang/json/talk_topic_from_json.py msgid "All right, fine. I had someone. I lost her." msgstr "好吧，好吧。我曾经有个爱人。我失去了她。" +#: lang/json/talk_topic_from_json.py +msgid "All right, fine. I had someone. I lost him." +msgstr "好吧，好吧。我曾经有个爱人。我失去了他。" + #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"当核弹开始落下，整个世界都变成地狱时，他一个人在家。我当时在工作。我试着回到家中，但整座城市已经变成战区。我我无法描述的怪物们在街道上蹒跚而行，压碎了人们和车辆。士兵们试图阻止它们，但是在交火中击中平民比其他东西要多得多。而因附加伤害而死的人们就会复活加入敌人。如果不是为了我的丈夫，我早就逃跑了，但我尽我所能，悄悄穿过这一切。我最终" +"当核弹开始落下，整个世界都变成地狱时，她一个人在家。我当时在工作。我试着回到家中，但整座城市已经变成战区。我我无法描述的怪物们在街道上蹒跚而行，压碎了人们和车辆。士兵们试图阻止它们，但是在交火中击中平民比其他东西要多得多。而因附加伤害而死的人们就会复活加入敌人。如果不是为了我的妻子，我早就逃跑了，但我尽我所能，悄悄穿过这一切。我最终" " 活着回到了家。" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" -"当核弹开始落下，整个世界都变成地狱时，她一个人在家。我当时在工作。我试着回到家中，但整座城市已经变成战区。我我无法描述的怪物们在街道上蹒跚而行，压碎了人们和车辆。士兵们试图阻止它们，但是在交火中击中平民比其他东西要多得多。而因附加伤害而死的人们就会复活加入敌人。如果不是为了我的妻子，我早就逃跑了，但我尽我所能，悄悄穿过这一切。我最终" +"当核弹开始落下，整个世界都变成地狱时，他一个人在家。我当时在工作。我试着回到家中，但整座城市已经变成战区。我我无法描述的怪物们在街道上蹒跚而行，压碎了人们和车辆。士兵们试图阻止它们，但是在交火中击中平民比其他东西要多得多。而因附加伤害而死的人们就会复活加入敌人。如果不是为了我的丈夫，我早就逃跑了，但我尽我所能，悄悄穿过这一切。我最终" " 活着回到了家。" #: lang/json/talk_topic_from_json.py @@ -162459,28 +162577,28 @@ msgstr "你进到房子里了吗？" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" -"我进去了。花了几个小时才找到一个空档。你想知道最该死的部分是什么吗？经历了这一切之后？我丈夫还活着。他一直躲在地下室里，但被倒塌的地板压住了。当我找到他的时候，他已经失血过多了。我没办法把他弄出来，所以我给了他食物和水，和他呆在一起，牵着他的手，直到他去世。然后……好吧，我做了你现在对死者必须要做的那些事。然后我收起了我生命中的最后几块碎片，我试着再也不回头了。" +"我进去了。花了几个小时才找到一个空档。你想知道最该死的部分是什么吗？经历了这一切之后？我妻子还活着。她一直躲在地下室里，但被倒塌的地板压住了。当我找到她的时候，她已经失血过多了。我没办法把她弄出来，所以我给了她食物和水，和她呆在一起，牵着她的手，直到她去世。然后……好吧，我做了你现在对死者必须要做的那些事。然后我收起了我生命中的最后几块碎片，我试着再也不回头了。" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" -"我进去了。花了几个小时才找到一个空档。你想知道最该死的部分是什么吗？经历了这一切之后？我妻子还活着。她一直躲在地下室里，但被倒塌的地板压住了。当我找到她的时候，她已经失血过多了。我没办法把她弄出来，所以我给了她食物和水，和她呆在一起，牵着她的手，直到她去世。然后……好吧，我做了你现在对死者必须要做的那些事。然后我收起了我生命中的最后几块碎片，我试着再也不回头了。" +"我进去了。花了几个小时才找到一个空档。你想知道最该死的部分是什么吗？经历了这一切之后？我丈夫还活着。他一直躲在地下室里，但被倒塌的地板压住了。当我找到他的时候，他已经失血过多了。我没办法把他弄出来，所以我给了他食物和水，和他呆在一起，牵着他的手，直到他去世。然后……好吧，我做了你现在对死者必须要做的那些事。然后我收起了我生命中的最后几块碎片，我试着再也不回头了。" #: lang/json/talk_topic_from_json.py msgid "" @@ -163158,6 +163276,17 @@ msgid "" msgstr "" "和其他人一样。我背叛了上帝，现在我要付出代价。\"被提\"来了，而我被留下了。所以现在，我想我得留在这个人间地狱里四处游荡。我真希望当初我在主日学校里上能多听点课。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" +"我一个人住，住在城外很远的一间老房子里。我妻子在这一切开始前一个多月就去世了……癌症。如果说现在发生的这一切都有什么好处的话，那就是我终于看到了这么年轻的时候失去她是件好事。反正我那时已经与世隔绝一段时间了。当新闻开始谈论中国的生化武器和卧底特工，并报道在波士顿的骚乱等，我带着我的罐头蜷缩起来，然后换台。" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -163170,17 +163299,6 @@ msgid "" msgstr "" "我一个人住，住在城外很远的一间老房子里。我丈夫在这一切开始前一个多月就去世了……癌症。如果说现在发生的这一切都有什么好处的话，那就是我终于看到了这么年轻的时候失去他是件好事。反正我那时已经与世隔绝一段时间了。当新闻开始谈论中国的生化武器和卧底特工，并报道在波士顿的骚乱等，我带着我的罐头蜷缩起来，然后换台。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" -"我一个人住，住在城外很远的一间老房子里。我妻子在这一切开始前一个多月就去世了……癌症。如果说现在发生的这一切都有什么好处的话，那就是我终于看到了这么年轻的时候失去她是件好事。反正我那时已经与世隔绝一段时间了。当新闻开始谈论中国的生化武器和卧底特工，并报道在波士顿的骚乱等，我带着我的罐头蜷缩起来，然后换台。" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -163265,18 +163383,18 @@ msgstr "听到巴克的这些事我很难过。" msgid "I'm sorry about Buck. " msgstr "听到巴克的这些事我很难过。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." -msgstr "我说过了，你想让我给你讲故事，你得给我喝瓶威士忌。一整瓶，听好了。" - #: lang/json/talk_topic_from_json.py msgid "" "Listen. I'm gonna cut this off short. I work for you, okay? I'm not " "interested in getting attached. You didn't pay me to be your friend." msgstr "听好了，我只会说重点。我只是为你工作，好吗？我对和雇主产生\"羁绊\"不感兴趣。你付的那些钱还不够让我做你的朋友。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." +msgstr "我说过了，你想让我给你讲故事，你得给我喝瓶威士忌。一整瓶，听好了。" + #: lang/json/talk_topic_from_json.py msgid "" "I'm not looking for a friend, but I've paid my dues and earned my way. You " @@ -163597,16 +163715,6 @@ msgid "" msgstr "" "我看到所发生的一切，就立马转身，朝反方向逃跑了。我以前看过很多丧尸题材的电影。我从家里拿了些东西，在一切变糟之前，设法离开了城市。当时我以为自己是个懦夫，但现在我知道，如果那时候留下来帮忙，我只会变成另一具血淋淋的尸体。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " -"peel out of there with his sister - my maid of honor - in her pickup truck " -"as things went bad. So, until I run into them again one way or another, I'm" -" just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." -msgstr "" -"好吧，我有个不切实际的奢望。这可能听起来很蠢，但我看我的未婚夫和他的姐姐，我的伴娘，在一切失控前成功钻进了她的皮卡里离开了。所以，在我再次遇到他们之前，我会继续相信他们依旧在外面某处，活得很好。比我们大多数人都要好。" - #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancée " @@ -163617,10 +163725,24 @@ msgid "" msgstr "" "好吧，我有个不切实际的奢望。这可能听起来很蠢，但我看我的未婚妻和她的哥哥，我的伴郎，在一切失控前成功钻进了他的皮卡里离开了。所以，在我再次遇到他们之前，我会继续相信他们依旧在外面某处，活得很好。比我们大多数人都要好。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancé " +"peel out of there with his sister - my maid of honor - in her pickup truck " +"as things went bad. So, until I run into them again one way or another, I'm" +" just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" +"好吧，我有个不切实际的奢望。这可能听起来很蠢，但我看我的未婚夫和他的姐姐，我的伴娘，在一切失控前成功钻进了她的皮卡里离开了。所以，在我再次遇到他们之前，我会继续相信他们依旧在外面某处，活得很好。比我们大多数人都要好。" + #: lang/json/talk_topic_from_json.py msgid "What were you saying before that?" msgstr "你刚刚还说了什么？" +#: lang/json/talk_topic_from_json.py +msgid "Welcome! You seem new, how can I help you?" +msgstr "欢迎！你是新来的，我能帮你什么忙吗？" + #: lang/json/talk_topic_from_json.py msgid "Hey there." msgstr "嗨，那边那位。" @@ -163641,10 +163763,6 @@ msgstr "欢迎！" msgid "How's the weather?" msgstr "天气怎么样？" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "欢迎！你是新来的，我能帮你什么忙吗？" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "这是哪里？" @@ -163728,13 +163846,6 @@ msgstr "听着，我也有家人。我知道这对你来说很艰难，但我已 msgid "At least I tried." msgstr "至少我试过了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." -msgstr "你得先问我们的领袖，海伦娜。她才是做出这些决定的人。但我说过了，你的机会不大，就像其他人一样。上个成员很久以前就加入了。" - #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " @@ -163744,6 +163855,13 @@ msgid "" msgstr "" "你得先问我们的领袖，海伦娜。她才是做出这些决定的人。但我说过了，你的机会不大，就像其他人一样。如果你早点找到我们的社区，你可能会有更多的机会加入。上个成员几天前才加入。" +#: lang/json/talk_topic_from_json.py +msgid "" +"You have to ask our leader, Helena, first. She's the one who makes those " +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." +msgstr "你得先问我们的领袖，海伦娜。她才是做出这些决定的人。但我说过了，你的机会不大，就像其他人一样。上个成员很久以前就加入了。" + #: lang/json/talk_topic_from_json.py msgid "" "From me? Nothing. But we have a tailor, herbalist and a hunter. Go see " @@ -163790,6 +163908,10 @@ msgstr "" "我们使用宗教圣像作为我们的货币。这些都是在 " "之前制造的，我们社区的名字写在背面。这比旧世界的美元要方便得多，那些在这里只是生火工具而已。" +#: lang/json/talk_topic_from_json.py +msgid "Hey! What are you doing up here? You are not allowed to come here." +msgstr "嘿！你在上面干什么？你不能来这里。" + #: lang/json/talk_topic_from_json.py msgid "You're back." msgstr "你又来了啊。" @@ -163798,10 +163920,6 @@ msgstr "你又来了啊。" msgid "So…?" msgstr "什么事……？" -#: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." -msgstr "嘿！你在上面干什么？你不能来这里。" - #: lang/json/talk_topic_from_json.py msgid "How much food do you have in storage?" msgstr "你们仓库里有多少食物？" @@ -163831,6 +163949,12 @@ msgstr "我能从仓库借点东西吗？" msgid "Has anyone stolen from here?" msgstr "有人偷过这里的东西吗？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." +msgstr "我很抱歉，但这里不允许任何人拿走任何东西。我们很想帮助你，但我们已经有足够多的嘴需要养活了。" + #: lang/json/talk_topic_from_json.py msgid "" "I am afraid you can't. Look, we are running low on our rations, and we " @@ -163838,12 +163962,6 @@ msgid "" "bad, we could've helped you if you had come here earlier." msgstr "恐怕不能。听着，我们的口粮已经越来越少了，我们不能再浪费更多了。即使你只不过是想“借”。太糟了，如果你早点来的话，我们本可以帮你的。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." -msgstr "我很抱歉，但这里不允许任何人拿走任何东西。我们很想帮助你，但我们已经有足够多的嘴需要养活了。" - #: lang/json/talk_topic_from_json.py msgid "I have money." msgstr "我有钱。" @@ -163882,18 +164000,18 @@ msgstr "抱歉，我帮不了你或你的家人。这不是我的食物，你需 msgid "I think I'll be going." msgstr "我想我该走了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." -msgstr "我不知道了。你看，我们之前这里有20个装满非易腐食品的箱子。但那是几个月前的事了。我们快用完了。" - #: lang/json/talk_topic_from_json.py msgid "" "That information is a bit private, but you can see for yourself. We have " "about 20 crates full of non-perishables." msgstr "这个信息有点机密，但你自己也能看到。我们这里有20个装满非易腐食品的箱子。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." +msgstr "我不知道了。你看，我们之前这里有20个装满非易腐食品的箱子。但那是几个月前的事了。我们快用完了。" + #: lang/json/talk_topic_from_json.py msgid "Where did all this food come from?" msgstr "这些食物是从哪里来的？" @@ -163961,14 +164079,14 @@ msgstr "据我所知没有。我没有看到我们的食物供应有任何可疑 msgid "That's good to hear." msgstr "真是个好消息。" -#: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" -msgstr "你是来这里保卫我们的吗？" - #: lang/json/talk_topic_from_json.py msgid "Pleased to meet you." msgstr "很高兴遇见你。" +#: lang/json/talk_topic_from_json.py +msgid "Are you here to protect us?" +msgstr "你是来这里保卫我们的吗？" + #: lang/json/talk_topic_from_json.py msgid "I'm just trying to get by." msgstr "我只是想要活下去。" @@ -164022,14 +164140,14 @@ msgstr "如果我教会了一百个人怎么养兔子，在这些人教会更多 msgid "That's the most hopeful thing I've heard so far." msgstr "这是迄今为止我听到的最令人鼓舞的事情。" -#: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." -msgstr "就和你怎么得到你的一样，我打赌。" - #: lang/json/talk_topic_from_json.py msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "CRISPR？辐射？水里的东西？也许是兔子。" +#: lang/json/talk_topic_from_json.py +msgid "Same way you got yours, I bet." +msgstr "就和你怎么得到你的一样，我打赌。" + #: lang/json/talk_topic_from_json.py msgid "So it goes." msgstr "那就这样把。" @@ -164038,22 +164156,22 @@ msgstr "那就这样把。" msgid "You're disgusting." msgstr "你真恶心！" -#: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." -msgstr "我很抱歉告诉你这件事，但你应该自己照照镜子。" - #: lang/json/talk_topic_from_json.py msgid "Insulting people who could help you is unlikely to aid survival." msgstr "侮辱那些能帮助你的人是不可能帮助你生存的。" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." -msgstr "嘿，。" +msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgstr "我很抱歉告诉你这件事，但你应该自己照照镜子。" #: lang/json/talk_topic_from_json.py msgid "I can't believe my eyes. Please get me outta here…" msgstr "我不敢相信我看到的一切。请把我从这里弄出去……" +#: lang/json/talk_topic_from_json.py +msgid "Hey, ." +msgstr "嘿，。" + #: lang/json/talk_topic_from_json.py msgid "I've come to take you home, lets go." msgstr "我是来带你回家的，咱们走吧。" @@ -164077,18 +164195,18 @@ msgid "Sounds good, Barry." msgstr "听起来不错，巴里。" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." -msgstr "我看见那个徽章了，你最好马上离开这个地方。" +msgid "Hello Ma'am, what brings you here?" +msgstr "你好女士，你来这有什么事吗？" #: lang/json/talk_topic_from_json.py msgid "Hello Sir, what brings you here?" msgstr "你好先生，你来这有什么事吗？" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" -msgstr "你好女士，你来这有什么事吗？" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." +msgstr "我看见那个徽章了，你最好马上离开这个地方。" #: lang/json/talk_topic_from_json.py msgid "Yeah, I'm a Marshal, what are you going to do about it?" @@ -164161,16 +164279,16 @@ msgstr "你的锻炉能用了吗？" msgid "Where can I find Chris?" msgstr "在哪儿能找到克里斯？" +#: lang/json/talk_topic_from_json.py +msgid "Hi, what's up?" +msgstr "你好？" + #: lang/json/talk_topic_from_json.py msgid "" "I see that badge. You need to leave our land, my relatives have no fondness" " for Marshals." msgstr "我看到那个徽章了，你最好马上离开我们的地盘，我家里对执法官没什么好感。" -#: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" -msgstr "你好？" - #: lang/json/talk_topic_from_json.py msgid "" "Hi, Your dad asked me to come find you, said you've been looking for your " @@ -164265,16 +164383,16 @@ msgid "" msgstr "我之前和卢克说过话，他说你对世界末日有些有趣的见解。" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" -msgstr "你身上那个是联邦执法官徽章吗？" +msgid "Hi, what brings you here?" +msgstr "嗨，你有什么事吗？" #: lang/json/talk_topic_from_json.py msgid "Hello, what brings you here?" msgstr "你好，你有什么事吗？" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" -msgstr "嗨，你有什么事吗？" +msgid "Is that a U.S. Marshal's badge you're wearing?" +msgstr "你身上那个是联邦执法官徽章吗？" #: lang/json/talk_topic_from_json.py msgid "Yes, I'm a marshal." @@ -164574,14 +164692,14 @@ msgstr "现在就这些。我们能谈点别的吗？" msgid "That's all for now. I'd best get going." msgstr "现在就这些。我最好还是走吧。" -#: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." -msgstr "离开我们的地盘，执法官。" - #: lang/json/talk_topic_from_json.py msgid "Hello, We don't see many people these days." msgstr "你好，如今我们能碰见的人可是越来越少了。" +#: lang/json/talk_topic_from_json.py +msgid "Leave our property, Marshal." +msgstr "离开我们的地盘，执法官。" + #: lang/json/talk_topic_from_json.py msgid "Hi, it looks like you are doing well here." msgstr "嗨，看起来你们在这过得不错。" @@ -164780,8 +164898,10 @@ msgid "Tell me about your dad." msgstr "和我说说你爸吧。" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "执法官，我希望你是来帮忙的。" +msgid "" +"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 "" @@ -164790,10 +164910,8 @@ msgid "" 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 " -"you'll get out while you can." -msgstr "先生，我不知道你是怎么到这里来的。如果你还有点理智的话，趁现在你还能离开，赶紧走吧。" +msgid "Marshal, I hope you're here to assist us." +msgstr "执法官，我希望你是来帮忙的。" #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -164856,16 +164974,16 @@ 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." -msgstr "执法官，能在这看到你真令人惊讶。" +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "女士，您没有这里的授权……请离开。" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "先生，您没有这里的授权……请离开。" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "女士，您没有这里的授权……请离开。" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "执法官，能在这看到你真令人惊讶。" #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -164903,22 +165021,6 @@ msgstr "" "我正等着上尉给我派个跑腿的人来。这是你要的频率表。从这份表里我们只能看到那些曾经有通讯过的频率， " "但这些通讯大多都加密了，不修复或者替换这里的设备是没法破译的。按标准流程来说，当设施被外敌侵占时，应该破坏加密器，以保护联邦政府机密和保持加密通讯网络的完整。不过我们还是希望能够获得一些明文编码的信息。" -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "你好，执法官。" - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "执法官，恐怕我现在没法和你谈话。" - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "执法官，我不是这里管事的。" - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "执法官，我想你该向我领导问这些问题。" - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "嗨，市民……你不该在这里。" @@ -164931,6 +165033,14 @@ msgstr "你应该管好自己的事，这里没什么好看的。" msgid "If you need something you'll need to talk to someone else." msgstr "如果你想要什么的话，你该找别人去。" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "女士" + +#: lang/json/talk_topic_from_json.py +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 "Sir." msgstr "先生" @@ -164940,12 +165050,20 @@ msgid "Dude, if you can hold your own you should look into enlisting." msgstr "伙计，如果你靠得住，你该去报名参军的。" #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "女士" +msgid "Hello, marshal." +msgstr "你好，执法官。" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" -msgstr "嘿小姐，难道你不觉得应该和我一起才更安全么？" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "执法官，恐怕我现在没法和你谈话。" + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "执法官，我不是这里管事的。" + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." +msgstr "执法官，我想你该向我领导问这些问题。" #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -165002,15 +165120,14 @@ msgid "I've no use for weaklings. Run. Now." msgstr "我对弱者没兴趣。滚吧，立刻。" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "那么，你说服其他人来参加你的疯狂冒险了吗？" +msgid "Please, help me. I need food." +msgstr "拜托，帮帮我。我需要食物。" #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" -msgstr "我很抱歉，在你为了我做了那么多事后还……不过，你能给我点吃的吗？" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" +msgstr "拜托，帮帮我。我需要食物。你不是他们的警长吗？你不能帮帮我吗？" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -165018,13 +165135,14 @@ msgstr "再次感谢你。我真的很感激你给我这些食物。" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" -msgstr "拜托，帮帮我。我需要食物。你不是他们的警长吗？你不能帮帮我吗？" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" +msgstr "我很抱歉，在你为了我做了那么多事后还……不过，你能给我点吃的吗？" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "拜托，帮帮我。我需要食物。" +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "那么，你说服其他人来参加你的疯狂冒险了吗？" #: lang/json/talk_topic_from_json.py msgid "" @@ -165043,15 +165161,15 @@ msgstr "离我远点。" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." -msgstr "他们不让我进去。他们说他们已经满人了。他们让我在这露营，前提是我保持这里干净整洁，不惹事生非，但我只能乞讨为生。" +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +msgstr "他们不让我进去。他们说他们已经满人了。他们让我在这露营，前提是我保持这里干净整洁，不惹事生非，但我实在是太饿了。" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." -msgstr "他们不让我进去。他们说他们已经满人了。他们让我在这露营，前提是我保持这里干净整洁，不惹事生非，但我实在是太饿了。" +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." +msgstr "他们不让我进去。他们说他们已经满人了。他们让我在这露营，前提是我保持这里干净整洁，不惹事生非，但我只能乞讨为生。" #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -165151,16 +165269,16 @@ msgid "" "hurry to face that again." msgstr "感谢你的好意，但是我宁愿在这里等待机会，也不想冒险离开这里了。我记得，我不想再面对它。" +#: lang/json/talk_topic_from_json.py +msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgstr "对不起，我太饿了，不能做出这样的重大决定。" + #: lang/json/talk_topic_from_json.py msgid "" "That's quite the offer, but I don't think I'd survive the trip. I don't " "think you realize how useless I am in this world." msgstr "这是个不错的提议，但我想我没法活着完成这次旅行。我想你没有意识到我在这个世界上有多没用。" -#: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." -msgstr "对不起，我太饿了，不能做出这样的重大决定。" - #: lang/json/talk_topic_from_json.py msgid "I can keep you safe. I'll take you there myself." msgstr "我可以保护你的安全。我带你去。" @@ -165203,17 +165321,17 @@ 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?" -msgstr "我跟你说过硬纸板的事吗，朋友？你有吗？" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "近况如何？我收集的纸箱越来越多了！" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "成功了！购物清单完成了！" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "近况如何？我收集的纸箱越来越多了！" +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…" @@ -165243,16 +165361,16 @@ msgstr "你真的就这么穿着恐龙套装吗？" msgid "Do you need something to eat?" msgstr "你需要吃点什么吗？" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "哦，太好了。嘎吱嘎吱作响。很酷，很酷。" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "是的，我真的很饿，他们在大部分食物里都放了毒品。我看得出来你不是那样的。" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "哦，太好了。嘎吱嘎吱作响。很酷，很酷。" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "我能问你点别的事吗？" @@ -165343,12 +165461,6 @@ msgid "" "have shields up, to protect ourselves." msgstr "你问我能看见什么，但我不知道你能看到些什么。有时候我们会竖起盾牌，来保护自己。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" -msgstr "嗯……从前一切都很美好，但其他人都走了，而现在的主管不让我建我的避难所了。你能帮帮我吗?" - #: lang/json/talk_topic_from_json.py msgid "" "That's it! I'm just gonna need a little time to get it all set up. Thanks." @@ -165356,6 +165468,12 @@ msgid "" "keep me going." msgstr "就是这样！我需要一点时间把它们布置好，谢谢你，你帮了我大忙，我有自信去完成这些事情。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" +msgstr "嗯……从前一切都很美好，但其他人都走了，而现在的主管不让我建我的避难所了。你能帮帮我吗?" + #: lang/json/talk_topic_from_json.py msgid "" "Why don't you leave this place? Come with me, I could use some help out " @@ -165373,16 +165491,19 @@ msgid "" msgstr "不！我才刚刚把所有的东西收集全。我不会走的，至少现在不会。我终于把它们全部凑齐了！" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "滚开，屌人。" +msgid "Don't bother with these assholes." +msgstr "别理那些混蛋们。" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" -msgstr "哟。其他人愿意从这个公共汽车站搬到你的帐篷城吗？" +msgid "Hey there, not-asshole. Good to see you again." +msgstr "嘿，不是混蛋的家伙。很高兴再次见到你。" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." -msgstr "嗨你好，很高兴再次见到你。" +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" +msgstr "听着，之前我不该大发脾气的。你也许是个混蛋，但我相信你那会儿不是故意的。我的血糖太低了，有点暴躁。我们还能友好相处吧？" #: lang/json/talk_topic_from_json.py msgid "" @@ -165391,19 +165512,16 @@ msgid "" msgstr "当心点，我这会正饿着，可能控制不住自己的脾气。" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" -msgstr "听着，之前我不该大发脾气的。你也许是个混蛋，但我相信你那会儿不是故意的。我的血糖太低了，有点暴躁。我们还能友好相处吧？" +msgid "Hey there. Good to see you again." +msgstr "嗨你好，很高兴再次见到你。" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." -msgstr "嘿，不是混蛋的家伙。很高兴再次见到你。" +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgstr "哟。其他人愿意从这个公共汽车站搬到你的帐篷城吗？" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "别理那些混蛋们。" +msgid "Fuck off, dickwaddle." +msgstr "滚开，屌人。" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -165700,6 +165818,12 @@ msgid "" "that?" msgstr "这会非常危险，我冒这个险有什么好处？" +#: lang/json/talk_topic_from_json.py +msgid "" +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." +msgstr "我不知道，科学兴趣？如果你不给我带任何东西，不用担心。正如你所看到的，我在这里完全沉浸在娱乐之中。" + #: lang/json/talk_topic_from_json.py msgid "" "If you get me a sample, I'll join your crazy camp expedition. Hell, if you " @@ -165709,12 +165833,6 @@ msgid "" msgstr "" "如果你带个样本来给我，我就会加入你疯狂的营地探险队。见鬼，如果你给我拿个样本，也许我会帮你建立一个实验室来研究那东西。带来什么样的都可以，但如果这东西真的像你说的那样危险的话，最好带来的不是它的孢子体。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." -msgstr "我不知道，科学兴趣？如果你不给我带任何东西，不用担心。正如你所看到的，我在这里完全沉浸在娱乐之中。" - #: lang/json/talk_topic_from_json.py msgid "It just so happens I have a chunk of fungal matter on me right now." msgstr "真巧，我现在就随身带着一大块真菌。" @@ -165763,14 +165881,14 @@ msgstr "很好。我们走吧，我想多看看这些疯狂的蘑菇。" msgid "I'll see what I can do." msgstr "我看看能做些什么。" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "再次感谢你的帮助，我的朋友。" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "嘿，你相信适者生存吗？" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "再次感谢你的帮助，我的朋友。" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "你为什么这么问？" @@ -165787,18 +165905,18 @@ msgstr "很高兴见到你，怎么了？" msgid "Nice to see you. I gotta be going though." msgstr "很高兴见到你。不过我得走了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." -msgstr "哦，你知道的，和平时一样：坐在这里直到饿死，和戴夫玩牌，诸如此类的事。" - #: lang/json/talk_topic_from_json.py msgid "" "Because I sure ain't fit, so I'm sittin' out here until I starve to death. " "Help a poor sickly soul out?" msgstr "因为我肯定不适合，所以我现在正坐在这里等着被饿死呢。帮帮我这个得病的可怜人吧？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." +msgstr "哦，你知道的，和平时一样：坐在这里直到饿死，和戴夫玩牌，诸如此类的事。" + #: lang/json/talk_topic_from_json.py msgid "I could maybe help you out… want something to eat?" msgstr "我也许能帮你……想吃点什么吗？" @@ -165819,15 +165937,15 @@ msgstr "你如果你得了重病，那你还怎么可能来到这里的？" msgid "Why are you camped out here if they won't let you in?" msgstr "既然他们不让你进去，你为什么还要在这里扎营？" -#: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." -msgstr "太好了，你真是个好人。" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "噢！哇哦！你真是个好人，知道吗？你光有这个想法就很谢谢了。" +#: lang/json/talk_topic_from_json.py +msgid "That's awful kind of you, you really are a wonderful person." +msgstr "太好了，你真是个好人。" + #: lang/json/talk_topic_from_json.py msgid "" "It's good to know there are still people like you in the world, it really " @@ -166107,6 +166225,10 @@ msgstr "好，出发吧。" msgid "What's your take on the situation here?" msgstr "你对这里的情况还有什么看法？" +#: lang/json/talk_topic_from_json.py +msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgstr "哦，呃……嗨。你看上去是新来的。我叫阿莱莎。" + #: lang/json/talk_topic_from_json.py msgid "Oh, hey, it's you again." msgstr "哦，嗨，又是你。" @@ -166119,10 +166241,6 @@ msgstr "你回来了，还活着！哇哦。" msgid "Aw hey, look who's back." msgstr "哦嗨，看看谁回来了。" -#: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." -msgstr "哦，呃……嗨。你看上去是新来的。我叫阿莱莎。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, kid. What's up?" msgstr "很高兴见到你，孩子。怎么了？" @@ -166140,16 +166258,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "你好，阿莱莎。我不能留下来说话。" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "我可不是个孩子了，好吗？我十六岁了。" +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "我可不是个孩子了，好吗？我十四岁了。" #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "我可不是个孩子了，好吗？我十五岁了。" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "我可不是个孩子了，好吗？我十四岁了。" +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "我可不是个孩子了，好吗？我十六岁了。" #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -166159,6 +166277,15 @@ msgstr "抱歉，我这么说没别的意思。怎么了？" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "抱歉，我这么说没别的意思。我马上就走。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" +"我不知道这一切是怎么了。我甚至不知道我们在这里该做些什么。他们说我们应该先在这等，直到我们被转移到楼下的避难所里，但是我们已经在这里好几天了，还没有任何消息说我们还会等多久。这一切都太蠢了，而且没人能给我个解释。" + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -166169,15 +166296,6 @@ msgid "" msgstr "" "我们现在只能站在这里等着，就像一群傻子一样。我们本应该等着下楼去避难所里，但已经过了一个多月了。我可不认为我们还能下去。我也不知道我们能在这里做什么。这里所有的书我都读完了，而外面全是丧尸，所以我们被困在这里了。我们可以在晚上听到它们的声音。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" -"我不知道这一切是怎么了。我甚至不知道我们在这里该做些什么。他们说我们应该先在这等，直到我们被转移到楼下的避难所里，但是我们已经在这里好几天了，还没有任何消息说我们还会等多久。这一切都太蠢了，而且没人能给我个解释。" - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -166217,8 +166335,9 @@ msgid "" msgstr "[感知10]你怎么了？为什么要用假口音和第三人称说话？" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" -msgstr "你好啊，又见面了。" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgstr "哦，天哪，您可真是位漂亮的女士，很高兴见到您。他们叫我阿隆索。" #: lang/json/talk_topic_from_json.py msgid "" @@ -166227,9 +166346,8 @@ msgid "" msgstr "哦，天哪，很高兴看到这里有这么一个强壮英俊的家伙。他们叫我阿隆索。" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." -msgstr "哦，天哪，您可真是位漂亮的女士，很高兴见到您。他们叫我阿隆索。" +msgid "Hello again, gorgeous" +msgstr "你好啊，又见面了。" #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Alonso." @@ -166256,11 +166374,6 @@ msgstr "我也很高兴认识你。您真好，在这个中心呆久了会很孤 msgid "Actually I'm just heading out." msgstr "实际上，我该走了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." -msgstr "好吧，有你在这里就好受多了。很高兴能看到一张熟悉的脸。" - #: lang/json/talk_topic_from_json.py msgid "" "Now that you are here, everything. Is there anything Alonso can… *do for " @@ -166268,26 +166381,31 @@ msgid "" msgstr "既然您来了，一切都好。阿隆索能如何……*为您效劳*呢？" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" -msgstr "你了解我的，我必须做我自己，对吧？" +msgid "" +"Well, it's a lot better now that you're here. Nice to see a familiar face." +msgstr "好吧，有你在这里就好受多了。很高兴能看到一张熟悉的脸。" #: lang/json/talk_topic_from_json.py msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "阿隆索无法自拔，在如此优秀之人面前。" +#: lang/json/talk_topic_from_json.py +msgid "You know me, I gotta be me, right?" +msgstr "你了解我的，我必须做我自己，对吧？" + #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." -msgstr "伙计，你为什么要这样？我只是想弄点神秘感，好吗？没人愿意和一个来自布鲁克林的淫荡的家伙在一起，但神秘的阿隆索那就另当别论了。" +msgstr "小妞，你为什么要这样？我只是想弄点神秘感，好吗？没人愿意和一个来自布鲁克林的淫荡的家伙在一起，但神秘的阿隆索那就另当别论了。" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." -msgstr "小妞，你为什么要这样？我只是想弄点神秘感，好吗？没人愿意和一个来自布鲁克林的淫荡的家伙在一起，但神秘的阿隆索那就另当别论了。" +msgstr "伙计，你为什么要这样？我只是想弄点神秘感，好吗？没人愿意和一个来自布鲁克林的淫荡的家伙在一起，但神秘的阿隆索那就另当别论了。" #: lang/json/talk_topic_from_json.py msgid "And how is that working out for you?" @@ -166313,6 +166431,12 @@ msgstr "好吧。帮你个忙，我会试着成为那个布鲁克林的小子的 msgid "Thanks. I'd better get going." msgstr "谢谢。我得走了。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "阿隆索不愿谈论过去，只想讨论未来。前方的日子会非常黑暗，但是我们在一起或许可以带来一些光明。" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -166321,9 +166445,9 @@ msgstr "你知道吗？我在试着忘记过去。我不喜欢回忆，最好为 #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" -msgstr "阿隆索不愿谈论过去，只想讨论未来。前方的日子会非常黑暗，但是我们在一起或许可以带来一些光明。" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." +msgstr "在这个中心，阿隆索有点孤单。不过，我们有几个像你一样勇敢、坚强的旅行者，看到他们会让阿隆索的生活变得更加光明。" #: lang/json/talk_topic_from_json.py msgid "" @@ -166332,10 +166456,8 @@ msgid "" msgstr "本可更好。我在这个中心并无几个好友，但是看到像你这样的旅行者总能照亮我的心房。" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." -msgstr "在这个中心，阿隆索有点孤单。不过，我们有几个像你一样勇敢、坚强的旅行者，看到他们会让阿隆索的生活变得更加光明。" +msgid "Ah, another new face. Hello. I am Boris." +msgstr "又一个新面孔。你好。我是鲍里斯。" #: lang/json/talk_topic_from_json.py msgid "Well, well. I'm glad you are back." @@ -166349,10 +166471,6 @@ msgstr "你好啊，我的朋友，又见面了。" msgid "It is good to see you again." msgstr "很高兴再次见到你。" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "又一个新面孔。你好。我是鲍里斯。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "很高兴见到你，鲍里斯。" @@ -166421,13 +166539,6 @@ msgstr "对不起。你之前说什么了？" msgid "I'm sorry. I'd better get going." msgstr "对不起。我得走了。" -#: lang/json/talk_topic_from_json.py -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 "好吧，你这么一说我才想到，现在后院清理干净了，我也许可以在那里安顿下来开始工作了。我会考虑一下，回头再找我。" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -166439,6 +166550,13 @@ msgid "" msgstr "" "在室内工作的话，锤子和锯子帮不上什么忙，在室外工作的话，又太危险了。如果有足够的空间让我开工的话，我可以在这里建一些隐私帘。我试过在车库里开间小商店，但每次商队来的时候，我都不得不把所有的东西拆掉搬走，以便让大篷车装卸货物，最后什么也完不成。商队给我们带来食物，所以他们有优先权，这点我不能否认。" +#: lang/json/talk_topic_from_json.py +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 "好吧，你这么一说我才想到，现在后院清理干净了，我也许可以在那里安顿下来开始工作了。我会考虑一下，回头再找我。" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -166468,6 +166586,10 @@ msgstr "关于你让我找的那个酸面团……" msgid "Got any more bread I can trade flour for?" msgstr "我还能用面粉换面包吗？" +#: lang/json/talk_topic_from_json.py +msgid "Hi there. I'm Dana, nice to see a new face." +msgstr "你好啊。我叫达娜，很高兴看到一张新面孔。" + #: lang/json/talk_topic_from_json.py msgid "Hello, nice to see you again." msgstr "哈喽，很高兴又见到你了。" @@ -166476,10 +166598,6 @@ msgstr "哈喽，很高兴又见到你了。" msgid "It's good to see you're still around." msgstr "很高兴看到你还在。" -#: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." -msgstr "你好啊。我叫达娜，很高兴看到一张新面孔。" - #: lang/json/talk_topic_from_json.py msgid "Dana, hey? Nice to meet you." msgstr "达娜，是吗？很高兴见到你。" @@ -166530,9 +166648,11 @@ msgstr "听到你的损失我很难过。" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." -msgstr "自从上次见你之后还没有，很抱歉。过一两天再来吧，我尽量给你留块面包，它们在这很容易消失不见。" +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." +msgstr "有一些。我刚到的时候就做了个酸面团，现在已经可以开始做出不错的面包了。实际上我昨天就已经做了一些，我可以用一块面包跟你交换，嗯，八杯面粉。" #: lang/json/talk_topic_from_json.py msgid "" @@ -166542,11 +166662,9 @@ msgstr "当然，如果你有八杯面粉给我，我很乐意再换给你一块 #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." -msgstr "有一些。我刚到的时候就做了个酸面团，现在已经可以开始做出不错的面包了。实际上我昨天就已经做了一些，我可以用一块面包跟你交换，嗯，八杯面粉。" +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." +msgstr "自从上次见你之后还没有，很抱歉。过一两天再来吧，我尽量给你留块面包，它们在这很容易消失不见。" #: lang/json/talk_topic_from_json.py msgid "That sounds like a great deal, here's some flour for you." @@ -166567,6 +166685,12 @@ msgid "" "that's a lot more than most." msgstr "谢谢你这么说。我已经尽力放下它了……虽然很心痛，但这件事情原本会更严重的。至少巴勃罗和我还在一起，这已经比这里大多数人都好得多了。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "太棒了，这是我做的在本地闻名、但不是很成熟的酸面包。老实说，味道还行。这里的每个人似乎都喜欢它。" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -166588,12 +166712,6 @@ msgid "" "now." msgstr "希望你和我一样喜欢它，这是现在世界上最好的面包了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "太棒了，这是我做的在本地闻名、但不是很成熟的酸面包。老实说，味道还行。这里的每个人似乎都喜欢它。" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -166625,10 +166743,6 @@ msgid "" msgstr "" "即使情况最好时，这里的气氛也很紧张。我们并不是互相了解，所以不是所有人都能相处得很好。我喜欢珍妮和法蒂玛，但仅靠我们三个幸运的有朋友在这里，并不能弥补我们被一堆不熟悉的面孔包围在一个狭小的空间内。有人要杀人了，记住我的话。" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "你去农场问过关于工作的事了吗？" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -166637,6 +166751,10 @@ msgid "" msgstr "" "嗯。我在这里交了几个朋友，但并没有深交，因为我可不想在这里待得更久，特别是没有前途未来，只能指望楼下有人死掉腾出地方的情况下。如果他们真的想要更多人手的话，那听起来确实不错。" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "你去农场问过关于工作的事了吗？" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -166675,16 +166793,16 @@ msgid "" msgstr "" "巴勃罗总是快我一步。我们正想要个孩子，你知道吗？我知道目前这个想法看上去非常疯狂，但是我不会改变计划！你听我说好了：只要你的营地有个医生和一些医疗设备，以防我再次怀孕，我会考虑离开这里去你的营地的。" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "朋友，总是很高兴见到你。" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "看呐，很高兴看到另一张新面孔！ 欢迎来到中心，朋友，我是德拉科。" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "朋友，总是很高兴见到你。" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "很高兴认识你，德拉科。" @@ -166925,15 +167043,15 @@ msgstr "也许我能帮你点忙？" msgid "Well then, I'll leave you here where it's safe." msgstr "好吧，那你就留在个安全港里吧，我该走了。" +#: lang/json/talk_topic_from_json.py +msgid "Man, just imagine what I could do with a new guitar." +msgstr "拜托，想象一下我有一把新吉他之后能做的事情。" + #: lang/json/talk_topic_from_json.py msgid "" "My savior! My patron of the arts! You're always welcome here, friend." msgstr "我的救星！我的艺术赞助人！这里随时欢迎你，朋友。" -#: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." -msgstr "拜托，想象一下我有一把新吉他之后能做的事情。" - #: lang/json/talk_topic_from_json.py msgid "Let's talk about getting you that guitar." msgstr "我们谈谈那把吉他的事。" @@ -167030,18 +167148,18 @@ msgstr "我可以帮忙。" msgid "Find somebody else, dude." msgstr "去找别人吧，伙计。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." -msgstr "好的，不过现在不急。我现在还能撑一阵子。过段时间再问我，也许那会儿我能筹到足够商币给你。" - #: lang/json/talk_topic_from_json.py msgid "" "Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " "up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "太棒了！今天是我的幸运日。让我看看，我能给你些什么……我能替你搜集商币，只要你给我5根大麻烟，或者是等价的叶子。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." +msgstr "好的，不过现在不急。我现在还能撑一阵子。过段时间再问我，也许那会儿我能筹到足够商币给你。" + #: lang/json/talk_topic_from_json.py msgid "You have yourself a deal. Here's the marijuana." msgstr "成交了，这是你的叶子。" @@ -167090,6 +167208,12 @@ msgstr "你是怎么到这里来的？" msgid "Is there anything I can do to help you out?" msgstr "我能帮你什么忙吗？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." +msgstr "嘿，新面孔。我是法蒂玛。我希望你只是来看看的，认识新朋友很好，但是我们没有多余的床位可以分享了。" + #: lang/json/talk_topic_from_json.py msgid "Hello again." msgstr "你好，又见面了。" @@ -167102,12 +167226,6 @@ msgstr "很高兴看到你还在。" msgid "Oh, hi." msgstr "哦，嗨。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." -msgstr "嘿，新面孔。我是法蒂玛。我希望你只是来看看的，认识新朋友很好，但是我们没有多余的床位可以分享了。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you too, Fatima. I'm just passing through." msgstr "很高兴见到你，法蒂玛。我只是路过。" @@ -167174,6 +167292,10 @@ msgid "" msgstr "" "这里气氛很紧张。我想要是我的技能能够派上用场，或是有个安静祈祷的地方的话，我会感觉好很多。在公共场所祈祷有点让我难为情。珍妮在谈论她的一些项目想法，那可以让我重新开始工作，但是我得说外出工作让我感到非常紧张。" +#: lang/json/talk_topic_from_json.py +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgstr "你好，你好。我是加里，加里·维伦纽夫。" + #: lang/json/talk_topic_from_json.py msgid "Well, hello." msgstr "哦，你好。" @@ -167182,10 +167304,6 @@ msgstr "哦，你好。" msgid "Good to see you again." msgstr "很高兴再次见到你。" -#: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." -msgstr "你好，你好。我是加里，加里·维伦纽夫。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Garry." msgstr "很高兴认识你，加里。" @@ -167251,6 +167369,12 @@ msgid "" msgstr "" "这里气氛紧绷，我不知道怎么办。斯坦、鲍里斯和我都很保守。我想我们还是应该了解这里的其他人。一开始我以为我们只是暂时留在这儿，但现在看来我们要在这里呆很长时间了。如果我们能活那么久的话。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." +msgstr "哦，你好。我想我以前没见过你。我是甘尼特，大伙都叫我甘尼。" + #: lang/json/talk_topic_from_json.py msgid "Hi." msgstr "嗨。" @@ -167259,12 +167383,6 @@ msgstr "嗨。" msgid "Hey again." msgstr "嘿，又来了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." -msgstr "哦，你好。我想我以前没见过你。我是甘尼特，大伙都叫我甘尼。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "很高兴见到你，甘尼。" @@ -167313,15 +167431,15 @@ msgid "" msgstr "" "这里糟透了，毫无疑问。其他人仅仅是因为我们戴着头巾而且家庭完整而不愿意同我们说话。他们认为我们既然家庭完整，就没有失去任何东西。我爸也相信这说法，而且我想我妈也对此犹豫不决。" -#: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." -msgstr "很高兴又见到你了。" - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "那边那位，你好啊。以前从没在这见过你。我叫珍妮，珍妮 福斯特。" +#: lang/json/talk_topic_from_json.py +msgid "Nice to see you again." +msgstr "很高兴又见到你了。" + #: lang/json/talk_topic_from_json.py msgid "Nice meeting you. What are you doing on that computer?" msgstr "很高兴认识你。你对着那台电脑做什么？" @@ -167482,6 +167600,16 @@ msgid "" msgstr "" "情况越来越糟了。我们已经在这里呆了几个月了，没有任何变化，也没有任何改善。我们不能出去，我们没有足够的食物，也没有选择，只能各自呆在一起。我不知道在有人崩溃之前我们还能这样呆上多久。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" +"嗯，我们有很多人。我们开始形成一个社区了。法蒂玛和我在一起工作了不少次，我经常和达娜、德拉科和阿莱莎在一起。我不太了解波里申科那伙人、或是辛格一家、或是瓦内萨、陈宛或是莱泽尔，但我们已经谈得够多了。你想知道些什么？" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -167495,16 +167623,6 @@ msgid "" msgstr "" "不管好坏，我们现在是一个社区。法蒂玛和我在一起工作了不少次，而且我认为达娜、德拉科和阿莱莎能称得上是我的朋友，我也自然而然地认识了她丈夫佩德罗。而波里申科一家和我们其他人一样，都是乱七八糟拼成的团队。辛格一家彼此相依为命，但不怎么和其他人来往。瓦内萨和我意见不一，但能有她在我还是很高兴。陈宛和莱泽尔总是为领导层的决定争吵，好像他们决定得了似的。你想知道什么？" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" -"嗯，我们有很多人。我们开始形成一个社区了。法蒂玛和我在一起工作了不少次，我经常和达娜、德拉科和阿莱莎在一起。我不太了解波里申科那伙人、或是辛格一家、或是瓦内萨、陈宛或是莱泽尔，但我们已经谈得够多了。你想知道些什么？" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "你能跟我说说关于自由商会的事情吗？" @@ -167574,6 +167692,15 @@ msgstr "" "嗯，达娜在 " "发生之后不久就失去了她的孩子，大巴翻车了。她很幸运活了下来。我想，她和佩德罗在这里之前经历了一次比我们更艰难的旅行。我们只是刚刚成为朋友，但我很高兴这里还有其他我能真心相处的人。她的丈夫佩德罗还是被吓坏了。他不怎么说话。不过，我喜欢他，每次他开口说话都很搞笑。德拉科只是一个脾气古怪的老家伙，但他还没有真正变老，再给他二十年才会真的变老。我喜欢脾气古怪的老小孩。我们之间的音乐品味也相当相似。阿莱莎是个可爱的孩子，我们大家现在都像是收养了她一般，但她似乎最喜欢和我和达娜在一起。她是一个伟大的艺术家，脑子里充满了疯狂的想法。我想我喜欢她是因为我们所有人中，她似乎最充满希望，一个美好未来的希望。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" +"我猜鲍里斯和加里应该是夫妻。他们不和别人来往，如果你问我，他们似乎有点冷漠。斯坦是鲍里斯的弟弟，猜的，我也不完全确定。他看起来很好，但是个沉默寡言的人。我对他们不是很了解。不过，我学会了不要多管闲事。" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -167587,12 +167714,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" -"我猜鲍里斯和加里应该是夫妻。他们不和别人来往，如果你问我，他们似乎有点冷漠。斯坦是鲍里斯的弟弟，猜的，我也不完全确定。他看起来很好，但是个沉默寡言的人。我对他们不是很了解。不过，我学会了不要多管闲事。" +"我真的不了解他们的事情。除了自己小家庭里的人外，他们从来没有真正和其他任何人交谈过，他们只是坐在自己的角落里说旁遮普语。他们总是看起来很友善，他们做他们份内的事情，只是他们没有其他的社交关系。" #: lang/json/talk_topic_from_json.py msgid "" @@ -167607,12 +167734,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" -"我真的不了解他们的事情。除了自己小家庭里的人外，他们从来没有真正和其他任何人交谈过，他们只是坐在自己的角落里说旁遮普语。他们总是看起来很友善，他们做他们份内的事情，只是他们没有其他的社交关系。" +"瓦内萨……嗯，她是个好人，大概吧。不过我得说，她有点让我发疯，但我们现在被绑在一起，所以我尽量不要太挑剔。尤恩和莱泽尔似乎都想在这里当老大，但我尽量避开那些政治活动，只专注于造东西。我看他们不会有什么好结果。阿隆索很好，他显然对我很感兴趣，他对这里的每个单身女人都有兴趣。在这个小社会里，不关我事。约翰总是一板一眼的老式做派，我想他应该有些更深的背景，但我还没有看到。" #: lang/json/talk_topic_from_json.py msgid "" @@ -167629,26 +167760,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." -msgstr "" -"瓦内萨……嗯，她是个好人，大概吧。不过我得说，她有点让我发疯，但我们现在被绑在一起，所以我尽量不要太挑剔。尤恩和莱泽尔似乎都想在这里当老大，但我尽量避开那些政治活动，只专注于造东西。我看他们不会有什么好结果。阿隆索很好，他显然对我很感兴趣，他对这里的每个单身女人都有兴趣。在这个小社会里，不关我事。约翰总是一板一眼的老式做派，我想他应该有些更深的背景，但我还没有看到。" +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." +msgstr "你好，伙计。他们叫俺克莱门斯。约翰·克莱门斯。俺是个老牛仔。" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "你好，伙计。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "你好，伙计。他们叫俺克莱门斯。约翰·克莱门斯。俺是个老牛仔。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "很高兴见到你，约翰。" @@ -167702,14 +167820,14 @@ msgid "" "we got 'em, it's gonna be tense in here." msgstr "人们没法在没有蓝天的空间里呆太久。像被关在谷仓里的一头牛一样……如果还不懂，俺们需要新鲜空气。在此之前，气氛会很紧张。" -#: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." -msgstr "你好，先生。我是曼迪普·辛格。" - #: lang/json/talk_topic_from_json.py msgid "Hello ma'am. I am Mandeep Singh." msgstr "你好，女士。我是曼迪普·辛格。" +#: lang/json/talk_topic_from_json.py +msgid "Hello sir. I am Mandeep Singh." +msgstr "你好，先生。我是曼迪普·辛格。" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Mandeep." msgstr "很高兴见到你，曼迪普。" @@ -167750,6 +167868,10 @@ msgid "" msgstr "" "很难说。这里没有人是快乐的。我感到有些人对我和我的家人安然无恙地在世界末日后幸存下来而感到妒忌。这件事，也许还有其他一些事情，使我们很难在这里交到亲密的朋友。" +#: lang/json/talk_topic_from_json.py +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgstr "啊！你是新来的。对不起，我是曼加普雷特。" + #: lang/json/talk_topic_from_json.py msgid "Hi there." msgstr "你好。" @@ -167758,10 +167880,6 @@ msgstr "你好。" msgid "Oh, hello there." msgstr "哦，你好。" -#: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." -msgstr "啊！你是新来的。对不起，我是曼加普雷特。" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Mangalpreet." msgstr "很高兴见到你，曼加普雷特。" @@ -167965,15 +168083,15 @@ msgstr "真的吗？我说不定会考虑那里的。跟我的妻子达娜谈谈 msgid "What brings you around here? We don't see a lot of new faces." msgstr "是什么风把你吹来的？我们这里很少见到新面孔。" -#: lang/json/talk_topic_from_json.py -msgid "Need to talk?" -msgstr "想聊聊吗？" - #: lang/json/talk_topic_from_json.py msgid "" "Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "你好。我想我们以前没见过面。我是莱泽尔，人们叫我\"莱\"。" +#: lang/json/talk_topic_from_json.py +msgid "Need to talk?" +msgstr "想聊聊吗？" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Rhy." msgstr "很高兴见到你，莱。" @@ -168066,6 +168184,12 @@ msgstr "" msgid "Do you want to talk about your story?" msgstr "你想分享一下你的故事吗？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." +msgstr "你好，我很抱歉，如果我们之前见过面的话，我已经不记得了。我叫……我叫斯坦。" + #: lang/json/talk_topic_from_json.py msgid "Hm? Oh, hi." msgstr "哈？哦，嗨。" @@ -168074,12 +168198,6 @@ msgstr "哈？哦，嗨。" msgid "...Hi." msgstr "……嗨。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." -msgstr "你好，我很抱歉，如果我们之前见过面的话，我已经不记得了。我叫……我叫斯坦。" - #: lang/json/talk_topic_from_json.py msgid "Stan, hey? Nice to meet you." msgstr "斯坦，是吗？很高兴见到你。" @@ -168192,16 +168310,16 @@ msgstr "嗯……我能稍稍改变一下发型吗？" msgid "Hmm, can we change this shave a little please?" msgstr "嗯……我能稍稍改变一下须型吗？" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "哦，你回来了。" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "哦，太棒了。又来了张吃饭的嘴？好像我们正缺一样。好吧，我是瓦内萨。" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "哦，你回来了。" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "我可不是个只会吃干饭的新人，但也很高兴见到你。" @@ -168238,15 +168356,6 @@ msgstr "你真心想听的话，我可不想在当前一团糟的情况下谈论 msgid "Could you give me a haircut?" msgstr "你能给我理发吗？" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" -"哦，我被困在一个又潮又烂的砖砌建筑物里，和两打陌生人待在一起，整个世界都死了，而且食物不足以支撑我四处走动。至少，这里工作能让我忙起来，而换来的商会币则充实了我的肚子——人们喜欢理发。" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -168256,6 +168365,15 @@ msgid "" msgstr "" "想听风凉话？还是特别风凉版的？我被困在一个又潮又烂的砖砌建筑物里，和两打陌生人待在一起，整个世界都死了，而且食物不足以支撑我四处走动。为啥你自己不去弄弄清楚？" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" +"哦，我被困在一个又潮又烂的砖砌建筑物里，和两打陌生人待在一起，整个世界都死了，而且食物不足以支撑我四处走动。至少，这里工作能让我忙起来，而换来的商会币则充实了我的肚子——人们喜欢理发。" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -168437,12 +168555,6 @@ msgid "" msgstr "" "是啊，情况很棘手。当我们刚来这里的时候，没有谁能真正主管全局，我们让太多的人进来了，这超出了我们能养活和支持的能力。当尘埃落定之后，我们建立了一个小小的秩序，现在楼上还有这么多多人在等待一个能住的地方，可我们已经没有空间了。我们尽量为他们安排了一些地方，但并不理想。" -#: lang/json/talk_topic_from_json.py -msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." -msgstr "是的，我不知道你做了什么来说服他们搬出去，但是我们的供应链和我都非常感谢你们。希望不会太不得体。" - #: lang/json/talk_topic_from_json.py msgid "" "Even once we got things sorted out, there weren't enough beds for everyone, " @@ -168451,6 +168563,12 @@ msgid "" msgstr "" "即使我们把这一切事情都解决了，这里也没有足够的床位给每个人，而且肯定也没有足够的补给。现在我们处境艰难。我们只能提供些力所能及的帮助……至少他们有个安全的地方呆着。" +#: lang/json/talk_topic_from_json.py +msgid "" +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." +msgstr "是的，我不知道你做了什么来说服他们搬出去，但是我们的供应链和我都非常感谢你们。希望不会太不得体。" + #: lang/json/talk_topic_from_json.py msgid "" "Well, there's the downstairs section, we can't fit more people down there so" @@ -168809,14 +168927,14 @@ msgstr "文明点，否则我对你不客气。" 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." -msgstr "女士，你真的不该到处乱跑。" - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "外面很难活下去，不是吗？" +#: lang/json/talk_topic_from_json.py +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 "我听说这是一个难民中心……" @@ -168845,14 +168963,14 @@ msgstr "我想你似乎正在寻求帮助……" msgid "Well, I'd better be going. Bye." msgstr "好吧，我最好先走了。再见。" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "欢迎您，执法官……" - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "欢迎……" +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "欢迎您，执法官……" + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -169091,14 +169209,14 @@ msgid "" msgstr "" "不幸的是，没有。离开的大部分人原本就被困在楼上，他们所承担的风险已经比那些有张安全的床的人要小。地下室里只带出了几个人，当我们开始计划的时候地下室已经太拥挤了。我们希望有更多的人到农场去晒晒太阳，呼吸新鲜空气，干点苦活……但是你可能猜到了，人们更害怕被尸群袭击。" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "你好，执法官……" - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "你好，公民……" +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "你好，执法官……" + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "我能换点补给品吗？" @@ -169155,14 +169273,14 @@ msgid "" "buy from you. I don't suppose you want to donate?" msgstr "我们不能。我们这空不出什么可以卖的东西，我也没有任何从你手里买东西的预算。我想你不会免费赠送的吧？" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "你那闪亮亮的警徽可真漂亮啊！" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "嗨，你看起来像个大人物。" +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "你那闪亮亮的警徽可真漂亮啊！" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "我是新来的。" @@ -169226,16 +169344,16 @@ msgid "" msgstr "" "我不知道啊。不过要按我说，如果你能帮上忙的话，应该能成。但最近的风声很模糊，关键还是得看你问谁。如果我不是在卖东西的话，怕不是早被那个商人给赶出去了。不过……似乎也有例外的家伙。" +#: lang/json/talk_topic_from_json.py +msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgstr "嘘，小点声。这里有些人不欢迎……变种人。这是个意外，别问了。" + #: lang/json/talk_topic_from_json.py msgid "" "Same way you got yours, I bet. Keep quiet about it, some people here look " "down on people like us." msgstr "我打赌就和你得到你的那个一样。别声张，这里的有些人看不起像我们这样的人。" -#: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." -msgstr "嘘，小点声。这里有些人不欢迎……变种人。这是个意外，别问了。" - #: lang/json/talk_topic_from_json.py msgid "Sorry to ask" msgstr "真抱歉不该问你" @@ -169257,22 +169375,22 @@ msgstr "[交易]我要买东西。" msgid "Who needs rebar?" msgstr "谁还会需要钢筋啊？" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "好像你是能说话的人一样，滚。" - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "去你妈的！" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." -msgstr "我似乎闻到了一头蠢猪的味道。开玩笑的……你可别抓我。" +msgid "As if you're one to talk. Screw You." +msgstr "好像你是能说话的人一样，滚。" #: lang/json/talk_topic_from_json.py msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "嘿，我闻到了新来的家伙，我能帮你做点什么？" +#: lang/json/talk_topic_from_json.py +msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "我似乎闻到了一头蠢猪的味道。开玩笑的……你可别抓我。" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "你……闻到了我？" @@ -169550,6 +169668,16 @@ msgstr "我猜你是个大老板。" msgid "Glad to have you aboard." msgstr "欢迎入队。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "站住。我不管你是怎么进来的，但你不能再往前走了。快离开。" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "我们还没改变主意，快走开。" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "所以，你需要什么吗？" @@ -169630,16 +169758,6 @@ msgstr "再说一遍？" msgid "If/you speak to/understand… you/me. Yes?" msgstr "如果……你想讲……理解……你……我。是吧？" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "我们还没改变主意，快走开。" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "站住。我不管你是怎么进来的，但你不能再往前走了。快离开。" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "等等！什么？？" @@ -169921,6 +170039,14 @@ msgstr "啊，我可没空，对不起。" msgid "Keep it civil, merc." msgstr "文明举止，佣兵。" +#: lang/json/talk_topic_from_json.py +msgid "Here to trade, I hope?" +msgstr "我想，你是来交易的吧？" + +#: lang/json/talk_topic_from_json.py +msgid "Safe travels, scavenger." +msgstr "一路平安，拾荒者。" + #: lang/json/talk_topic_from_json.py msgid "" "Still plenty of outlaws in the roads, perhaps you should tend to your job, " @@ -169936,12 +170062,11 @@ msgid "Oh, a U.S. marshal, how quaint." msgstr "哦，一个联邦执法官，稀奇稀奇真稀奇。" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" -msgstr "我想，你是来交易的吧？" - -#: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." -msgstr "一路平安，拾荒者。" +msgid "" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." +msgstr "我们从周围的猎人和农夫聚落手里收集食物，然后提供给这所实验室补给。道路艰难险阻，但获利颇丰，比起去城里搜寻那些残羹剩饭要强得多。" #: lang/json/talk_topic_from_json.py msgid "" @@ -169949,13 +170074,6 @@ msgid "" "fair deal?" msgstr "车走车路，马走马路，各不相干，执法官。很公平不是吗？" -#: lang/json/talk_topic_from_json.py -msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." -msgstr "我们从周围的猎人和农夫聚落手里收集食物，然后提供给这所实验室补给。道路艰难险阻，但获利颇丰，比起去城里搜寻那些残羹剩饭要强得多。" - #: lang/json/talk_topic_from_json.py msgid "Keep safe, then." msgstr "那么，请注意安全。" @@ -170171,16 +170289,16 @@ msgid "I'll talk with them then…" msgstr "好吧，我会去跟他们谈谈……" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "有什么我可以效劳的吗，执法官？" +msgid "Morning ma'am, how can I help you?" +msgstr "早上好，女士，我能帮你什么忙吗？" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "早上好，先生，我能帮你什么忙吗？" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "早上好，女士，我能帮你什么忙吗？" +msgid "Can I help you, marshal?" +msgstr "有什么我可以效劳的吗，执法官？" #: lang/json/talk_topic_from_json.py msgid "" @@ -170288,14 +170406,14 @@ msgstr "你有什么样的工作给我？" msgid "Not now." msgstr "现在还不行。" -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "现在我有点事要做，待会再来吧。" - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "如果你和你的同伴受伤了，我也能帮你看看。" +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "现在我有点事要做，待会再来吧。" + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$200，30分钟]我需要你帮我治疗一下。" @@ -170532,8 +170650,8 @@ msgid "Ok." msgstr "好吧。" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" -msgstr "什么是加密币？" +msgid "Crypto coins? Are you insane, there isn't any global internet now." +msgstr "加密币？你疯了吗，现在已经没有什么互联网了。" #: lang/json/talk_topic_from_json.py msgid "" @@ -170557,11 +170675,12 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" -"我们这里用加密币当钱用。这原本是一次大灾变前的尝试，目的是进一步抽象化货币，创造电子化的现金。我们觉得应该坚持这么做。物物交换还是有局限的。" +"我们这里用加密币当钱用。这原本是一次大灾变前的尝试，目的是进一步抽象化货币，创造电子化的现金。现在看来这些实体加密币真是讽刺的很。但物物交换局限很大，而且总有一天我们会把网络重建起来的。" #: lang/json/talk_topic_from_json.py msgid "Heya, scav." @@ -170655,14 +170774,14 @@ msgstr "祝福你。愿你清除那些不平静之物。" msgid "I must purge this place before I can move on." msgstr "我必须先清理此处之后方能继续前进。" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you again." -msgstr "哦，又是你。" - #: lang/json/talk_topic_from_json.py msgid "Huh? *mumble mumble* … Who are you?" msgstr "哼？*喃喃自语*……你是谁？" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you again." +msgstr "哦，又是你。" + #: lang/json/talk_topic_from_json.py msgid "I'm busy, what is it?" msgstr "我很忙，怎么了？" @@ -170671,14 +170790,14 @@ msgstr "我很忙，怎么了？" msgid "And leave my tower and all my research? I think not." msgstr "然后丢下我这座塔和我所有的研究？我还是不要了。" -#: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." -msgstr "啊，又见面了。" - #: lang/json/talk_topic_from_json.py msgid "Do you seek power as well?" msgstr "你也在追寻能量吗？" +#: lang/json/talk_topic_from_json.py +msgid "Ah, hello again." +msgstr "啊，又见面了。" + #: lang/json/talk_topic_from_json.py msgid "Yes, yes… *electrical crackling* Isn't it beautiful?" msgstr "是的，是的，……*电气爆裂*是不是很漂亮？" @@ -178809,12 +178928,6 @@ msgstr "魔力注入" msgid "mana weaving" msgstr "魔力编织" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "无" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -185178,16 +185291,18 @@ msgstr "[<] %1$d / %2$d页 [>]" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s]排序：%s >" +msgid "< [%s] Sort: %s >" +msgstr "< [%s] 排序：%s >" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F]过滤" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "[%s] 筛选" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R]重置" +#, c-format +msgid "[%s] Reset" +msgstr "[%s] 重置" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -185222,8 +185337,9 @@ msgid "Unsorted (recently added first)" msgstr "未排序（最新的在上面）" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?]显示帮助 >" +#, c-format +msgid "< [%s] Show help >" +msgstr "< [%s] 显示帮助 >" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -188201,6 +188317,13 @@ msgstr "生化能量：%s/%i千焦Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." -msgstr "" -"激活中 ! 查看，=" -" 重新分配， TAB 切换选项卡，s " -"开关节能模式，A 开关自启模式。" +#, c-format +msgid "Activating [%s] Examine, %s" +msgstr "启动中 [%s]查看，%s" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." -msgstr "" -"查看中 ! " -"激活，= 重新分配， TAB " -"切换选项卡，s 开关节能模式，A 开关自启模式。" +#, c-format +msgid "Examining [%s] Activate, %s" +msgstr "查看中 [%s] 启动，%s" #: src/bionics_ui.cpp #, c-format @@ -188327,10 +188438,10 @@ msgstr "你不能在没有燃料的CBM上开关自启模式。" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"你无法激活%s！\n" -"如果要阅读%s的说明，按\"!\"键，然后按\"%c\"键。" +"你无法启动 %s！\n" +"如果要阅读 %s 的说明，按\"%s\"键，然后按\"%c\"键。" #: src/bonuses.cpp msgid "Accuracy" @@ -200649,8 +200760,8 @@ msgid "You can't crack a safe while deaf!" msgstr "你耳朵正聋着呢，开保险箱？不如用砸的！" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" -msgstr "你正戴着耳塞呢，开保险箱？不如用砸的！" +msgid "You can't crack a safe while listening to music!" +msgstr "你正听音乐呢，开保险箱？不如用砸的！" #: src/iexamine.cpp msgid "Attempt to crack the safe?" @@ -202873,13 +202984,8 @@ msgstr "没有可用的选项" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s]筛选" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s]筛选：" +msgid "[%s] Filter: " +msgstr "[%s] 筛选：" #: src/inventory_ui.cpp msgid "Next column" @@ -221466,6 +221572,16 @@ msgid "" "necessary glyphs." msgstr "使用SDL绘制线条而不是Unicode字符绘制线条。如果所选字体不包含绘制线条所必要的字符，请使用此选项。" +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "开启物品描述ASCII艺术画支持" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "开启后，当物品描述中有ASCII艺术画时能够正常显示。" + #: src/options.cpp msgid "Use tiles" msgstr "使用贴图包" @@ -223248,10 +223364,6 @@ msgstr "休息：" msgid "Heat :" msgstr "保暖：" -#: src/panels.cpp -msgid "Sound :" -msgstr "声音：" - #: src/panels.cpp msgid "Deaf!" msgstr "失聪！" @@ -228073,8 +228185,9 @@ msgid "Remove attached curtains first." msgstr "要先移除附带的窗帘。" #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "要先移除附带的部件。" +#, c-format +msgid "Remove the attached %s first." +msgstr "要先移除安装在它上面的 %s。" #: src/vehicle.cpp msgid "Remove battery from mount first." diff --git a/lang/po/zh_TW.po b/lang/po/zh_TW.po index c7a10291f43d4..17293d5885d7d 100644 --- a/lang/po/zh_TW.po +++ b/lang/po/zh_TW.po @@ -1,5 +1,5 @@ # Translators: -# wei-yu chang (かつき) , 2018 +# wei-yu chang , 2018 # Leon Huang , 2018 # 丁 丁 , 2018 # River Hw, 2018 @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: cataclysm-dda 0.D\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-11 22:23+0800\n" +"POT-Creation-Date: 2020-02-15 13:05+0800\n" "PO-Revision-Date: 2018-04-26 14:47+0000\n" "Last-Translator: 為勳 周 , 2020\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/cataclysm-dda-translators/teams/2217/zh_TW/)\n" @@ -666,7 +666,7 @@ msgid "oxygen" msgid_plural "oxygen" msgstr[0] "氧氣" -#. ~ Description for oxygen +#. ~ Description for {'str': 'oxygen', 'str_pl': 'oxygen'} #: lang/json/AMMO_from_json.py msgid "A canister of oxygen." msgstr "一罐氧氣。" @@ -743,7 +743,7 @@ msgid "nitrox" msgid_plural "nitrox" msgstr[0] "高氧" -#. ~ Description for nitrox +#. ~ Description for {'str': 'nitrox', 'str_pl': 'nitrox'} #: lang/json/AMMO_from_json.py msgid "Mixture of oxygen and nitrogen in proportions suitable for diving." msgstr "氧氣和氮氣以特定比例混和，用於潛水。" @@ -753,7 +753,7 @@ msgid "tinder" msgid_plural "tinder" msgstr[0] "火種" -#. ~ Description for tinder +#. ~ Description for {'str': 'tinder', 'str_pl': 'tinder'} #: lang/json/AMMO_from_json.py msgid "Flammable material, finely divided for easy combustion." msgstr "易燃材料, 為了方便點燃而分成碎塊。" @@ -773,7 +773,7 @@ msgid "metal RPG die" msgid_plural "metal RPG dice" msgstr[0] "金屬骰子" -#. ~ Description for metal RPG die +#. ~ Description for {'str': 'metal RPG die', 'str_pl': 'metal RPG dice'} #: lang/json/AMMO_from_json.py msgid "A metal die used to play various role-playing games" msgstr "這金屬骰子用於各種角色扮演遊戲" @@ -805,7 +805,7 @@ msgid "sulfur" msgid_plural "sulfur" msgstr[0] "硫磺" -#. ~ Description for sulfur +#. ~ Description for {'str': 'sulfur', 'str_pl': 'sulfur'} #: lang/json/AMMO_from_json.py msgid "" "A handful of pure sulfur. Primarily used to make battery acid, sulfur is " @@ -842,7 +842,7 @@ msgid "limestone" msgid_plural "limestone" msgstr[0] "石灰石" -#. ~ Description for limestone +#. ~ Description for {'str': 'limestone', 'str_pl': 'limestone'} #: lang/json/AMMO_from_json.py msgid "" "A handful of small chunks of limestone. Useful for experiments at science " @@ -855,7 +855,7 @@ msgid "quicklime" msgid_plural "quicklime" msgstr[0] "生石灰" -#. ~ Description for quicklime +#. ~ Description for {'str': 'quicklime', 'str_pl': 'quicklime'} #: lang/json/AMMO_from_json.py msgid "" "The product of burning limestone, this white powder is a crucial ingredient " @@ -871,7 +871,7 @@ msgid "sand" msgid_plural "sand" msgstr[0] "沙子" -#. ~ Description for sand +#. ~ Description for {'str': 'sand', 'str_pl': 'sand'} #: lang/json/AMMO_from_json.py msgid "" "A handful of New England sand. If you had a stoked furnace, you could turn " @@ -883,7 +883,7 @@ msgid "soil" msgid_plural "soil" msgstr[0] "土壤" -#. ~ Description for soil +#. ~ Description for {'str': 'soil', 'str_pl': 'soil'} #: lang/json/AMMO_from_json.py msgid "" "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, " @@ -909,7 +909,7 @@ msgid "zinc powder" msgid_plural "zinc powder" msgstr[0] "鋅粉" -#. ~ Description for zinc powder +#. ~ Description for {'str': 'zinc powder', 'str_pl': 'zinc powder'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc powder. While commercially used mostly in cosmetics and " @@ -922,7 +922,7 @@ msgid "zinc oxide" msgid_plural "zinc oxide" msgstr[0] "氧化鋅" -#. ~ Description for zinc oxide +#. ~ Description for {'str': 'zinc oxide', 'str_pl': 'zinc oxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of zinc oxide. It can be reduced into zinc, or used for some " @@ -934,7 +934,8 @@ msgid "manganese dioxide" msgid_plural "manganese dioxide" msgstr[0] "二氧化錳" -#. ~ Description for manganese dioxide +#. ~ Description for {'str': 'manganese dioxide', 'str_pl': 'manganese +#. dioxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of manganese dioxide powder. Occurring naturally in the mineral " @@ -947,7 +948,8 @@ msgid "potassium chloride" msgid_plural "potassium chloride" msgstr[0] "氯化鉀" -#. ~ Description for potassium chloride +#. ~ Description for {'str': 'potassium chloride', 'str_pl': 'potassium +#. chloride'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium chloride. Although it occurs naturally in the " @@ -961,7 +963,8 @@ msgid "potassium hydroxide" msgid_plural "potassium hydroxide" msgstr[0] "氫氧化鉀" -#. ~ Description for potassium hydroxide +#. ~ Description for {'str': 'potassium hydroxide', 'str_pl': 'potassium +#. hydroxide'} #: lang/json/AMMO_from_json.py msgid "" "A handful of potassium hydroxide. Commonly called caustic potash, it was " @@ -974,7 +977,7 @@ msgid "sulfuric acid" msgid_plural "sulfuric acid" msgstr[0] "硫酸" -#. ~ Description for sulfuric acid +#. ~ Description for {'str': 'sulfuric acid', 'str_pl': 'sulfuric acid'} #: lang/json/AMMO_from_json.py msgid "" "Sulfuric acid: viscous, foul-smelling and extremely corrosive, particularly " @@ -1017,7 +1020,7 @@ msgid "nitric acid" msgid_plural "nitric acid" msgstr[0] "硝酸" -#. ~ Description for nitric acid +#. ~ Description for {'str': 'nitric acid', 'str_pl': 'nitric acid'} #: lang/json/AMMO_from_json.py msgid "" "Nitric acid, a strong oxidant and extremely corrosive material. Mainly used" @@ -1113,7 +1116,7 @@ msgid "saltpeter" msgid_plural "saltpeter" msgstr[0] "硝酸鉀" -#. ~ Description for saltpeter +#. ~ Description for {'str': 'saltpeter', 'str_pl': 'saltpeter'} #: lang/json/AMMO_from_json.py msgid "" "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous " @@ -1126,7 +1129,7 @@ msgid "niter" msgid_plural "niter" msgstr[0] "硝石" -#. ~ Description for niter +#. ~ Description for {'str': 'niter', 'str_pl': 'niter'} #: lang/json/AMMO_from_json.py msgid "" "A large crystal of niter, the mineral form of potassium nitrate. It can be " @@ -1185,7 +1188,7 @@ msgid "thermite" msgid_plural "thermite" msgstr[0] "鋁熱劑" -#. ~ Description for thermite +#. ~ Description for {'str': 'thermite', 'str_pl': 'thermite'} #: lang/json/AMMO_from_json.py msgid "" "A handful of silvery-greenish powder, produced by mixing aluminum and " @@ -1232,7 +1235,8 @@ msgid "match head powder" msgid_plural "match head powder" msgstr[0] "火柴頭粉" -#. ~ Description for match head powder +#. ~ Description for {'str': 'match head powder', 'str_pl': 'match head +#. powder'} #: lang/json/AMMO_from_json.py msgid "" "Some match head powder from match heads, similar to black gunpowder but a " @@ -1296,7 +1300,7 @@ msgid "soap flakes" msgid_plural "soap flakes" msgstr[0] "肥皂片" -#. ~ Description for soap flakes +#. ~ Description for {'str': 'soap flakes', 'str_pl': 'soap flakes'} #: lang/json/AMMO_from_json.py msgid "A bar of soap cut into flakes suitable for use in a washing machine." msgstr "一塊肥皂，切成薄片，適合在洗衣機中使用。" @@ -1318,7 +1322,7 @@ msgid "wood ash" msgid_plural "wood ashes" msgstr[0] "灰燼" -#. ~ Description for wood ash +#. ~ Description for {'str': 'wood ash', 'str_pl': 'wood ashes'} #: lang/json/AMMO_from_json.py msgid "" "This is almost weightless residue left after the burning of some substance." @@ -1422,7 +1426,7 @@ msgid "lamp oil" msgid_plural "lamp oil" msgstr[0] "燈油" -#. ~ Description for lamp oil +#. ~ Description for {'str': 'lamp oil', 'str_pl': 'lamp oil'} #: lang/json/AMMO_from_json.py msgid "A thin and clean-burning oil made for use in oil lamps." msgstr "一份無煙輕油, 適用於油燈。" @@ -1432,7 +1436,7 @@ msgid "motor oil" msgid_plural "motor oil" msgstr[0] "機油" -#. ~ Description for motor oil +#. ~ Description for {'str': 'motor oil', 'str_pl': 'motor oil'} #: lang/json/AMMO_from_json.py msgid "An oil made for use in car engines." msgstr "用於汽車引擎的油。" @@ -1442,7 +1446,7 @@ msgid "napalm" msgid_plural "napalm" msgstr[0] "凝固汽油" -#. ~ Description for napalm +#. ~ Description for {'str': 'napalm', 'str_pl': 'napalm'} #: lang/json/AMMO_from_json.py msgid "" "This is gasoline mixed with some other components to make it stick to the " @@ -4424,7 +4428,7 @@ msgid "red paint" msgid_plural "red paint" msgstr[0] "紅色油漆" -#. ~ Description for red paint +#. ~ Description for {'str': 'red paint', 'str_pl': 'red paint'} #: lang/json/AMMO_from_json.py msgid "A can of red paint." msgstr "一罐紅色油漆。" @@ -4444,7 +4448,7 @@ msgid "white paint" msgid_plural "white paint" msgstr[0] "白色油漆" -#. ~ Description for white paint +#. ~ Description for {'str': 'white paint', 'str_pl': 'white paint'} #: lang/json/AMMO_from_json.py msgid "A can of white paint." msgstr "一罐白色油漆。" @@ -4464,7 +4468,7 @@ msgid "purple paint" msgid_plural "purple paint" msgstr[0] "紫色油漆" -#. ~ Description for purple paint +#. ~ Description for {'str': 'purple paint', 'str_pl': 'purple paint'} #: lang/json/AMMO_from_json.py msgid "A can of purple paint." msgstr "一罐紫色油漆。" @@ -4474,7 +4478,7 @@ msgid "yellow paint" msgid_plural "yellow paint" msgstr[0] "黃色油漆" -#. ~ Description for yellow paint +#. ~ Description for {'str': 'yellow paint', 'str_pl': 'yellow paint'} #: lang/json/AMMO_from_json.py msgid "A can of yellow paint." msgstr "一罐黃色油漆。" @@ -4542,7 +4546,7 @@ msgid_plural "gold" msgstr[0] "金塊" #. ~ Description for {'str': 'gold', 'str_pl': 'gold'} -#. ~ Description for platinum +#. ~ Description for {'str': 'platinum', 'str_pl': 'platinum'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the apocalypse this would've been worth a small " @@ -4559,7 +4563,7 @@ msgid "zinc" msgid_plural "zinc" msgstr[0] "鋅" -#. ~ Description for zinc +#. ~ Description for {'str': 'zinc', 'str_pl': 'zinc'} #: lang/json/AMMO_from_json.py msgid "" "A slightly brittle metal. Apart from being an essential mineral that the " @@ -4573,7 +4577,7 @@ msgid "lead" msgid_plural "lead" msgstr[0] "鉛" -#. ~ Description for lead +#. ~ Description for {'str': 'lead', 'str_pl': 'lead'} #: lang/json/AMMO_from_json.py msgid "" "A soft dull metal known since ancient times. Due to its malleability it has" @@ -4585,7 +4589,7 @@ msgid "magnesium powder" msgid_plural "magnesium powder" msgstr[0] "鎂粉" -#. ~ Description for magnesium powder +#. ~ Description for {'str': 'magnesium powder', 'str_pl': 'magnesium powder'} #: lang/json/AMMO_from_json.py msgid "" "A gray powder composed of the highly flammable alkaline earth metal " @@ -4597,7 +4601,7 @@ msgid "silver" msgid_plural "silver" msgstr[0] "銀塊" -#. ~ Description for silver +#. ~ Description for {'str': 'silver', 'str_pl': 'silver'} #: lang/json/AMMO_from_json.py msgid "" "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its " @@ -4770,7 +4774,7 @@ msgid "leather scraps" msgid_plural "leather scraps" msgstr[0] "皮革下腳料" -#. ~ Description for leather scraps +#. ~ Description for {'str': 'leather scraps', 'str_pl': 'leather scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of leather, waste material from tailoring " @@ -4782,7 +4786,7 @@ msgid "lycra scraps" msgid_plural "lycra scraps" msgstr[0] "萊卡下腳料" -#. ~ Description for lycra scraps +#. ~ Description for {'str': 'lycra scraps', 'str_pl': 'lycra scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of lycra, waste material from tailoring projects." @@ -4794,7 +4798,7 @@ msgid "neoprene scraps" msgid_plural "neoprene scraps" msgstr[0] "橡膠下腳料" -#. ~ Description for neoprene scraps +#. ~ Description for {'str': 'neoprene scraps', 'str_pl': 'neoprene scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of neoprene, waste material from tailoring " @@ -4806,7 +4810,8 @@ msgid "synthetic fabric scraps" msgid_plural "synthetic fabric scraps" msgstr[0] "合成纖維下腳料" -#. ~ Description for synthetic fabric scraps +#. ~ Description for {'str': 'synthetic fabric scraps', 'str_pl': 'synthetic +#. fabric scraps'} #: lang/json/AMMO_from_json.py msgid "" "Oddly-shaped smallish bits of synthetic fabric, waste material from " @@ -4841,7 +4846,8 @@ msgid "patchwork cotton clothing parts" msgid_plural "patchwork cotton clothing parts" msgstr[0] "" -#. ~ Description for patchwork cotton clothing parts +#. ~ Description for {'str': 'patchwork cotton clothing parts', 'str_pl': +#. 'patchwork cotton clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from cotton patches in " @@ -4863,7 +4869,8 @@ msgid "patchwork faux fur clothing parts" msgid_plural "patchwork faux fur clothing parts" msgstr[0] "" -#. ~ Description for patchwork faux fur clothing parts +#. ~ Description for {'str': 'patchwork faux fur clothing parts', 'str_pl': +#. 'patchwork faux fur clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from faux fur patches " @@ -4885,7 +4892,8 @@ msgid "patchwork felt clothing parts" msgid_plural "patchwork felt clothing parts" msgstr[0] "" -#. ~ Description for patchwork felt clothing parts +#. ~ Description for {'str': 'patchwork felt clothing parts', 'str_pl': +#. 'patchwork felt clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from felt patches in a " @@ -4920,7 +4928,8 @@ msgid "patchwork lycra clothing parts" msgid_plural "patchwork lycra clothing parts" msgstr[0] "" -#. ~ Description for patchwork lycra clothing parts +#. ~ Description for {'str': 'patchwork lycra clothing parts', 'str_pl': +#. 'patchwork lycra clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from lycra patches in a" @@ -4945,7 +4954,8 @@ msgid "patchwork neoprene clothing parts" msgid_plural "patchwork neoprene clothing parts" msgstr[0] "" -#. ~ Description for patchwork neoprene clothing parts +#. ~ Description for {'str': 'patchwork neoprene clothing parts', 'str_pl': +#. 'patchwork neoprene clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from neoprene patches " @@ -4970,7 +4980,8 @@ msgid "patchwork Nomex clothing parts" msgid_plural "patchwork Nomex clothing parts" msgstr[0] "" -#. ~ Description for patchwork Nomex clothing parts +#. ~ Description for {'str': 'patchwork Nomex clothing parts', 'str_pl': +#. 'patchwork Nomex clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together with Nomex thread from " @@ -4992,7 +5003,8 @@ msgid "patchwork synthetic fabric clothing parts" msgid_plural "patchwork synthetic fabric clothing parts" msgstr[0] "" -#. ~ Description for patchwork synthetic fabric clothing parts +#. ~ Description for {'str': 'patchwork synthetic fabric clothing parts', +#. 'str_pl': 'patchwork synthetic fabric clothing parts'} #: lang/json/AMMO_from_json.py msgid "" "A selection of various clothing parts, sewn together from synthetic fabric " @@ -6719,12 +6731,14 @@ msgid_plural "ammo satchels" msgstr[0] "彈藥挎包" #. ~ Use action holster_msg for ammo satchel. -#. ~ Use action holster_msg for chest ammo pouch. -#. ~ Use action holster_msg for chest rig. -#. ~ Use action holster_msg for javelin bag. +#. ~ Use action holster_msg for {'str': 'chest ammo pouch', 'str_pl': 'chest +#. ammo pouches'}. +#. ~ Use action holster_msg for {'str': 'chest rig', 'str_pl': 'chest rig'}. +#. ~ Use action holster_msg for {'str': 'javelin bag'}. #. ~ Use action holster_msg for {'str': 'ankle ammo pouch', 'str_pl': 'ankle #. ammo pouches'}. -#. ~ Use action holster_msg for leg ammo pouch. +#. ~ Use action holster_msg for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo +#. pouches'}. #. ~ Use action holster_msg for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_msg for {'str': 'MBR vest (ceramic plates)', 'str_pl': @@ -6739,7 +6753,8 @@ msgstr[0] "彈藥挎包" #. 'MBR vests (superalloy)'}. #. ~ Use action holster_msg for tac vest. #. ~ Use action holster_msg for XL kevlar vest. -#. ~ Use action holster_msg for large grenade pouch. +#. ~ Use action holster_msg for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #. ~ Use action holster_msg for MBR vest (titanium). #. ~ Use action holster_msg for javelin bag. #: lang/json/ARMOR_from_json.py @@ -6748,11 +6763,14 @@ msgid "You stash your %s." msgstr "你把你的 %s 存放好。" #. ~ Use action holster_prompt for ammo satchel. -#. ~ Use action holster_prompt for chest ammo pouch. -#. ~ Use action holster_prompt for chest rig. +#. ~ Use action holster_prompt for {'str': 'chest ammo pouch', 'str_pl': +#. 'chest ammo pouches'}. +#. ~ Use action holster_prompt for {'str': 'chest rig', 'str_pl': 'chest +#. rig'}. #. ~ Use action holster_prompt for {'str': 'ankle ammo pouch', 'str_pl': #. 'ankle ammo pouches'}. -#. ~ Use action holster_prompt for leg ammo pouch. +#. ~ Use action holster_prompt for {'str': 'leg ammo pouch', 'str_pl': 'leg +#. ammo pouches'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (empty)', 'str_pl': 'MBR #. vests (empty)'}. #. ~ Use action holster_prompt for {'str': 'MBR vest (ceramic plates)', @@ -6784,7 +6802,8 @@ msgid "chest ammo pouch" msgid_plural "chest ammo pouches" msgstr[0] "胸部彈藥袋" -#. ~ Description for chest ammo pouch +#. ~ Description for {'str': 'chest ammo pouch', 'str_pl': 'chest ammo +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your chest which is capable of " @@ -6796,7 +6815,7 @@ msgid "chest rig" msgid_plural "chest rig" msgstr[0] "胸掛背心" -#. ~ Description for chest rig +#. ~ Description for {'str': 'chest rig', 'str_pl': 'chest rig'} #: lang/json/ARMOR_from_json.py msgid "" "Popularized during the Vietnam War, chest rigs like these are typically " @@ -6810,12 +6829,13 @@ msgid "javelin bag" msgid_plural "javelin bags" msgstr[0] "標槍袋" +#. ~ Use action holster_prompt for {'str': 'javelin bag'}. #. ~ Use action holster_prompt for javelin bag. #: lang/json/ARMOR_from_json.py msgid "Stash javelins" msgstr "存放標槍" -#. ~ Description for javelin bag +#. ~ Description for {'str': 'javelin bag'} #: lang/json/ARMOR_from_json.py msgid "" "An open medieval-looking bag, designed to store javelins for easy reach." @@ -6839,7 +6859,7 @@ msgid "leg ammo pouch" msgid_plural "leg ammo pouches" msgstr[0] "腿掛式彈藥袋" -#. ~ Description for leg ammo pouch +#. ~ Description for {'str': 'leg ammo pouch', 'str_pl': 'leg ammo pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A fabric ammo pouch that can be strapped to your leg and capable of holding " @@ -7014,7 +7034,8 @@ msgid "pair of 2-by-arm guards" msgid_plural "pairs of 2-by-arm guards" msgstr[0] "木材護手" -#. ~ Description for pair of 2-by-arm guards +#. ~ Description for {'str': 'pair of 2-by-arm guards', 'str_pl': 'pairs of 2 +#. -by-arm guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised arm guards made from broken pieces of a two by four " @@ -7280,7 +7301,7 @@ msgid "grenade pouch" msgid_plural "grenade pouches" msgstr[0] "榴彈袋" -#. ~ Description for grenade pouch +#. ~ Description for {'str': 'grenade pouch', 'str_pl': 'grenade pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A small pouch for storing cartridge grenades with straps for attaching it to" @@ -7304,12 +7325,14 @@ msgid "large grenade pouch" msgid_plural "large grenade pouches" msgstr[0] "大型榴彈袋" -#. ~ Use action holster_prompt for large grenade pouch. +#. ~ Use action holster_prompt for {'str': 'large grenade pouch', 'str_pl': +#. 'large grenade pouches'}. #: lang/json/ARMOR_from_json.py msgid "Stash grenades" msgstr "存放榴彈" -#. ~ Description for large grenade pouch +#. ~ Description for {'str': 'large grenade pouch', 'str_pl': 'large grenade +#. pouches'} #: lang/json/ARMOR_from_json.py msgid "A pouch for holding up to four full-sized grenades of various types." msgstr "一個袋子, 可容納多達四個各種類型的全尺寸手榴彈。" @@ -7693,6 +7716,8 @@ msgid "pair of armored boots" msgid_plural "pairs of armored boots" msgstr[0] "裝甲靴" +#. ~ Description for {'str': 'pair of armored boots', 'str_pl': 'pairs of +#. armored boots'} #. ~ Description for pair of armored boots #: lang/json/ARMOR_from_json.py msgid "An extremely heavy set of armor plated boots." @@ -7782,6 +7807,8 @@ msgid "pair of XL survivor boots" msgid_plural "pairs of XL survivor boots" msgstr[0] "XL 生存者靴" +#. ~ Description for {'str': 'pair of XL survivor boots', 'str_pl': 'pairs of +#. XL survivor boots'} #. ~ Description for pair of XL survivor boots #: lang/json/ARMOR_from_json.py msgid "" @@ -8182,7 +8209,8 @@ msgid "pair of ankle socks" msgid_plural "pairs of ankle socks" msgstr[0] "" -#. ~ Description for pair of ankle socks +#. ~ Description for {'str': 'pair of ankle socks', 'str_pl': 'pairs of ankle +#. socks'} #: lang/json/ARMOR_from_json.py msgid "" "Short socks, commonly used for sports. These are designed to protect your " @@ -9363,7 +9391,8 @@ msgid "pair of armored fingerless gloves" msgid_plural "pairs of armored fingerless gloves" msgstr[0] "裝甲露指手套" -#. ~ Description for pair of armored fingerless gloves +#. ~ Description for {'str': 'pair of armored fingerless gloves', 'str_pl': +#. 'pairs of armored fingerless gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of leather gloves with no fingers, allowing greater manual dexterity." @@ -9639,7 +9668,8 @@ msgid "pair of XL survivor gloves" msgid_plural "pairs of XL survivor gloves" msgstr[0] "XL 生存者手套" -#. ~ Description for pair of XL survivor gloves +#. ~ Description for {'str': 'pair of XL survivor gloves', 'str_pl': 'pairs of +#. XL survivor gloves'} #: lang/json/ARMOR_from_json.py msgid "" "A massive pair of customized, Kevlar armored leather gloves, modified to be " @@ -9958,7 +9988,7 @@ msgid "kippah" msgid_plural "kippahs" msgstr[0] "猶太帽" -#. ~ Description for kippah +#. ~ Description for {'str': 'kippah'} #: lang/json/ARMOR_from_json.py msgid "A thin, rounded skullcap. A traditional headdress in Judaism." msgstr "一頂薄型無邊圓帽。是猶太教的傳統頭飾。" @@ -9968,7 +9998,7 @@ msgid "kufi cap" msgid_plural "kufi caps" msgstr[0] "庫法體帽" -#. ~ Description for kufi cap +#. ~ Description for {'str': 'kufi cap'} #: lang/json/ARMOR_from_json.py msgid "A brimless, short and rounded cap." msgstr "一頂無帽簷的短圓帽。" @@ -10241,7 +10271,7 @@ msgid "galea" msgid_plural "galeae" msgstr[0] "羅馬頭盔" -#. ~ Description for galea +#. ~ Description for {'str': 'galea', 'str_pl': 'galeae'} #: lang/json/ARMOR_from_json.py msgid "" "An Imperial Roman helmet, with distinct projections protecting the sides of " @@ -10845,7 +10875,7 @@ msgid "diver's watch" msgid_plural "diver's watches" msgstr[0] "潛水手錶" -#. ~ Description for diver's watch +#. ~ Description for {'str': "diver's watch", 'str_pl': "diver's watches"} #: lang/json/ARMOR_from_json.py msgid "" "A waterproof, self-winding watch on a stainless steel watchband. Tells the " @@ -14424,7 +14454,8 @@ msgid "pair of 2-by-shin guards" msgid_plural "pairs of 2-by-shin guards" msgstr[0] "木材護腿" -#. ~ Description for pair of 2-by-shin guards +#. ~ Description for {'str': 'pair of 2-by-shin guards', 'str_pl': 'pairs of 2 +#. -by-shin guards'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of improvised shin guards made from broken pieces of a two by four " @@ -14449,7 +14480,8 @@ msgid "chainmail leggings" msgid_plural "pairs of chainmail leggings" msgstr[0] "鏈甲護腿" -#. ~ Description for chainmail leggings +#. ~ Description for {'str': 'chainmail leggings', 'str_pl': 'pairs of +#. chainmail leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Customized chainmail legs. Their straps keep everything in place, and the " @@ -14461,7 +14493,7 @@ msgid "leather chaps" msgid_plural "leather chaps" msgstr[0] "皮革護腿" -#. ~ Description for leather chaps +#. ~ Description for {'str': 'leather chaps', 'str_pl': 'leather chaps'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather chaps. Very tough and light, but doesn't offer any " @@ -14473,7 +14505,7 @@ msgid "fencing pants" msgid_plural "fencing pants" msgstr[0] "擊劍長褲" -#. ~ Description for fencing pants +#. ~ Description for {'str': 'fencing pants', 'str_pl': 'fencing pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of reinforced pants used by fencers to prevent injuries." msgstr "一件供擊劍運動員使用的強化長褲, 用於防止受傷。" @@ -14558,7 +14590,8 @@ msgid "light survivor cargo pants" msgid_plural "light survivor cargo pants" msgstr[0] "輕型生存者工裝長褲" -#. ~ Description for light survivor cargo pants +#. ~ Description for {'str': 'light survivor cargo pants', 'str_pl': 'light +#. survivor cargo pants'} #: lang/json/ARMOR_from_json.py msgid "" "Lightweight, Kevlar armored cargo pants designed to hold as much as " @@ -14570,7 +14603,8 @@ msgid "motorcycle pants" msgid_plural "pairs of motorcycle pants" msgstr[0] "摩托車長褲" -#. ~ Description for motorcycle pants +#. ~ Description for {'str': 'motorcycle pants', 'str_pl': 'pairs of +#. motorcycle pants'} #: lang/json/ARMOR_from_json.py msgid "A pair of pants designed for dirt bikers and motorcyclists." msgstr "一件供越野自行車與摩托車騎士使用的長褲。" @@ -14604,7 +14638,7 @@ msgid "breeches" msgid_plural "breeches" msgstr[0] "馬褲" -#. ~ Description for breeches +#. ~ Description for {'str': 'breeches', 'str_pl': 'breeches'} #: lang/json/ARMOR_from_json.py msgid "" "A well-made pair of old-fashioned pants, made of stiff yet baggy material. " @@ -14626,7 +14660,7 @@ msgid "hot pants" msgid_plural "hot pants" msgstr[0] "熱褲" -#. ~ Description for hot pants +#. ~ Description for {'str': 'hot pants', 'str_pl': 'hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of short shorts." msgstr "一件簡單的熱褲。" @@ -14636,7 +14670,7 @@ msgid "fur hot pants" msgid_plural "fur hot pants" msgstr[0] "毛皮熱褲" -#. ~ Description for fur hot pants +#. ~ Description for {'str': 'fur hot pants', 'str_pl': 'fur hot pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of fur short shorts." msgstr "一件簡單的毛皮熱褲。" @@ -14646,7 +14680,8 @@ msgid "leather hot pants" msgid_plural "leather hot pants" msgstr[0] "皮革熱褲" -#. ~ Description for leather hot pants +#. ~ Description for {'str': 'leather hot pants', 'str_pl': 'leather hot +#. pants'} #: lang/json/ARMOR_from_json.py msgid "A simple pair of leather short shorts." msgstr "一件簡單的皮革熱褲。" @@ -14656,7 +14691,7 @@ msgid "jeans" msgid_plural "jeans" msgstr[0] "牛仔長褲" -#. ~ Description for jeans +#. ~ Description for {'str': 'jeans', 'str_pl': 'jeans'} #: lang/json/ARMOR_from_json.py msgid "A pair of blue jeans with two deep pockets." msgstr "一件有兩個深口袋的藍色牛仔長褲。" @@ -14692,7 +14727,7 @@ msgid "leggings" msgid_plural "leggings" msgstr[0] "緊身長褲" -#. ~ Description for leggings +#. ~ Description for {'str': 'leggings', 'str_pl': 'leggings'} #: lang/json/ARMOR_from_json.py msgid "" "Skin-tight nylon leggings, sometimes used when exercising, that keep your " @@ -14802,7 +14837,7 @@ msgid "fur pants" msgid_plural "fur pants" msgstr[0] "毛皮長褲" -#. ~ Description for fur pants +#. ~ Description for {'str': 'fur pants', 'str_pl': 'fur pants'} #: lang/json/ARMOR_from_json.py msgid "A hefty pair of fur-lined pants." msgstr "一件有沉重毛皮內襯的長褲。" @@ -14822,7 +14857,7 @@ msgid "leather pants" msgid_plural "leather pants" msgstr[0] "皮革長褲" -#. ~ Description for leather pants +#. ~ Description for {'str': 'leather pants', 'str_pl': 'leather pants'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of black leather pants. Very tough, but cumbersome and without much " @@ -14844,7 +14879,8 @@ msgid "mail carrier shorts" msgid_plural "mail carrier shorts" msgstr[0] "郵差短褲" -#. ~ Description for mail carrier shorts +#. ~ Description for {'str': 'mail carrier shorts', 'str_pl': 'mail carrier +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of dark blue shorts, the kind used by postal service workers." msgstr "一條深藍色的短褲, 供郵政服務人員穿的那種。" @@ -14864,7 +14900,7 @@ msgid "cargo shorts" msgid_plural "cargo shorts" msgstr[0] "工裝短褲" -#. ~ Description for cargo shorts +#. ~ Description for {'str': 'cargo shorts', 'str_pl': 'cargo shorts'} #: lang/json/ARMOR_from_json.py msgid "A pair of shorts lined with pockets, offering decent storage." msgstr "一件附口袋的短褲, 提供一些儲物空間。" @@ -14874,7 +14910,7 @@ msgid "denim shorts" msgid_plural "denim shorts" msgstr[0] "牛仔短褲" -#. ~ Description for denim shorts +#. ~ Description for {'str': 'denim shorts', 'str_pl': 'denim shorts'} #: lang/json/ARMOR_from_json.py msgid "" "A pair of denim shorts. Thick and tough, they provide excellent protection " @@ -15004,17 +15040,20 @@ msgid "bondage mask (zipped)" msgid_plural "bondage masks (zipped)" msgstr[0] "束縛面具 (拉上)" -#. ~ Use action menu_text for bondage mask (zipped). +#. ~ Use action menu_text for {'str': 'bondage mask (zipped)', 'str_pl': +#. 'bondage masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "Unzip" msgstr "拉開拉鍊" -#. ~ Use action msg for bondage mask (zipped). +#. ~ Use action msg for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage +#. masks (zipped)'}. #: lang/json/ARMOR_from_json.py msgid "You unzip the eyes and mouth of the bondage mask." msgstr "你拉開了束縛面具位於眼睛和嘴巴的拉鍊。" -#. ~ Description for bondage mask (zipped) +#. ~ Description for {'str': 'bondage mask (zipped)', 'str_pl': 'bondage masks +#. (zipped)'} #: lang/json/ARMOR_from_json.py msgid "" "A tight mask made of black leather. The eyes and mouth have been zipped " @@ -15841,7 +15880,7 @@ msgid "leather pouch" msgid_plural "leather pouches" msgstr[0] "皮革袋子" -#. ~ Description for leather pouch +#. ~ Description for {'str': 'leather pouch', 'str_pl': 'leather pouches'} #: lang/json/ARMOR_from_json.py msgid "" "A bag stitched together from leather scraps. Doesn't hold an awful lot but " @@ -16852,7 +16891,8 @@ msgid "lorica segmentata" msgid_plural "lorica segmentata" msgstr[0] "環片甲" -#. ~ Description for lorica segmentata +#. ~ Description for {'str': 'lorica segmentata', 'str_pl': 'lorica +#. segmentata'} #: lang/json/ARMOR_from_json.py msgid "" "An ancient Roman laminar armor, made of overlapping metal strips connected " @@ -16898,7 +16938,7 @@ msgid "cuirass" msgid_plural "cuirasses" msgstr[0] "胸甲" -#. ~ Description for cuirass +#. ~ Description for {'str': 'cuirass', 'str_pl': 'cuirasses'} #: lang/json/ARMOR_from_json.py msgid "" "A steel breastplate, and a vital part of plate armor. Even as full armor " @@ -17518,7 +17558,8 @@ msgid "pair of arm warmers" msgid_plural "pairs of arm warmers" msgstr[0] "袖套" -#. ~ Description for pair of arm warmers +#. ~ Description for {'str': 'pair of arm warmers', 'str_pl': 'pairs of arm +#. warmers'} #: lang/json/ARMOR_from_json.py msgid "Snug, soft cloth sleeves to keep your arms warm." msgstr "貼身、柔軟的棉布袖套, 用於保暖雙臂。" @@ -17599,7 +17640,7 @@ msgid "boy shorts" msgid_plural "boy shorts" msgstr[0] "女用平口內褲" -#. ~ Description for boy shorts +#. ~ Description for {'str': 'boy shorts', 'str_pl': 'boy shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Female underwear similar to men's boxer shorts, but much more close-fitting." @@ -17621,7 +17662,7 @@ msgid "briefs" msgid_plural "briefs" msgstr[0] "三角內褲" -#. ~ Description for briefs +#. ~ Description for {'str': 'briefs', 'str_pl': 'briefs'} #: lang/json/ARMOR_from_json.py msgid "A pair of briefs. Comfortable underwear worn by men." msgstr "一件三角內褲。男性專用的舒適內衣。" @@ -17725,7 +17766,8 @@ msgid "pair of XL leg warmers" msgid_plural "pairs of XL leg warmers" msgstr[0] "XL 腿套" -#. ~ Description for pair of XL leg warmers +#. ~ Description for {'str': 'pair of XL leg warmers', 'str_pl': 'pairs of XL +#. leg warmers'} #: lang/json/ARMOR_from_json.py msgid "Large, soft, snug cloth sleeves to keep your exotic anatomy warm." msgstr "巨大、貼身、柔軟的棉布腿套, 用於保暖畸形下肢。" @@ -17834,7 +17876,8 @@ msgid "compression shorts" msgid_plural "compression shorts" msgstr[0] "塑身短褲" -#. ~ Description for compression shorts +#. ~ Description for {'str': 'compression shorts', 'str_pl': 'compression +#. shorts'} #: lang/json/ARMOR_from_json.py msgid "" "Nylon sportswear that clings to your upper legs, aiding muscle tone and " @@ -19034,7 +19077,7 @@ msgid "test battery" msgid_plural "test batteries" msgstr[0] "測試電池" -#. ~ Description for test battery +#. ~ Description for {'str': 'test battery', 'str_pl': 'test batteries'} #: lang/json/BATTERY_from_json.py msgid "" "This is a testing item for the BATTERY item type. If you found one in game " @@ -19848,7 +19891,8 @@ msgid "Power Storage CBM Mk. II" msgid_plural "Power Storage CBM Mk. II" msgstr[0] "CBM：能量儲存室 Mk. II" -#. ~ Description for Power Storage CBM Mk. II +#. ~ Description for {'str': 'Power Storage CBM Mk. II', 'str_pl': 'Power +#. Storage CBM Mk. II'} #: lang/json/BIONIC_ITEM_from_json.py msgid "" "A Compact Bionics Module developed at DoubleTech Industries as a replacement" @@ -21568,19 +21612,19 @@ msgstr[0] "" #. ~ Description for {'str': 'schematics', 'str_pl': 'schematics'} #. ~ Description for {'str': 'animal', 'str_pl': 'none'} -#. ~ Description for nearby fire -#. ~ Description for muscle -#. ~ Description for wind -#. ~ Description for sun light +#. ~ Description for {'str': 'nearby fire', 'str_pl': 'none'} +#. ~ Description for {'str': 'muscle', 'str_pl': 'none'} +#. ~ Description for {'str': 'wind', 'str_pl': 'none'} +#. ~ Description for {'str': 'sun light', 'str_pl': 'none'} #. ~ Description for metabolism #. ~ Description for {'str': 'a smoking device and a source of flame', #. 'str_pl': 'none'} +#. ~ Description for {'str': 'none', 'str_pl': 'none'} #. ~ 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" @@ -25496,7 +25540,8 @@ msgid "commercial fertilizer" msgid_plural "commercial fertilizer" msgstr[0] "商用肥料" -#. ~ Description for commercial fertilizer +#. ~ Description for {'str': 'commercial fertilizer', 'str_pl': 'commercial +#. fertilizer'} #: lang/json/COMESTIBLE_from_json.py msgid "Nutrient rich granules for plants." msgstr "植物用的營養顆粒劑。" @@ -25574,7 +25619,8 @@ msgid "concentrated acid" msgid_plural "concentrated acid" msgstr[0] "濃酸" -#. ~ Description for concentrated acid +#. ~ Description for {'str': 'concentrated acid', 'str_pl': 'concentrated +#. acid'} #: lang/json/COMESTIBLE_from_json.py msgid "Concentrated acid. Don't drink it." msgstr "濃酸。別喝。" @@ -26230,7 +26276,7 @@ msgid "cheap whiskey" msgid_plural "cheap whiskey" msgstr[0] "" -#. ~ Description for cheap whiskey +#. ~ Description for {'str': 'cheap whiskey', 'str_pl': 'cheap whiskey'} #: lang/json/COMESTIBLE_from_json.py msgid "Really cheap blended whiskey." msgstr "" @@ -26678,7 +26724,7 @@ msgid "cooked fish" msgid_plural "cooked fish" msgstr[0] "煮熟的魚肉" -#. ~ Description for cooked fish +#. ~ Description for {'str': 'cooked fish', 'str_pl': 'cooked fish'} #: lang/json/COMESTIBLE_from_json.py msgid "Freshly cooked fish. Very nutritious." msgstr "新鮮烹飪過的魚。非常營養。" @@ -26760,7 +26806,7 @@ msgid "chunk of meat" msgid_plural "chunks of meat" msgstr[0] "肉塊" -#. ~ Description for chunk of meat +#. ~ Description for {'str': 'chunk of meat', 'str_pl': 'chunks of meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered meat. You could eat it raw, but cooking it is better." @@ -26783,7 +26829,8 @@ msgid "chunk of mutant meat" msgid_plural "chunks of mutant meat" msgstr[0] "突變體肉塊" -#. ~ Description for chunk of mutant meat +#. ~ Description for {'str': 'chunk of mutant meat', 'str_pl': 'chunks of +#. mutant meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat from a heavily mutated animal. It has an unsettling loose and spongy " @@ -26896,7 +26943,7 @@ msgid "cooked offal" msgid_plural "cooked offal" msgstr[0] "煮熟的內臟" -#. ~ Description for cooked offal +#. ~ Description for {'str': 'cooked offal', 'str_pl': 'cooked offal'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This is freshly cooked organ meat and entrails. It's filled with essential " @@ -27040,7 +27087,8 @@ msgid "cooked piece of lung" msgid_plural "cooked pieces of lung" msgstr[0] "煮熟的肺片" -#. ~ Description for cooked piece of lung +#. ~ Description for {'str': 'cooked piece of lung', 'str_pl': 'cooked pieces +#. of lung'} #: lang/json/COMESTIBLE_from_json.py msgid "" " Prepared in this way, it's a chewy grayish lump of flavorless connective " @@ -27088,7 +27136,7 @@ msgid "cooked brains" msgid_plural "cooked brains" msgstr[0] "熟腦" -#. ~ Description for cooked brains +#. ~ Description for {'str': 'cooked brains', 'str_pl': 'cooked brains'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Now you can emulate those zombies you love so much! Preparing brain for " @@ -27187,7 +27235,8 @@ msgid "chunk of mutant fat" msgid_plural "chunks of mutant fat" msgstr[0] "突變體脂肪塊" -#. ~ Description for chunk of mutant fat +#. ~ Description for {'str': 'chunk of mutant fat', 'str_pl': 'chunks of +#. mutant fat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Freshly butchered fat from a heavily mutated animal. You could eat it raw, " @@ -27258,7 +27307,8 @@ msgid "chunk of tainted meat" msgid_plural "chunks of tainted meat" msgstr[0] "污染的肉塊" -#. ~ Description for chunk of tainted meat +#. ~ Description for {'str': 'chunk of tainted meat', 'str_pl': 'chunks of +#. tainted meat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Meat that's obviously unhealthy. You could eat it, but it will poison you." @@ -27751,7 +27801,7 @@ msgid "chamomile tea" msgid_plural "chamomile tea" msgstr[0] "甘菊茶" -#. ~ Description for chamomile tea +#. ~ Description for {'str': 'chamomile tea', 'str_pl': 'chamomile tea'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A healthy beverage made from chamomile flowers steeped in boiling water. " @@ -27774,7 +27824,7 @@ msgid "coffee" msgid_plural "coffee" msgstr[0] "咖啡" -#. ~ Description for coffee +#. ~ Description for {'str': 'coffee', 'str_pl': 'coffee'} #: lang/json/COMESTIBLE_from_json.py msgid "" "The morning ritual of the pre-apocalyptic world, created from coffee " @@ -27787,7 +27837,8 @@ msgid "coffee substitute" msgid_plural "coffee substitute" msgstr[0] "咖啡替代品" -#. ~ Description for coffee substitute +#. ~ Description for {'str': 'coffee substitute', 'str_pl': 'coffee +#. substitute'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Homemade not-coffee created from the Kentucky coffeetree, just like the " @@ -27800,7 +27851,7 @@ msgid "chicory brew" msgid_plural "chicory brew" msgstr[0] "菊苣咖啡" -#. ~ Description for chicory brew +#. ~ Description for {'str': 'chicory brew', 'str_pl': 'chicory brew'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Toasted, ground chicory root steeped in boiling water. This bitter brew is " @@ -28157,7 +28208,7 @@ msgid "clean water" msgid_plural "clean water" msgstr[0] "淨水" -#. ~ Description for clean water +#. ~ Description for {'str': 'clean water', 'str_pl': 'clean water'} #: lang/json/COMESTIBLE_from_json.py msgid "Fresh, clean water. Truly the best thing to quench your thirst." msgstr "新鮮純淨的淡水, 解身體的渴。" @@ -28604,7 +28655,8 @@ msgid "cooked strawberry" msgid_plural "cooked strawberries" msgstr[0] "草苺糊" -#. ~ Description for cooked strawberry +#. ~ Description for {'str': 'cooked strawberry', 'str_pl': 'cooked +#. strawberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like strawberry jam, only without sugar." msgstr "它有點像草莓果醬, 只是沒有加糖。" @@ -28623,7 +28675,8 @@ msgid "cooked blueberry" msgid_plural "cooked blueberries" msgstr[0] "藍莓糊" -#. ~ Description for cooked blueberry +#. ~ Description for {'str': 'cooked blueberry', 'str_pl': 'cooked +#. blueberries'} #: lang/json/COMESTIBLE_from_json.py msgid "It's like blueberry jam, only without sugar." msgstr "它有點像藍莓果醬, 只是沒有加糖。" @@ -29354,17 +29407,17 @@ msgid "chocolate candy" msgid_plural "chocolate candies" msgstr[0] "巧克力糖" -#. ~ Description for chocolate candy +#. ~ Description for {'str': 'chocolate candy', 'str_pl': 'chocolate candies'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful chocolate filled candies." msgstr "一把五顏六色的巧克力夾心糖。" #: lang/json/COMESTIBLE_from_json.py msgid "chewy candy" -msgid_plural "chewy candies" -msgstr[0] "軟糖" +msgid_plural "chewy candy" +msgstr[0] "" -#. ~ Description for chewy candy +#. ~ Description for {'str': 'chewy candy', 'str_pl': 'chewy candy'} #: lang/json/COMESTIBLE_from_json.py msgid "A handful of colorful fruit-flavored chewy candy." msgstr "一把五顏六色的水果軟糖。" @@ -29576,7 +29629,7 @@ msgid "cheese nachos" msgid_plural "cheese nachos" msgstr[0] "" -#. ~ Description for cheese nachos +#. ~ Description for {'str': 'cheese nachos', 'str_pl': 'cheese nachos'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Salted chips made from corn tortillas, now with cheese. Could stand to have" @@ -29689,7 +29742,7 @@ msgid "chili dogs" msgid_plural "chili dogs" msgstr[0] "肉醬熱狗" -#. ~ Description for chili dogs +#. ~ Description for {'str': 'chili dogs', 'str_pl': 'chili dogs'} #: lang/json/COMESTIBLE_from_json.py msgid "A hot dog, served with chili con carne as a topping. Yum!" msgstr "一個熱狗上面淋上了辣肉醬。好吃!" @@ -29722,7 +29775,8 @@ msgid "chocolate pancake" msgid_plural "chocolate pancakes" msgstr[0] "巧克力煎餅" -#. ~ Description for chocolate pancake +#. ~ Description for {'str': 'chocolate pancake', 'str_pl': 'chocolate +#. pancakes'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Fluffy and delicious pancakes with real maple syrup, with delicious " @@ -29754,7 +29808,7 @@ msgid "cheese fries" msgid_plural "cheese fries" msgstr[0] "起司薯條" -#. ~ Description for cheese fries +#. ~ Description for {'str': 'cheese fries', 'str_pl': 'cheese fries'} #: lang/json/COMESTIBLE_from_json.py msgid "Fried potatoes with delicious cheese smothered on top." msgstr "油炸馬鈴薯。有著美味的起士淋在上面。" @@ -29793,10 +29847,9 @@ msgstr "一根簡單的熱狗腸, 以明火煮熟。要是配上麵包就更完 #: lang/json/COMESTIBLE_from_json.py msgid "cooked hot dog" -msgid_plural "cooked hot dogs" -msgstr[0] "熟熱狗" +msgstr "" -#. ~ Description for cooked hot dog +#. ~ Description for {'str': 'cooked hot dog'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Surprisingly, not made from dog. Cooked, this hot dog now tastes much " @@ -30268,19 +30321,21 @@ msgid "chili con carne" msgid_plural "chilis con carne" msgstr[0] "辣醬湯" -#. ~ Conditional name for chili con carne when FLAG matches CANNIBALISM +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when FLAG matches CANNIBALISM #: lang/json/COMESTIBLE_from_json.py msgid "chili con cabron" msgid_plural "chilis con cabron" msgstr[0] "" -#. ~ Conditional name for chili con carne when COMPONENT_ID matches mutant +#. ~ Conditional name for {'str': 'chili con carne', 'str_pl': 'chilis con +#. carne'} when COMPONENT_ID matches mutant #: lang/json/COMESTIBLE_from_json.py msgid "chili con chupacabra" msgid_plural "chilis con chupacabra" msgstr[0] "" -#. ~ Description for chili con carne +#. ~ Description for {'str': 'chili con carne', 'str_pl': 'chilis con carne'} #: lang/json/COMESTIBLE_from_json.py msgid "A spicy stew containing chili peppers, meat, tomatoes and beans." msgstr "一道炖煮的辣味濃湯。材料包含了: 絞肉、辣椒、蕃茄和豆類。" @@ -31090,7 +31145,7 @@ msgid "cocaine" msgid_plural "cocaine" msgstr[0] "古柯鹼" -#. ~ Description for cocaine +#. ~ Description for {'str': 'cocaine', 'str_pl': 'cocaine'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Crystalline extract of the coca leaf, or at least, a white powder with some " @@ -31236,7 +31291,7 @@ msgid "chewing gum" msgid_plural "chewing gum" msgstr[0] "口香糖" -#. ~ Description for chewing gum +#. ~ Description for {'str': 'chewing gum', 'str_pl': 'chewing gum'} #: lang/json/COMESTIBLE_from_json.py msgid "Bright pink chewing gum. Sugary, sweet, and bad for your teeth." msgstr "亮粉紅色的口香糖。甜滋滋會蛀壞你的牙齒。" @@ -33140,7 +33195,7 @@ msgid "chitin powder" msgid_plural "chitin powder" msgstr[0] "甲殼粉" -#. ~ Description for chitin powder +#. ~ Description for {'str': 'chitin powder', 'str_pl': 'chitin powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "This chitin powder can be used to craft fertilizer and some other things." @@ -33193,7 +33248,7 @@ msgid "cooked beans" msgid_plural "cooked beans" msgstr[0] "煮熟的豆子" -#. ~ Description for cooked beans +#. ~ Description for {'str': 'cooked beans', 'str_pl': 'cooked beans'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked great northern beans." msgstr "一份豐盛的燉大北豆。" @@ -33265,7 +33320,7 @@ msgid "cooked lentils" msgid_plural "cooked lentils" msgstr[0] "熟扁豆" -#. ~ Description for cooked lentils +#. ~ Description for {'str': 'cooked lentils', 'str_pl': 'cooked lentils'} #: lang/json/COMESTIBLE_from_json.py msgid "Some delicious cooked lentils. Humble but nutrient-rich." msgstr "一些美味的煮熟的扁豆。不太有吸引力但營養豐富。" @@ -33275,7 +33330,7 @@ msgid "coffee powder" msgid_plural "coffee powder" msgstr[0] "咖啡粉" -#. ~ Description for coffee powder +#. ~ Description for {'str': 'coffee powder', 'str_pl': 'coffee powder'} #: lang/json/COMESTIBLE_from_json.py msgid "" "Ground coffee beans. You can boil it into a mediocre stimulant, or " @@ -34782,7 +34837,7 @@ msgid "chicory seeds" msgid_plural "chicory seeds" msgstr[0] "菊苣種子" -#. ~ Description for chicory seeds +#. ~ Description for {'str': 'chicory seeds', 'str_pl': 'chicory seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chicory seeds." msgstr "一些菊苣種子" @@ -34861,7 +34916,8 @@ msgid "chili pepper seeds" msgid_plural "chili pepper seeds" msgstr[0] "辣椒種子" -#. ~ Description for chili pepper seeds +#. ~ Description for {'str': 'chili pepper seeds', 'str_pl': 'chili pepper +#. seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chili pepper seeds." msgstr "一些辣椒種子。" @@ -35194,7 +35250,7 @@ msgid "coffee beans" msgid_plural "coffee beans" msgstr[0] "生咖啡豆" -#. ~ Description for coffee beans +#. ~ Description for {'str': 'coffee beans', 'str_pl': 'coffee beans'} #: lang/json/COMESTIBLE_from_json.py msgid "Some coffee beans, can be roasted." msgstr "一些生咖啡豆, 可以拿去烘烤。" @@ -35214,7 +35270,7 @@ msgid "chamomile seeds" msgid_plural "chamomile seeds" msgstr[0] "洋甘菊種子" -#. ~ Description for chamomile seeds +#. ~ Description for {'str': 'chamomile seeds', 'str_pl': 'chamomile seeds'} #: lang/json/COMESTIBLE_from_json.py msgid "Some chamomile seeds." msgstr "一些洋甘菊種子。" @@ -35499,10 +35555,9 @@ msgstr "一根麝香草。聞起來很好吃。" #: lang/json/COMESTIBLE_from_json.py msgid "cooked cattail stalk" -msgid_plural "cooked cattail stalks" -msgstr[0] "煮熟的香蒲秸稈" +msgstr "" -#. ~ Description for cooked cattail stalk +#. ~ Description for {'str': 'cooked cattail stalk'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A cooked stalk from a cattail plant. Its fibrous outer leaves have been " @@ -35526,7 +35581,8 @@ msgid "cooked dandelion greens" msgid_plural "cooked dandelion greens" msgstr[0] "煮熟的蒲公英葉" -#. ~ Description for cooked dandelion greens +#. ~ Description for {'str': 'cooked dandelion greens', 'str_pl': 'cooked +#. dandelion greens'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked leaves from wild dandelions. Tasty and nutritious." msgstr "煮熟的野生蒲公英葉。美味又營養。" @@ -35557,7 +35613,8 @@ msgid "cooked wild vegetables" msgid_plural "cooked wild vegetables" msgstr[0] "煮熟的野菜" -#. ~ Description for cooked wild vegetables +#. ~ Description for {'str': 'cooked wild vegetables', 'str_pl': 'cooked wild +#. vegetables'} #: lang/json/COMESTIBLE_from_json.py msgid "Cooked wild edible plants. An interesting mix of flavors." msgstr "由可食野菜燉煮, 具有特殊風味。" @@ -35577,7 +35634,7 @@ msgid "cooked buckwheat" msgid_plural "cooked buckwheat" msgstr[0] "煮熟的蕎麥" -#. ~ Description for cooked buckwheat +#. ~ Description for {'str': 'cooked buckwheat', 'str_pl': 'cooked buckwheat'} #: lang/json/COMESTIBLE_from_json.py msgid "" "A serving of cooked buckwheat groats. Healthy and nutritious but bland." @@ -35625,7 +35682,7 @@ msgid "cooked rice" msgid_plural "cooked rice" msgstr[0] "煮熟的飯" -#. ~ Description for cooked rice +#. ~ Description for {'str': 'cooked rice', 'str_pl': 'cooked rice'} #: lang/json/COMESTIBLE_from_json.py msgid "A hearty serving of cooked long-grain white rice." msgstr "一份豐盛的白長米飯。" @@ -36170,9 +36227,10 @@ msgstr "一個美味的披薩, 上面鋪有熔化的起司。" #: lang/json/COMESTIBLE_from_json.py msgid "granola" -msgstr "燕麥" +msgid_plural "granola" +msgstr[0] "" -#. ~ Description for granola +#. ~ Description for {'str': 'granola', 'str_pl': 'granola'} #. ~ Description for gluten free granola #: lang/json/COMESTIBLE_from_json.py msgid "" @@ -38636,7 +38694,7 @@ msgid "rock salt" msgid_plural "rock salt" msgstr[0] "岩鹽" -#. ~ Description for rock salt +#. ~ Description for {'str': 'rock salt', 'str_pl': 'rock salt'} #: lang/json/GENERIC_from_json.py msgid "A handful of rock salt crystals. Could be refined into table salt." msgstr "一把岩鹽結晶。可以提煉成食鹽。" @@ -38646,7 +38704,7 @@ msgid "rhodonite" msgid_plural "rhodonite" msgstr[0] "薔薇輝石" -#. ~ Description for rhodonite +#. ~ Description for {'str': 'rhodonite', 'str_pl': 'rhodonite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of rhodonite. It has manganese dioxide covering and going through " @@ -38658,7 +38716,7 @@ msgid "zincite" msgid_plural "zincite" msgstr[0] "紅鋅礦" -#. ~ Description for zincite +#. ~ Description for {'str': 'zincite', 'str_pl': 'zincite'} #: lang/json/GENERIC_from_json.py msgid "" "A chunk of zincite. Could be refined into zinc oxide, then into zinc by " @@ -38844,7 +38902,8 @@ msgid "semi ground grains" msgid_plural "semi ground grains" msgstr[0] "半磨粒穀物" -#. ~ Description for semi ground grains +#. ~ Description for {'str': 'semi ground grains', 'str_pl': 'semi ground +#. grains'} #: lang/json/GENERIC_from_json.py msgid "A paste of half-finished milled grains, not yet flour." msgstr "磨到一半的榖物顆粒，還沒有變成麵粉。" @@ -38854,7 +38913,8 @@ msgid "smoldering embers" msgid_plural "smoldering embers" msgstr[0] "悶燒的餘燼" -#. ~ Description for smoldering embers +#. ~ Description for {'str': 'smoldering embers', 'str_pl': 'smoldering +#. embers'} #: lang/json/GENERIC_from_json.py msgid "" "A handful of smoldering embers emitting smoke. They are fading away even " @@ -38883,7 +38943,7 @@ msgid "coin" msgid_plural "coins" msgstr[0] "硬幣" -#. ~ Description for coin +#. ~ Description for {'str': 'coin'} #: lang/json/GENERIC_from_json.py msgid "" "A now-ancient form of currency. Stripped of its original purpose, it now " @@ -38909,19 +38969,23 @@ msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "nearby fire" -msgstr "靠近火源" +msgid_plural "none" +msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "muscle" -msgstr "肌肉" +msgid_plural "none" +msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "wind" -msgstr "風" +msgid_plural "none" +msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "sun light" -msgstr "" +msgid_plural "none" +msgstr[0] "" #: lang/json/GENERIC_from_json.py msgid "metabolism" @@ -38933,6 +38997,14 @@ msgid "a smoking device and a source of flame" msgid_plural "none" msgstr[0] "" +#. ~ Adjective in "You block of the damage with your . +#: lang/json/GENERIC_from_json.py lang/json/trap_from_json.py +#: src/advanced_inv.cpp src/magic.cpp src/map_extras.cpp src/map_extras.cpp +#: src/melee.cpp src/recipe.cpp +msgid "none" +msgid_plural "none" +msgstr[0] "" + #: lang/json/GENERIC_from_json.py msgid "file" msgid_plural "files" @@ -39016,7 +39088,7 @@ msgid "leather patch" msgid_plural "leather patches" msgstr[0] "皮革補丁" -#. ~ Description for leather patch +#. ~ Description for {'str': 'leather patch', 'str_pl': 'leather patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of leather, could be used to make tough clothing." msgstr "一個皮製的小補丁, 可以用來修補衣物。" @@ -39026,7 +39098,7 @@ msgid "felt patch" msgid_plural "felt patches" msgstr[0] "毛氈補丁" -#. ~ Description for felt patch +#. ~ Description for {'str': 'felt patch', 'str_pl': 'felt patches'} #: lang/json/GENERIC_from_json.py msgid "A smallish patch of felt, could be disassembled for wool fiber." msgstr "短小的毛氈補丁, 毛纖維可以被拆解。" @@ -39101,7 +39173,8 @@ msgid "set of 100 ceramic disk" msgid_plural "ceramic disks" msgstr[0] "" -#. ~ Description for set of 100 ceramic disk +#. ~ Description for {'str': 'set of 100 ceramic disk', 'str_pl': 'ceramic +#. disks'} #: lang/json/GENERIC_from_json.py msgid "" "A set of small slightly elongated disks, made of high-grade ceramic. They " @@ -39361,7 +39434,7 @@ msgid "concrete" msgid_plural "concrete" msgstr[0] "混凝土" -#. ~ Description for concrete +#. ~ Description for {'str': 'concrete', 'str_pl': 'concrete'} #: lang/json/GENERIC_from_json.py msgid "Some concrete, ready to be used in a construction project." msgstr "一些混凝土, 已經準備於用在建築工程中了。" @@ -39395,7 +39468,7 @@ msgid "dead flare" msgid_plural "dead flares" msgstr[0] "熄滅的照明彈" -#. ~ Description for dead flare +#. ~ Description for {'str': 'dead flare'} #: lang/json/GENERIC_from_json.py msgid "This is a spent magnesium flare. It is essentially trash." msgstr "這是已經用過的鎂光照明彈。基本上是垃圾。" @@ -39868,7 +39941,8 @@ msgid "high-quality lens" msgid_plural "high-quality lenses" msgstr[0] "高品質鏡頭" -#. ~ Description for high-quality lens +#. ~ Description for {'str': 'high-quality lens', 'str_pl': 'high-quality +#. lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A high-quality lens, useful for focusing or diffusing light. Might be " @@ -39880,7 +39954,8 @@ msgid "small high-quality lens" msgid_plural "small high-quality lenses" msgstr[0] "小型高品質鏡頭" -#. ~ Description for small high-quality lens +#. ~ Description for {'str': 'small high-quality lens', 'str_pl': 'small high- +#. quality lenses'} #: lang/json/GENERIC_from_json.py msgid "" "A small high-quality lens, useful for focusing or diffusing light. Might be" @@ -39892,7 +39967,8 @@ msgid "pair of tinted glass" msgid_plural "pairs of tinted glass" msgstr[0] "著色眼鏡" -#. ~ Description for pair of tinted glass +#. ~ Description for {'str': 'pair of tinted glass', 'str_pl': 'pairs of +#. tinted glass'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of small darkened glass, like the one that sunglasses are made of." @@ -40023,7 +40099,7 @@ msgid "fish bowl" msgid_plural "fish bowls" msgstr[0] "魚缸" -#. ~ Description for fish bowl +#. ~ Description for {'str': 'fish bowl'} #: lang/json/GENERIC_from_json.py msgid "" "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The " @@ -40312,7 +40388,7 @@ msgid "lump of clay" msgid_plural "lumps of clay" msgstr[0] "黏土塊" -#. ~ Description for lump of clay +#. ~ Description for {'str': 'lump of clay', 'str_pl': 'lumps of clay'} #: lang/json/GENERIC_from_json.py msgid "A fresh piece of clay. Useful for some crafting recipes." msgstr "一坨新鮮的黏土。能用於一些物品製作配方。" @@ -40332,7 +40408,7 @@ msgid "mortar" msgid_plural "mortar" msgstr[0] "沙漿" -#. ~ Description for mortar +#. ~ Description for {'str': 'mortar', 'str_pl': 'mortar'} #: lang/json/GENERIC_from_json.py msgid "Some mortar, ready to be used in building projects." msgstr "一袋沙漿, 已經準備於用在建築工程中了。" @@ -40342,17 +40418,17 @@ msgid "soft adobe brick" msgid_plural "soft adobe bricks" msgstr[0] "軟土坯磚" -#. ~ Use action msg for soft adobe brick. +#. ~ Use action msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "You test the brick, and it seems solid enough to use." msgstr "" -#. ~ Use action not_ready_msg for soft adobe brick. +#. ~ Use action not_ready_msg for {'str': 'soft adobe brick'}. #: lang/json/GENERIC_from_json.py msgid "The brick is still too damp to bear weight." msgstr "" -#. ~ Description for soft adobe brick +#. ~ Description for {'str': 'soft adobe brick'} #: lang/json/GENERIC_from_json.py msgid "" "A compacted mass of soil and natural fibers, still too wet to build with. " @@ -40560,7 +40636,7 @@ msgid "cured hide" msgid_plural "cured hides" msgstr[0] "加工生皮" -#. ~ Description for cured hide +#. ~ Description for {'str': 'cured hide', 'str_pl': 'cured hides'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -40573,7 +40649,7 @@ msgid "tanned hide" msgid_plural "tanned hides" msgstr[0] "鞣製皮革" -#. ~ Description for tanned hide +#. ~ Description for {'str': 'tanned hide'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide. Can be " @@ -40585,7 +40661,7 @@ msgid "cured pelt" msgid_plural "cured pelts" msgstr[0] "加工毛皮" -#. ~ Description for cured pelt +#. ~ Description for {'str': 'cured pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A rolled up animal hide which has been scraped of extraneous hair and flesh " @@ -40598,7 +40674,7 @@ msgid "tanned pelt" msgid_plural "tanned pelts" msgstr[0] "鞣製毛皮" -#. ~ Description for tanned pelt +#. ~ Description for {'str': 'tanned pelt'} #: lang/json/GENERIC_from_json.py msgid "" "A folded sheet of leather made from carefully tanned animal hide, with the " @@ -40610,7 +40686,7 @@ msgid "pile of straw" msgid_plural "piles of straw" msgstr[0] "稻草" -#. ~ Description for pile of straw +#. ~ Description for {'str': 'pile of straw', 'str_pl': 'piles of straw'} #: lang/json/GENERIC_from_json.py msgid "" "A pile of dry grass. Can be used to craft a straw bed if there is nothing " @@ -40622,7 +40698,7 @@ msgid "straw doll" msgid_plural "straw dolls" msgstr[0] "稻草娃娃" -#. ~ Description for straw doll +#. ~ Description for {'str': 'straw doll'} #: lang/json/GENERIC_from_json.py msgid "Old straw doll. Represents a woman in a dress." msgstr "老舊的稻草娃娃。穿著女人的衣服。 " @@ -40771,7 +40847,7 @@ msgid "joint roach" msgid_plural "joint roaches" msgstr[0] "大麻菸蒂" -#. ~ Description for joint roach +#. ~ Description for {'str': 'joint roach', 'str_pl': 'joint roaches'} #: lang/json/GENERIC_from_json.py msgid "" "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\n" @@ -40929,7 +41005,7 @@ msgid "refrigerant tank" msgid_plural "refrigerant tanks" msgstr[0] "製冷劑槽" -#. ~ Description for refrigerant tank +#. ~ Description for {'str': 'refrigerant tank'} #: lang/json/GENERIC_from_json.py msgid "" "A small tank containing some sort of refrigerant often used in devices such " @@ -41135,7 +41211,7 @@ msgid "flyer" msgid_plural "flyers" msgstr[0] "傳單" -#. ~ Description for flyer +#. ~ Description for {'str': 'flyer'} #: lang/json/GENERIC_from_json.py msgid "A scrap of paper." msgstr "無用的廢紙。" @@ -41145,7 +41221,7 @@ msgid "survivor's note" msgid_plural "survivor's notes" msgstr[0] "生存者的筆記" -#. ~ Description for survivor's note +#. ~ Description for {'str': "survivor's note"} #. ~ Description for note #: lang/json/GENERIC_from_json.py msgid "" @@ -41167,7 +41243,7 @@ msgid "score card" msgid_plural "score cards" msgstr[0] "記分板" -#. ~ Description for score card +#. ~ Description for {'str': 'score card'} #: lang/json/GENERIC_from_json.py msgid "A colorfully printed score card." msgstr "彩色印刷的記分卡。" @@ -41177,7 +41253,7 @@ msgid "newspaper page" msgid_plural "newspaper pages" msgstr[0] "一頁報紙" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It is possibly one of the last " @@ -41186,7 +41262,7 @@ msgid "" " briefly." msgstr "一頁對開報紙, 它可能是新英格蘭崩潰前最後發行報紙的其中之一。報紙上充斥著微不足道或是過時的消息, 但有其中一件短暫吸引了你的眼球。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from several years" @@ -41196,7 +41272,7 @@ msgid "" msgstr "" "一頁對開報紙, 上面的日期顯示它是好幾年前發行的, 你不知道為什麼它會被保存至今。報紙上充斥著微不足道或是過時的消息, 但有其中一件短暫吸引了你的眼球。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It seems to date from a few years " @@ -41205,7 +41281,7 @@ msgid "" msgstr "" "一頁對開報紙, 上面的日期顯示它是好幾年前發行的, 令人驚訝地被保存至今。報紙上充斥著微不足道或是過時的消息, 但有其中一件短暫吸引了你的眼球。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed more than a year " @@ -41213,7 +41289,7 @@ msgid "" "but one thing catches your eye briefly." msgstr "一頁對開報紙, 一年多以前發行。報紙上充斥著微不足道或是過時的消息, 但有其中一件短暫吸引了你的眼球。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the months " @@ -41221,7 +41297,7 @@ msgid "" "trivial, or out of date, but one thing catches your eye briefly." msgstr "一頁對開報紙, 大災變前幾個月發行。報紙上充斥著微不足道或是過時的消息, 但有其中一件短暫吸引了你的眼球。" -#. ~ Description for newspaper page +#. ~ Description for {'str': 'newspaper page'} #: lang/json/GENERIC_from_json.py msgid "" "A single sheet of newspaper broadsheet. It was printed in the weeks leading" @@ -41234,7 +41310,7 @@ msgid "vault leaflet" msgid_plural "vault leaflets" msgstr[0] "避難所傳單" -#. ~ Description for vault leaflet +#. ~ Description for {'str': 'vault leaflet'} #: lang/json/GENERIC_from_json.py msgid "" "A folded glossy handout that appears to be an introduction to living in a " @@ -41740,7 +41816,8 @@ msgid "set of tiny spidery legs" msgid_plural "sets of tiny spidery legs" msgstr[0] "一套微型蜘蛛足" -#. ~ Description for set of tiny spidery legs +#. ~ Description for {'str': 'set of tiny spidery legs', 'str_pl': 'sets of +#. tiny spidery legs'} #: lang/json/GENERIC_from_json.py msgid "A set of tiny pointy legs, like the ones found under a skitterbot." msgstr "一套小尖腿，就像爬蟲機器人的腿。" @@ -41750,7 +41827,8 @@ msgid "set of reverse-jointed legs" msgid_plural "sets of reverse-jointed legs" msgstr[0] "一套反向關節足" -#. ~ Description for set of reverse-jointed legs +#. ~ Description for {'str': 'set of reverse-jointed legs', 'str_pl': 'sets of +#. reverse-jointed legs'} #: lang/json/GENERIC_from_json.py msgid "" "A set of reverse-jointed legs, like the ones found under a chicken walker." @@ -41761,7 +41839,8 @@ msgid "set of omni wheels" msgid_plural "sets of omni wheels" msgstr[0] "一套全向輪" -#. ~ Description for set of omni wheels +#. ~ Description for {'str': 'set of omni wheels', 'str_pl': 'sets of omni +#. wheels'} #: lang/json/GENERIC_from_json.py msgid "A set of omni wheels, like the ones found under a police bot." msgstr "一套全方向的輪子，就像警用機器人的腿。" @@ -41771,7 +41850,7 @@ msgid "set of rotors" msgid_plural "sets of rotors" msgstr[0] "一套轉子組" -#. ~ Description for set of rotors +#. ~ Description for {'str': 'set of rotors', 'str_pl': 'sets of rotors'} #: lang/json/GENERIC_from_json.py msgid "A set of rotors able to lift a small drone." msgstr "一組能夠舉起小型無人機的轉子。" @@ -41781,7 +41860,8 @@ msgid "set of android legs" msgid_plural "sets of android legs" msgstr[0] "一套機器人足" -#. ~ Description for set of android legs +#. ~ Description for {'str': 'set of android legs', 'str_pl': 'sets of android +#. legs'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like legs." msgstr "一套類似人類的腿。" @@ -41791,7 +41871,8 @@ msgid "set of android arms" msgid_plural "sets of android arms" msgstr[0] "一套機器人手" -#. ~ Description for set of android arms +#. ~ Description for {'str': 'set of android arms', 'str_pl': 'sets of android +#. arms'} #: lang/json/GENERIC_from_json.py msgid "A set of human-like arms." msgstr "一套類似人類的手" @@ -41801,7 +41882,8 @@ msgid "set of small tank tread" msgid_plural "sets of small tank tread" msgstr[0] "一套小型履帶" -#. ~ Description for set of small tank tread +#. ~ Description for {'str': 'set of small tank tread', 'str_pl': 'sets of +#. small tank tread'} #: lang/json/GENERIC_from_json.py msgid "A set of small tank tread, like the one used by the \"Beagle\" mini-tank." msgstr "一套小型的履帶，就像 Beagle 迷你坦克用的那樣。" @@ -41811,7 +41893,8 @@ msgid "turret interior chassis" msgid_plural "turret interior chassis" msgstr[0] "" -#. ~ Description for turret interior chassis +#. ~ Description for {'str': 'turret interior chassis', 'str_pl': 'turret +#. interior chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -41823,7 +41906,8 @@ msgid "police bot chassis" msgid_plural "police bot chassis" msgstr[0] "警用機器人機殼" -#. ~ Description for police bot chassis +#. ~ Description for {'str': 'police bot chassis', 'str_pl': 'police bot +#. chassis'} #: lang/json/GENERIC_from_json.py msgid "" "What's left when you remove all moving parts and electronics. It's the " @@ -41851,7 +41935,7 @@ msgid "misc software" msgid_plural "misc software" msgstr[0] "軟體" -#. ~ Description for misc software +#. ~ Description for {'str': 'misc software', 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "A miscellaneous piece of hobby software. Probably useless." msgstr "一個繁雜的無趣軟體。大概沒啥用處。" @@ -41861,7 +41945,7 @@ msgid "hackPRO" msgid_plural "hackPRO" msgstr[0] "駭客王" -#. ~ Description for hackPRO +#. ~ Description for {'str': 'hackPRO', 'str_pl': 'hackPRO'} #: lang/json/GENERIC_from_json.py msgid "A piece of hacking software." msgstr "一套駭客軟體。" @@ -41891,7 +41975,7 @@ msgid "infection data" msgid_plural "infection data" msgstr[0] "感染數據" -#. ~ Description for infection data +#. ~ Description for {'str': 'infection data', 'str_pl': 'infection data'} #: lang/json/GENERIC_from_json.py msgid "Medical data on zombie blood." msgstr "關於殭屍血液的醫學數據。" @@ -41901,7 +41985,7 @@ msgid "lab data" msgid_plural "lab data" msgstr[0] "實驗室資料" -#. ~ Description for lab data +#. ~ Description for {'str': 'lab data', 'str_pl': 'lab data'} #: lang/json/GENERIC_from_json.py msgid "Research archives from a government laboratory." msgstr "來自政府實驗室的研究檔案。" @@ -41911,7 +41995,7 @@ msgid "train data" msgid_plural "train data" msgstr[0] "列車資料" -#. ~ Description for train data +#. ~ Description for {'str': 'train data', 'str_pl': 'train data'} #: lang/json/GENERIC_from_json.py msgid "Logistical data on subterranean train routes and schedules." msgstr "地下火車路線和時刻表的物流數據。" @@ -41921,7 +42005,7 @@ msgid "neural data" msgid_plural "neural data" msgstr[0] "神經數據" -#. ~ Description for neural data +#. ~ Description for {'str': 'neural data', 'str_pl': 'neural data'} #: lang/json/GENERIC_from_json.py msgid "" "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n" @@ -41937,7 +42021,8 @@ msgid "integrated circuit datasheet archives" msgid_plural "misc software" msgstr[0] "雜項軟體" -#. ~ Description for integrated circuit datasheet archives +#. ~ Description for {'str': 'integrated circuit datasheet archives', +#. 'str_pl': 'misc software'} #: lang/json/GENERIC_from_json.py msgid "" "Huge archives of numerous IC circuit datasheets from several major " @@ -44598,7 +44683,7 @@ msgid "spare parts" msgid_plural "spare parts" msgstr[0] "備用零件" -#. ~ Description for spare parts +#. ~ Description for {'str': 'spare parts', 'str_pl': 'spare parts'} #: lang/json/GENERIC_from_json.py msgid "" "Items with are not themselves useful but are instead requirements for " @@ -44999,17 +45084,20 @@ msgid "expandable baton (extended)" msgid_plural "expandable batons (extended)" msgstr[0] "甩棍 (伸展)" -#. ~ Use action menu_text for expandable baton (extended). +#. ~ Use action menu_text for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "Collapse" msgstr "收回" -#. ~ Use action msg for expandable baton (extended). +#. ~ Use action msg for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'}. #: lang/json/GENERIC_from_json.py msgid "You collapse your baton." msgstr "你收回了你的甩棍。" -#. ~ Description for expandable baton (extended) +#. ~ Description for {'str': 'expandable baton (extended)', 'str_pl': +#. 'expandable batons (extended)'} #: lang/json/GENERIC_from_json.py msgid "" "A telescoping baton that collapses for easy storage. Makes an excellent " @@ -45237,7 +45325,8 @@ msgid "ironshod quarterstaff" msgid_plural "ironshod quarterstaves" msgstr[0] "鐵頭木杖" -#. ~ Description for ironshod quarterstaff +#. ~ Description for {'str': 'ironshod quarterstaff', 'str_pl': 'ironshod +#. quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip, which has been " @@ -45439,7 +45528,7 @@ msgid "quarterstaff" msgid_plural "quarterstaves" msgstr[0] "木杖" -#. ~ Description for quarterstaff +#. ~ Description for {'str': 'quarterstaff', 'str_pl': 'quarterstaves'} #: lang/json/GENERIC_from_json.py msgid "" "A smooth and sturdy staff with a leather-wrapped grip. Light and well-" @@ -45451,7 +45540,7 @@ msgid "rock in a sock" msgid_plural "rocks in socks" msgstr[0] "裝有石頭的襪子" -#. ~ Description for rock in a sock +#. ~ Description for {'str': 'rock in a sock', 'str_pl': 'rocks in socks'} #: lang/json/GENERIC_from_json.py msgid "A pair of nested socks filled with a stone. A true weapon of despair." msgstr "一隻裝有石頭而末端綁緊的襪子。背水一戰時的最後武器。" @@ -45461,7 +45550,8 @@ msgid "sharpened toothbrush" msgid_plural "sharpened toothbrushes" msgstr[0] "磨尖的牙刷" -#. ~ Description for sharpened toothbrush +#. ~ Description for {'str': 'sharpened toothbrush', 'str_pl': 'sharpened +#. toothbrushes'} #: lang/json/GENERIC_from_json.py msgid "A personal hygiene item turned into a shank." msgstr "一根牙刷, 除了潔齒之外更可以用來捅人。" @@ -45710,7 +45800,7 @@ msgid "naginata" msgid_plural "naginata" msgstr[0] "薙刀" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -45718,7 +45808,7 @@ msgid "" "or by their wives in defense of the household." msgstr "一把結實的長柄武器, 有著彎曲的刀身, 使用的製作手法與日本武士刀類同。古代的日本武士偶爾會使用, 他們的妻子亦會當作自衛武器使用。" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "A sturdy polearm with a curved blade, made in the same manner as the katana " @@ -45726,7 +45816,7 @@ msgid "" "feels a bit shoddily made." msgstr "" -#. ~ Description for naginata +#. ~ Description for {'str': 'naginata', 'str_pl': 'naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, slightly floppy replica of a Japanese polearm with a curved " @@ -45739,7 +45829,8 @@ msgid "survivor naginata" msgid_plural "survivor naginata" msgstr[0] "生存者薙刀" -#. ~ Description for survivor naginata +#. ~ Description for {'str': 'survivor naginata', 'str_pl': 'survivor +#. naginata'} #: lang/json/GENERIC_from_json.py msgid "" "This sturdy steel shaft with a sword blade at the end is good for both " @@ -45806,7 +45897,7 @@ msgid "dory" msgid_plural "dories" msgstr[0] "長槍" -#. ~ Description for dory +#. ~ Description for {'str': 'dory', 'str_pl': 'dories'} #: lang/json/GENERIC_from_json.py msgid "A well-made spear with a bronze head, Greek in origin." msgstr "一把製作精良的長矛, 槍頭由青銅製成。源自希臘。" @@ -45816,7 +45907,7 @@ msgid "ji" msgid_plural "ji" msgstr[0] "中式戟" -#. ~ Description for ji +#. ~ Description for {'str': 'ji', 'str_pl': 'ji'} #: lang/json/GENERIC_from_json.py msgid "" "This is a bronze polearm that originated in the Shang dynasty of China, if " @@ -45878,7 +45969,7 @@ msgid "jian" msgid_plural "jian" msgstr[0] "中式劍" -#. ~ Description for jian +#. ~ Description for {'str': 'jian', 'str_pl': 'jian'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of an ancient Chinese doubled-edged " @@ -45977,14 +46068,14 @@ msgid "nodachi" msgid_plural "nodachi" msgstr[0] "野太刀" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a huge, curved, two-handed sword " "from Japan. It is surprisingly light for its size." msgstr "這是一把便宜的複製品, 仿自日本的巨大雙手曲劍。重量出乎意料的輕。" -#. ~ Description for nodachi +#. ~ Description for {'str': 'nodachi', 'str_pl': 'nodachi'} #: lang/json/GENERIC_from_json.py msgid "" "This is a huge, curved, two-handed sword from Japan. It is surprisingly " @@ -46099,7 +46190,7 @@ msgid "cutlass" msgid_plural "cutlasses" msgstr[0] "海盜彎刀" -#. ~ Description for cutlass +#. ~ Description for {'str': 'cutlass', 'str_pl': 'cutlasses'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheaply made replica of a broad saber known for its use by " @@ -46187,7 +46278,7 @@ msgid "kris" msgid_plural "krises" msgstr[0] "馬來短劍" -#. ~ Description for kris +#. ~ Description for {'str': 'kris', 'str_pl': 'krises'} #: lang/json/GENERIC_from_json.py msgid "" "This is a dull, cheap replica of a wavy bladed dagger that comes from " @@ -46211,7 +46302,7 @@ msgid "tiger claws" msgid_plural "tiger claws" msgstr[0] "虎爪" -#. ~ Description for tiger claws +#. ~ Description for {'str': 'tiger claws', 'str_pl': 'tiger claws'} #: lang/json/GENERIC_from_json.py msgid "" "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon " @@ -46235,7 +46326,8 @@ msgid "pair of brass knuckles" msgid_plural "pairs of brass knuckles" msgstr[0] "手指虎" -#. ~ Description for pair of brass knuckles +#. ~ Description for {'str': 'pair of brass knuckles', 'str_pl': 'pairs of +#. brass knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A metal weapon made of brass, designed to be gripped in the palm and cause " @@ -46260,7 +46352,8 @@ msgid "pair of nail knuckles" msgid_plural "pairs of nail knuckles" msgstr[0] "鐵釘手指虎" -#. ~ Description for pair of nail knuckles +#. ~ Description for {'str': 'pair of nail knuckles', 'str_pl': 'pairs of nail +#. knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of knuckles consisting of two small squares of wood with several " @@ -46272,7 +46365,8 @@ msgid "pair of steel knuckles" msgid_plural "pairs of steel knuckles" msgstr[0] "鋼製手指虎" -#. ~ Description for pair of steel knuckles +#. ~ Description for {'str': 'pair of steel knuckles', 'str_pl': 'pairs of +#. steel knuckles'} #: lang/json/GENERIC_from_json.py msgid "" "A mass of scrap metal crudely beat into shape, with folded rags underneath " @@ -46353,7 +46447,7 @@ msgid "throwing knife" msgid_plural "throwing knives" msgstr[0] "飛刀" -#. ~ Description for throwing knife +#. ~ Description for {'str': 'throwing knife', 'str_pl': 'throwing knives'} #: lang/json/GENERIC_from_json.py msgid "" "A thin and flat knife made for throwing. Its ineffective cutting edge and " @@ -46378,14 +46472,15 @@ msgid "sheet of glass" msgid_plural "sheets of glass" msgstr[0] "玻璃片" -#. ~ Use action done_message for sheet of glass. +#. ~ Use action done_message for {'str': 'sheet of glass', 'str_pl': 'sheets +#. of glass'}. #: lang/json/GENERIC_from_json.py msgid "" "You break the pane and place the shards on the ground, ready to be cracked " "by something passing by." msgstr "" -#. ~ Description for sheet of glass +#. ~ Description for {'str': 'sheet of glass', 'str_pl': 'sheets of glass'} #: lang/json/GENERIC_from_json.py msgid "" "A large sheet of glass. Easily shattered. Useful for repairing windows." @@ -46396,7 +46491,8 @@ msgid "sheet of reinforced glass" msgid_plural "sheets of reinforced glass" msgstr[0] "強化玻璃片" -#. ~ Description for sheet of reinforced glass +#. ~ Description for {'str': 'sheet of reinforced glass', 'str_pl': 'sheets of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A large sheet of glass strengthened with steel wiring." msgstr "一大片以鋼絲補強的強化玻璃。" @@ -46406,7 +46502,8 @@ msgid "pane of reinforced glass" msgid_plural "panes of reinforced glass" msgstr[0] "強化玻璃窗框" -#. ~ Description for pane of reinforced glass +#. ~ Description for {'str': 'pane of reinforced glass', 'str_pl': 'panes of +#. reinforced glass'} #: lang/json/GENERIC_from_json.py msgid "A small pane of glass strengthened with steel wiring." msgstr "利用鋼線強化的的玻璃窗框。" @@ -46486,7 +46583,7 @@ msgid "scrap copper" msgid_plural "scrap copper" msgstr[0] "銅碎" -#. ~ Description for scrap copper +#. ~ Description for {'str': 'scrap copper', 'str_pl': 'scrap copper'} #: lang/json/GENERIC_from_json.py msgid "A small chunk of copper, usable for crafting or repairs." msgstr "一小塊的銅, 能用於製作或修理。" @@ -46539,7 +46636,7 @@ msgid "mattress" msgid_plural "mattresses" msgstr[0] "床墊" -#. ~ Description for mattress +#. ~ Description for {'str': 'mattress', 'str_pl': 'mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized mattress." msgstr "這是一張單人或雙人床墊。" @@ -46549,7 +46646,7 @@ msgid "down mattress" msgid_plural "down mattresses" msgstr[0] "羽絨床墊" -#. ~ Description for down mattress +#. ~ Description for {'str': 'down mattress', 'str_pl': 'down mattresses'} #: lang/json/GENERIC_from_json.py msgid "This is a single, or twin, sized down filled mattress." msgstr "這是一張單人或雙人大小的羽絨床墊。" @@ -46849,21 +46946,28 @@ msgid "sealed jar of eggs" msgid_plural "sealed jars of eggs" msgstr[0] "密封罐的醃蛋" -#. ~ Use action menu_text for sealed jar of eggs. -#. ~ Use action menu_text for sealed jar of pickles. -#. ~ Use action menu_text for sealed jar of sauerkraut. +#. ~ Use action menu_text for {'str': 'sealed jar of eggs', 'str_pl': 'sealed +#. jars of eggs'}. +#. ~ Use action menu_text for {'str': 'sealed jar of pickles', 'str_pl': +#. 'sealed jars of pickles'}. +#. ~ Use action menu_text for {'str': 'sealed jar of sauerkraut', 'str_pl': +#. 'sealed jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "Open jar" msgstr "打開罐頭" -#. ~ Use action msg for sealed jar of eggs. -#. ~ Use action msg for sealed jar of pickles. -#. ~ Use action msg for sealed jar of sauerkraut. +#. ~ Use action msg for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars +#. of eggs'}. +#. ~ Use action msg for {'str': 'sealed jar of pickles', 'str_pl': 'sealed +#. jars of pickles'}. +#. ~ Use action msg for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'}. #: lang/json/GENERIC_from_json.py msgid "You open the jar, exposing it to the atmosphere." msgstr "你打開了罐頭, 使它暴露在空氣中。" -#. ~ Description for sealed jar of eggs +#. ~ Description for {'str': 'sealed jar of eggs', 'str_pl': 'sealed jars of +#. eggs'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickled eggs. Use to open and eat to " @@ -46875,7 +46979,8 @@ msgid "sealed jar of pickles" msgid_plural "sealed jars of pickles" msgstr[0] "密封罐的酸黃瓜" -#. ~ Description for sealed jar of pickles +#. ~ Description for {'str': 'sealed jar of pickles', 'str_pl': 'sealed jars +#. of pickles'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing pickles. Use to open and eat to " @@ -46887,7 +46992,8 @@ msgid "sealed jar of sauerkraut" msgid_plural "sealed jars of sauerkraut" msgstr[0] "密封罐的德國酸菜" -#. ~ Description for sealed jar of sauerkraut +#. ~ Description for {'str': 'sealed jar of sauerkraut', 'str_pl': 'sealed +#. jars of sauerkraut'} #: lang/json/GENERIC_from_json.py msgid "" "This is a sealed glass jar containing sauerkraut. Use to open and eat to " @@ -47474,7 +47580,7 @@ msgid "radio car box" msgid_plural "radio car boxes" msgstr[0] "包裝好的遙控車" -#. ~ Description for radio car box +#. ~ Description for {'str': 'radio car box', 'str_pl': 'radio car boxes'} #: lang/json/GENERIC_from_json.py msgid "" "A RC car, with radio-control and batteries included! Disassemble to unpack " @@ -47568,7 +47674,8 @@ msgid "set of ring stand clamps" msgid_plural "sets of ring stand clamps" msgstr[0] "鐵環架組" -#. ~ Description for set of ring stand clamps +#. ~ Description for {'str': 'set of ring stand clamps', 'str_pl': 'sets of +#. ring stand clamps'} #: lang/json/GENERIC_from_json.py msgid "" "This is a small box with a jumbled assortment of clamps for mounting on ring" @@ -47627,7 +47734,8 @@ msgid "knitting needles" msgid_plural "pairs of knitting needles" msgstr[0] "針織針" -#. ~ Description for knitting needles +#. ~ Description for {'str': 'knitting needles', 'str_pl': 'pairs of knitting +#. needles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of stout wooden needles with round ends used to turn thread and yarn " @@ -47711,7 +47819,8 @@ msgid "distaff and spindle" msgid_plural "distaves and spindles" msgstr[0] "紡錘" -#. ~ Description for distaff and spindle +#. ~ Description for {'str': 'distaff and spindle', 'str_pl': 'distaves and +#. spindles'} #: lang/json/GENERIC_from_json.py msgid "" "A pair of specialized wooden rods used to spin fibers into thread and yarn." @@ -47808,7 +47917,7 @@ msgid "storage battery case" msgid_plural "storage battery cases" msgstr[0] "蓄電池殼" -#. ~ Description for storage battery case +#. ~ Description for {'str': 'storage battery case'} #: lang/json/GENERIC_from_json.py msgid "" "An empty case that can hold a storage battery. Complete with charging " @@ -47820,7 +47929,7 @@ msgid "wood boat hull" msgid_plural "wood boat hulls" msgstr[0] "木船體" -#. ~ Description for wood boat hull +#. ~ Description for {'str': 'wood boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle " @@ -47832,7 +47941,7 @@ msgid "plastic boat hull" msgid_plural "plastic boat hulls" msgstr[0] "塑膠船體" -#. ~ Description for plastic boat hull +#. ~ Description for {'str': 'plastic boat hull'} #: lang/json/GENERIC_from_json.py msgid "" "A rigid plastic sheet that keeps the boat afloat. Add boat hulls to a " @@ -47858,7 +47967,7 @@ msgid "oars" msgid_plural "oars" msgstr[0] "船槳" -#. ~ Description for oars +#. ~ Description for {'str': 'oars', 'str_pl': 'oars'} #: lang/json/GENERIC_from_json.py msgid "Oars for a boat." msgstr "小船的槳。" @@ -47868,7 +47977,7 @@ msgid "sail" msgid_plural "sails" msgstr[0] "帆" -#. ~ Description for sail +#. ~ Description for {'str': 'sail'} #: lang/json/GENERIC_from_json.py msgid "Sails for a boat." msgstr "船的帆" @@ -47878,7 +47987,8 @@ msgid "inflatable section" msgid_plural "inflatable section" msgstr[0] "充氣部件" -#. ~ Description for inflatable section +#. ~ Description for {'str': 'inflatable section', 'str_pl': 'inflatable +#. section'} #: lang/json/GENERIC_from_json.py msgid "An inflatable boat section." msgstr "一個充氣船的部件。" @@ -47888,7 +47998,8 @@ msgid "inflatable airbag" msgid_plural "inflatable airbag" msgstr[0] "充氣氣囊" -#. ~ Description for inflatable airbag +#. ~ Description for {'str': 'inflatable airbag', 'str_pl': 'inflatable +#. airbag'} #: lang/json/GENERIC_from_json.py msgid "An inflatable airbag." msgstr "一個可充氣的安全氣囊。" @@ -48040,7 +48151,8 @@ msgid "vehicle controls" msgid_plural "sets of vehicle controls" msgstr[0] "車輛控制器" -#. ~ Description for vehicle controls +#. ~ Description for {'str': 'vehicle controls', 'str_pl': 'sets of vehicle +#. controls'} #: lang/json/GENERIC_from_json.py msgid "A set of various vehicle controls. Useful for crafting." msgstr "一組通用於多種車輛的控制器。製作物品時很有用。" @@ -48091,7 +48203,8 @@ msgid "drive by wire controls" msgid_plural "sets of drive by wire controls" msgstr[0] "電傳操縱系統" -#. ~ Description for drive by wire controls +#. ~ Description for {'str': 'drive by wire controls', 'str_pl': 'sets of +#. drive by wire controls'} #: lang/json/GENERIC_from_json.py msgid "" "Fully electronic vehicle control system. You could control it remotely if " @@ -48103,7 +48216,7 @@ msgid "robot driving unit" msgid_plural "robot driving units" msgstr[0] "機械駕駛元件" -#. ~ Description for robot driving unit +#. ~ Description for {'str': 'robot driving unit'} #: lang/json/GENERIC_from_json.py msgid "" "A set of servos, microcontrollers and other devices, together capable of " @@ -48260,7 +48373,7 @@ msgid "vehicle scoop" msgid_plural "vehicle scoops" msgstr[0] "車輛鏟勺" -#. ~ Description for vehicle scoop +#. ~ Description for {'str': 'vehicle scoop'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of motors and sheet metal that allows a vehicle to clean the " @@ -48272,7 +48385,7 @@ msgid "seed drill" msgid_plural "seed drills" msgstr[0] "播種機" -#. ~ Description for seed drill +#. ~ Description for {'str': 'seed drill'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of tubes, spikes, and wheels, that when dragged along the " @@ -48285,7 +48398,7 @@ msgid "reaper" msgid_plural "reapers" msgstr[0] "收割機" -#. ~ Description for reaper +#. ~ Description for {'str': 'reaper'} #: lang/json/GENERIC_from_json.py msgid "" "An assembly of a blade, wheels, and a small lever for engaging/disengaging " @@ -48323,7 +48436,7 @@ msgid "plow" msgid_plural "plows" msgstr[0] "犁具" -#. ~ Description for plow +#. ~ Description for {'str': 'plow'} #: lang/json/GENERIC_from_json.py msgid "A heavy assembly of wheels and steel blades that turn up the ground." msgstr "一個由輪子及鋼刀拼裝而成的沉重部件, 能夠翻鬆泥土。" @@ -48460,7 +48573,8 @@ msgid "emergency vehicle light (red)" msgid_plural "emergency vehicle lights (red)" msgstr[0] "緊急車輛燈 (紅)" -#. ~ Description for emergency vehicle light (red) +#. ~ Description for {'str': 'emergency vehicle light (red)', 'str_pl': +#. 'emergency vehicle lights (red)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the red-colored lights from the top of an emergency services vehicle." @@ -48472,7 +48586,8 @@ msgid "emergency vehicle light (blue)" msgid_plural "emergency vehicle lights (blue)" msgstr[0] "緊急車輛燈 (藍)" -#. ~ Description for emergency vehicle light (blue) +#. ~ Description for {'str': 'emergency vehicle light (blue)', 'str_pl': +#. 'emergency vehicle lights (blue)'} #: lang/json/GENERIC_from_json.py msgid "" "One of the blue-colored lights from the top of an emergency services " @@ -48506,7 +48621,8 @@ msgid "set of hand rims" msgid_plural "sets of hand rims" msgstr[0] "一套手推輪" -#. ~ Description for set of hand rims +#. ~ Description for {'str': 'set of hand rims', 'str_pl': 'sets of hand +#. rims'} #: lang/json/GENERIC_from_json.py msgid "Hand rims for use on a wheelchair." msgstr "給輪椅使用的手推輪。" @@ -49077,7 +49193,7 @@ msgid "vehicle cooler" msgid_plural "vehicle coolers" msgstr[0] "車載冷氣" -#. ~ Description for vehicle cooler +#. ~ Description for {'str': 'vehicle cooler'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area cooler." msgstr "一種安裝於車輛載具的區域型冷卻器。" @@ -49087,7 +49203,7 @@ msgid "vehicle heater" msgid_plural "vehicle heaters" msgstr[0] "車用暖氣" -#. ~ Description for vehicle heater +#. ~ Description for {'str': 'vehicle heater'} #: lang/json/GENERIC_from_json.py msgid "A vehicle-mounted area heater." msgstr "車載暖器。" @@ -49420,9 +49536,8 @@ msgstr[0] "" #: 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." +"internet currencies. These however are physical coins with random numbers " +"sequences embossed on them and RFID chips inside." msgstr "" #: lang/json/GENERIC_from_json.py lang/json/furniture_from_json.py @@ -60988,7 +61103,7 @@ msgid "lamb" msgid_plural "lambs" msgstr[0] "小羊" -#. ~ Description for lamb +#. ~ Description for {'str': 'lamb'} #: lang/json/MONSTER_from_json.py msgid "" "A timid, hooved grazing mammal, and one of the first animals ever " @@ -68361,7 +68476,8 @@ msgstr[0] "採礦頭盔 (啟動)" #. 'survivor headlamps (on)'}. #. ~ Use action menu_text for {'str': '5-point anchor (on)', 'str_pl': #. '5-point anchors (on)'}. -#. ~ Use action menu_text for phase immersion suit (on). +#. ~ Use action menu_text for {'str': 'phase immersion suit (on)', 'str_pl': +#. 'phase immersion suits (on)'}. #. ~ Use action menu_text for {'str': 'rebreather mask (on)', 'str_pl': #. 'rebreather masks (on)'}. #. ~ Use action menu_text for {'str': 'XL rebreather mask (on)', 'str_pl': 'XL @@ -68897,12 +69013,14 @@ msgid "phase immersion suit (on)" msgid_plural "phase immersion suits (on)" msgstr[0] "" -#. ~ Use action msg for phase immersion suit (on). +#. ~ Use action msg for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'}. #: lang/json/TOOL_ARMOR_from_json.py msgid "Suit shutting down." msgstr "" -#. ~ Description for phase immersion suit (on) +#. ~ Description for {'str': 'phase immersion suit (on)', 'str_pl': 'phase +#. immersion suits (on)'} #: lang/json/TOOL_ARMOR_from_json.py msgid "" "Covered in interlocking plates of reflective metal, this advanced suit " @@ -91935,10 +92053,10 @@ msgid "" msgstr "利用風力將高溫和濕氣排出閣樓的渦流器。" #: lang/json/furniture_from_json.py -msgid "hay" -msgstr "乾草" +msgid "bale of hay" +msgstr "" -#. ~ Description for hay +#. ~ Description for bale of hay #: lang/json/furniture_from_json.py msgid "A bale of hay. You could sleep on it, if desperate." msgstr "一捆乾草。走投無路時，你可以睡在上面。" @@ -154742,16 +154860,16 @@ msgid "Clothing Store" msgstr "服飾店" #: lang/json/talk_topic_from_json.py -msgid "Acolyte." -msgstr "" +msgid "You there. Quiet down. Can you hear it? The song?" +msgstr "你那邊。靜下來。你能聽見嗎？這首歌？" #: lang/json/talk_topic_from_json.py msgid "You're back. Have you come to listen to the song?" msgstr "你回來了。你有來聽這首歌嗎？" #: lang/json/talk_topic_from_json.py -msgid "You there. Quiet down. Can you hear it? The song?" -msgstr "你那邊。靜下來。你能聽見嗎？這首歌？" +msgid "Acolyte." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "What? What do you mean? What song?" @@ -154898,42 +155016,42 @@ msgid "Yeah, alright." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "A song may yet be sung by you, should you wish to." +msgid "An acolyte should not take on too many songs at once." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "There is an additional song you could take on, if you'd like." +msgid "That is all for now." 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 are bones to etch, songs to sing. Wish to join me?" +msgid "Do you wish to take on more songs?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you wish to take on more songs?" +msgid "Do you believe you can take on the burden of additional bones?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you believe you can take on the burden of additional bones?" +msgid "There are bones to etch, songs to sing. Wish to join me?" 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 "There is an additional song you could take on, if you'd like." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "An acolyte should not take on too many songs at once." +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 "A song may yet be sung by you, should you wish to." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155006,13 +155124,13 @@ msgid "I see. Very well then." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"You bear my mark, meaning I believe you have potential to learn to truly " -"listen to the Song. Yes, I will lend my skills to you, for now." +msgid "Only those who bear my mark will prove themselves worthy of my skills." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Only those who bear my mark will prove themselves worthy of my skills." +msgid "" +"You bear my mark, meaning I believe you have potential to learn to truly " +"listen to the Song. Yes, I will lend my skills to you, for now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155230,14 +155348,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " -"or a bottle of antiseptic, I'm get you fixed when I see you hurting." +"Yeah, I can perform first aid. You give me some bandages or a bottle of " +"antiseptic, I'll treat your wounds as best I can." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, I can perform first aid. You give me some bandages or a bottle of " -"antiseptic, I'll treat your wounds as best I can." +"Hey, I'm a doctor! I know how to treat trauma. You give me some bandages " +"or a bottle of antiseptic, I'm get you fixed when I see you hurting." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155410,16 +155528,16 @@ msgstr "" msgid "Thanks. I have some things for you to do." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hi there, ." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "STOP, Put your hands in the air! Ha, startled you didn't I…there is no law " "anymore..." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hi there, ." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "What are you doing here?" msgstr "你在做什麼?" @@ -155491,24 +155609,24 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "No, just no..." -msgstr "不要, 就只是不要" +msgid "Anything to do before I go to sleep?" +msgstr "在我要睡之前還有什麼要做的嗎?" #: lang/json/talk_topic_from_json.py -msgid "Just let me sleep, !" -msgstr "就讓我去睡覺吧, !" +msgid "Just few minutes more..." +msgstr "再幾分鐘就好…" #: lang/json/talk_topic_from_json.py msgid "Make it quick, I want to go back to sleep." msgstr "快一點啦, 我想要回去睡覺了。" #: lang/json/talk_topic_from_json.py -msgid "Just few minutes more..." -msgstr "再幾分鐘就好…" +msgid "Just let me sleep, !" +msgstr "就讓我去睡覺吧, !" #: lang/json/talk_topic_from_json.py -msgid "Anything to do before I go to sleep?" -msgstr "在我要睡之前還有什麼要做的嗎?" +msgid "No, just no..." +msgstr "不要, 就只是不要" #: lang/json/talk_topic_from_json.py msgid "Wake up!" @@ -155622,15 +155740,15 @@ msgid "Let's go." msgstr "我們走。" #: lang/json/talk_topic_from_json.py -msgid "*will not engage enemies." +msgid "*will engage all enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage nearby enemies." +msgid "*will engage enemies close enough to attack without moving." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage weak enemies." +msgid "*will engage distant enemies without moving." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155638,19 +155756,15 @@ msgid "*will engage enemies you attack." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage distant enemies without moving." -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "*will engage enemies close enough to attack without moving." +msgid "*will engage weak enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will engage all enemies." +msgid "*will engage nearby enemies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid " OVERRIDE: " +msgid "*will not engage enemies." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155658,7 +155772,7 @@ msgid " " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid " OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py @@ -155666,27 +155780,27 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" +msgid "" +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155694,7 +155808,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155702,13 +155816,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid " What should do?" msgstr "" @@ -155817,13 +155935,12 @@ msgid "Attack anything you want." msgstr "任意攻擊吧。" #: lang/json/talk_topic_from_json.py -#, no-python-format -msgid "*will reserve 100% of CBM power for defense or utility CBMs." +msgid "*will not reserve any power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 75% of CBM power for defense or utility CBMs." +msgid "*will reserve 25% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155833,11 +155950,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will reserve 25% of CBM power for defense or utility CBMs." +msgid "*will reserve 75% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not reserve any power for defense or utility CBMs." +#, no-python-format +msgid "*will reserve 100% of CBM power for defense or utility CBMs." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155877,12 +155995,12 @@ msgstr "盡情使用生化插件武器。不用保留任何能量給防禦性或 #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 90% of total power." +msgid "*will recharge power CBMs until has 10% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 75% of total power." +msgid "*will recharge power CBMs until has 25% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155892,12 +156010,12 @@ msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 25% of total power." +msgid "*will recharge power CBMs until has 75% of total power." msgstr "" #: lang/json/talk_topic_from_json.py #, no-python-format -msgid "*will recharge power CBMs until has 10% of total power." +msgid "*will recharge power CBMs until has 90% of total power." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155933,19 +156051,19 @@ msgid "" msgstr "我們快沒補給了。把生化能量充電到 10％。" #: lang/json/talk_topic_from_json.py -msgid "*will aim when it's convenient." +msgid "*will not bother to aim at all." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will only shoot after taking a long time to aim." +msgid "*will take time and aim carefully." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will take time and aim carefully." +msgid "*will only shoot after taking a long time to aim." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "*will not bother to aim at all." +msgid "*will aim when it's convenient." msgstr "" #: lang/json/talk_topic_from_json.py @@ -155989,7 +156107,7 @@ msgid "OVERRIDE: " msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -155997,11 +156115,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - -#: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156009,7 +156123,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156017,7 +156131,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156025,7 +156139,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156033,7 +156147,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156041,7 +156155,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156049,7 +156163,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py @@ -156057,13 +156171,17 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" +msgid "" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Follow same rules as this follower." msgstr "遵循這位追隨者的一套規則。" @@ -156232,14 +156350,14 @@ msgstr "* 嗤嗤* 十 - 四，我會去那裡，完畢。" msgid "Sure thing, I'll make my way there." msgstr "當然，我會去那裡。" -#: lang/json/talk_topic_from_json.py -msgid "" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Yeah, this summer heat is hitting me hard, let's take a quick break, how " @@ -156408,28 +156526,28 @@ msgid "I don't care." msgstr "我不在乎。" #: lang/json/talk_topic_from_json.py -msgid "I have another job for you. Want to hear about it?" -msgstr "我有另一件工作給你。想要聽看看嗎？" - -#: lang/json/talk_topic_from_json.py -msgid "I just have one job for you. Want to hear about it?" -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 "我有其他的工作給你。想要聽看看嗎？" +msgid "I don't have any jobs for you." +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 don't have any jobs for you." -msgstr "我沒有可以給你的工作。" +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 more jobs for you." -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 another job for you. Want to hear about it?" +msgstr "我有另一件工作給你。想要聽看看嗎？" #: lang/json/talk_topic_from_json.py lang/json/talk_topic_from_json.py #: src/npctalk.cpp @@ -156440,10 +156558,6 @@ msgstr "喔, 好吧。" msgid "Never mind, I'm not interested." msgstr "別在意, 我沒興趣。" -#: lang/json/talk_topic_from_json.py -msgid "You're not working on anything for me now." -msgstr "你現在並沒有幫我做任何工作。" - #: lang/json/talk_topic_from_json.py msgid "Which job?" msgstr "哪件工作？" @@ -156452,6 +156566,10 @@ msgstr "哪件工作？" msgid "What about it?" msgstr "這樣如何？" +#: lang/json/talk_topic_from_json.py +msgid "You're not working on anything for me now." +msgstr "你現在並沒有幫我做任何工作。" + #: lang/json/talk_topic_from_json.py msgid "I'll do it!" msgstr "我會做的!" @@ -156660,49 +156778,49 @@ msgstr "嗯, 好吧。" msgid "Thanks!" msgstr "謝謝!" -#: lang/json/talk_topic_from_json.py -msgid "Focus on the road, mate!" -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'm too thirsty, give me something to drink." -msgstr "我太渴了, 給我點能喝的東西。" +msgid "I have some reason for not telling you." +msgstr "我有些苦衷，不能告訴你。" #: lang/json/talk_topic_from_json.py -msgid "I'm too hungry, give me something to eat." -msgstr "我太餓了, 給我點能吃的東西。" +msgid "Nothing comes to my mind now. Ask me later perhaps?" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "I'm too tired, let me rest first." msgstr "我太累了, 讓我先休息一下。" #: lang/json/talk_topic_from_json.py -msgid "Nothing comes to my mind now. Ask me later perhaps?" -msgstr "" +msgid "I'm too hungry, give me something to eat." +msgstr "我太餓了, 給我點能吃的東西。" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for not telling you." -msgstr "我有些苦衷，不能告訴你。" +msgid "I'm too thirsty, give me something to drink." +msgstr "我太渴了, 給我點能喝的東西。" + +#: lang/json/talk_topic_from_json.py +msgid "Focus on the road, mate!" +msgstr "專心路況，夥伴！" #: lang/json/talk_topic_from_json.py msgid "Ah, okay." msgstr "啊，好的。" #: lang/json/talk_topic_from_json.py -msgid "Not until I get some antibiotics..." -msgstr "我還沒找到抗生素…" +msgid "Why should I travel with you?" +msgstr "為什麼我要跟著你旅行?" #: lang/json/talk_topic_from_json.py msgid "You asked me recently; ask again later." msgstr "你沒多久前才問過我, 晚點再說吧。" #: lang/json/talk_topic_from_json.py -msgid "Why should I travel with you?" -msgstr "為什麼我要跟著你旅行?" +msgid "Not until I get some antibiotics..." +msgstr "我還沒找到抗生素…" #: lang/json/talk_topic_from_json.py msgid "Understood. I'll get those antibiotics." @@ -156792,21 +156910,21 @@ msgstr "不, 我待在這就好了。" msgid "On second thought, never mind." msgstr "我再想想, 抱歉。" -#: lang/json/talk_topic_from_json.py -msgid "I can't train you properly while you're operating a vehicle!" -msgstr "你在駕駛車輛時我無法訓練你。" - #: lang/json/talk_topic_from_json.py msgid "I can't train you properly while I'm operating a vehicle!" msgstr "我在駕駛車輛時無法訓練你。" +#: lang/json/talk_topic_from_json.py +msgid "I have some reason for denying you training." +msgstr "我有些苦衷，不能接受你的訓練。" + #: lang/json/talk_topic_from_json.py msgid "Give it some time, I'll show you something new later..." msgstr "給我點時間, 我會讓你看些新玩意…" #: lang/json/talk_topic_from_json.py -msgid "I have some reason for denying you training." -msgstr "我有些苦衷，不能接受你的訓練。" +msgid "I can't train you properly while you're operating a vehicle!" +msgstr "你在駕駛車輛時我無法訓練你。" #: lang/json/talk_topic_from_json.py msgid "Not a bloody chance, I'm going to get left behind!" @@ -156844,14 +156962,14 @@ msgstr "我想自己管好自己就好了。" msgid "I understand…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "You just asked me for stuff; ask later." -msgstr "你沒多久前才跟我要東西, 晚點再說吧。" - #: lang/json/talk_topic_from_json.py msgid "Why should I share my equipment with you?" msgstr "為什麼要我分裝備給你?" +#: lang/json/talk_topic_from_json.py +msgid "You just asked me for stuff; ask later." +msgstr "你沒多久前才跟我要東西, 晚點再說吧。" + #: lang/json/talk_topic_from_json.py msgid "Okay, fine." msgstr "好吧, 算了。" @@ -156994,16 +157112,16 @@ msgstr "開張大吉!" msgid "You might be seeing more of me…" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hey again. *kzzz*" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I… I'm free. *Zzzt* I'm actually free! *bzzz* Look, you're the first person " "I've seen in a long time." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Hey again. *kzzz*" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hey. Let's chat for a second." msgstr "嘿。讓我們聊一會兒。" @@ -158005,28 +158123,28 @@ msgid "This is a low driving test response." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Greetings friend, it's nice to see you." -msgstr "朋友你好，很高興見到你。" +msgid "Greeting citizen, what brings you to the FoodLair?" +msgstr "公民你好，是什麼風把你吹來美食巢穴呢？" #: lang/json/talk_topic_from_json.py -msgid "So you're back… Explain yourself!" -msgstr "" +msgid "Still here? Take your time, it's rough out there." +msgstr "還在？慢慢來，這很艱難。" #: lang/json/talk_topic_from_json.py -msgid "What sorcery is this?" -msgstr "這是什麼巫術？" +msgid "Greetings friend, it's nice to see you." +msgstr "朋友你好，很高興見到你。" #: lang/json/talk_topic_from_json.py msgid "Welcome home Foodkid!" msgstr "歡迎回家，美食小子！" #: lang/json/talk_topic_from_json.py -msgid "Still here? Take your time, it's rough out there." -msgstr "還在？慢慢來，這很艱難。" +msgid "What sorcery is this?" +msgstr "這是什麼巫術？" #: lang/json/talk_topic_from_json.py -msgid "Greeting citizen, what brings you to the FoodLair?" -msgstr "公民你好，是什麼風把你吹來美食巢穴呢？" +msgid "So you're back… Explain yourself!" +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Greetings… Foodperson?" @@ -159362,10 +159480,6 @@ msgid "" " just busy not dying." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "I just can't talk about that right now. I can't." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "I was at work at the hospital, when it all went down. It's a bit of a blur." @@ -159374,7 +159488,8 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke." +"shift I… well, I broke. I'd seen such horrible injuries, and then I… " +", I can't even talk about it." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159385,8 +159500,11 @@ msgid "" "as usual. Then, towards the end, stuff just skyrocketed. We thought it was" " a Chinese attack, and that's what we were being told. People coming in " "crazed, covered in wounds from bullets and bites. About halfway through my " -"shift I… well, I broke. I'd seen such horrible injuries, and then I… " -", I can't even talk about it." +"shift I… well, I broke." +msgstr "" + +#: lang/json/talk_topic_from_json.py +msgid "I just can't talk about that right now. I can't." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159722,13 +159840,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My husband made it out with me, but got eaten by one of those plant " +"My wife made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"My wife made it out with me, but got eaten by one of those plant " +"My husband made it out with me, but got eaten by one of those plant " "monsters a few days before I met you. This hasn't been a great year for me." msgstr "" @@ -159787,8 +159905,7 @@ msgid "I'm sorry you lost someone." msgstr "我很遺憾你失去了某人。" #: lang/json/talk_topic_from_json.py -msgid "" -"I said, I don't wanna talk about it. How are you not understanding this?" +msgid "Just another tale of love and loss. Not one I like to tell." msgstr "" #: lang/json/talk_topic_from_json.py @@ -159798,7 +159915,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Just another tale of love and loss. Not one I like to tell." +msgid "" +"I said, I don't wanna talk about it. How are you not understanding this?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -159823,34 +159941,34 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost him." +msgid "All right, fine. I had someone. I lost her." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "All right, fine. I had someone. I lost her." +msgid "All right, fine. I had someone. I lost him." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"He was at home when the bombs started dropping and the world went to hell. " -"I was at work. I tried to make it to our house, but the city was a war " +"She was at home when the bombs started dropping and the world went to hell." +" I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my husband, I would" -" have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my wife, I would " +"have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"She was at home when the bombs started dropping and the world went to hell." -" I was at work. I tried to make it to our house, but the city was a war " +"He was at home when the bombs started dropping and the world went to hell. " +"I was at work. I tried to make it to our house, but the city was a war " "zone. Things I can't describe lurching through the streets, crushing people" " and cars. Soldiers trying to stop them, but hitting people in the " "crossfire as much as anything. And then the collateral damage would get " -"right back up and join the enemy. If it hadn't been for my wife, I would " -"have just left, but I did what I could and I slipped through. I actually " +"right back up and join the enemy. If it hadn't been for my husband, I would" +" have just left, but I did what I could and I slipped through. I actually " " made it alive." msgstr "" @@ -159902,11 +160020,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My husband was still alive. He'd been in " +"up part? Like, out of all this? My wife was still alive. She'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"he'd lost a ton of blood, he was delirious by the time I found him. I " -"couldn't get him out, so I gave him food and water and just stayed with him " -"and held his hand until he passed. And then… well, then I did what you " +"she'd lost a ton of blood, she was delirious by the time I found her. I " +"couldn't get her out, so I gave her food and water and just stayed with her " +"and held her hand until she passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -159914,11 +160032,11 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "I did. Took a few hours to get an opening. And you wanna know the fucked " -"up part? Like, out of all this? My wife was still alive. She'd been in " +"up part? Like, out of all this? My husband was still alive. He'd been in " "the basement the whole time, pinned under a collapsed piece of floor. And " -"she'd lost a ton of blood, she was delirious by the time I found her. I " -"couldn't get her out, so I gave her food and water and just stayed with her " -"and held her hand until she passed. And then… well, then I did what you " +"he'd lost a ton of blood, he was delirious by the time I found him. I " +"couldn't get him out, so I gave him food and water and just stayed with him " +"and held his hand until he passed. And then… well, then I did what you " "have to do to the dead now. And then I packed up the last few fragments of " "my life, and I try to never look back." msgstr "" @@ -160552,6 +160670,16 @@ msgid "" "Hell on Earth. I wish I'd paid more attention in Sunday School." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I lived alone, on the old family property way out of town. My wife passed " +"away a bit over a month before this started… cancer. If anything good has " +"come out of all this, it's that I finally see a positive to losing her so " +"young. I'd been shut in for a while anyway. When the news started talking " +"about Chinese bio weapons and sleeper agents, and showing the rioting in " +"Boston and such, I curled up with my canned soup and changed the channel." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I lived alone, on the old family property way out of town. My husband " @@ -160563,16 +160691,6 @@ msgid "" "channel." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I lived alone, on the old family property way out of town. My wife passed " -"away a bit over a month before this started… cancer. If anything good has " -"come out of all this, it's that I finally see a positive to losing her so " -"young. I'd been shut in for a while anyway. When the news started talking " -"about Chinese bio weapons and sleeper agents, and showing the rioting in " -"Boston and such, I curled up with my canned soup and changed the channel." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well, it built up a bit. There was that acid rain, it burnt up one of my " @@ -160648,14 +160766,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Like I said, you want me to tell you a story, you gotta pony up the whisky." -" A full bottle, mind you." +"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " +"interested in getting attached. You didn't pay me to be your friend." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Listen. I'm gonna cut this off short. I work for you, okay? I'm not " -"interested in getting attached. You didn't pay me to be your friend." +"Like I said, you want me to tell you a story, you gotta pony up the whisky." +" A full bottle, mind you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -160958,6 +161076,15 @@ msgid "" "help, I'd just be another dripping corpse." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " +"peel out of there with her brother - my best man - in his pickup truck as " +"things went bad. So, until I run into them again one way or another, I'm " +"just gonna keep on believing they're out there, doing well. That's more " +"than most of us have." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Well, I have this weird hope. It's probably stupid, but I saw my fiancé " @@ -160968,16 +161095,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Well, I have this weird hope. It's probably stupid, but I saw my fiancée " -"peel out of there with her brother - my best man - in his pickup truck as " -"things went bad. So, until I run into them again one way or another, I'm " -"just gonna keep on believing they're out there, doing well. That's more " -"than most of us have." +msgid "What were you saying before that?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What were you saying before that?" +msgid "Welcome! You seem new, how can I help you?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161000,10 +161122,6 @@ msgstr "" msgid "How's the weather?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Welcome! You seem new, how can I help you?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "What is this place?" msgstr "這是什麼地方?" @@ -161090,16 +161208,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. The " -"newest member joined just a long time ago." +"decisions. But as I said, your chances are low, like everyone else's. If " +"you had found our community earlier, you could have had a higher chance to " +"join. The newest member joined just a few days ago." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" "You have to ask our leader, Helena, first. She's the one who makes those " -"decisions. But as I said, your chances are low, like everyone else's. If " -"you had found our community earlier, you could have had a higher chance to " -"join. The newest member joined just a few days ago." +"decisions. But as I said, your chances are low, like everyone else's. The " +"newest member joined just a long time ago." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161146,15 +161264,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back." +msgid "Hey! What are you doing up here? You are not allowed to come here." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "So…?" +msgid "You're back." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey! What are you doing up here? You are not allowed to come here." +msgid "So…?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161188,15 +161306,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am afraid you can't. Look, we are running low on our rations, and we " -"don't want to waste even more. Even if you just want to 'borrow' it. Too " -"bad, we could've helped you if you had come here earlier." +"I am sorry, but nobody is allowed to take anything from here. We would like" +" to help you, but we already have enough mouths to feed." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I am sorry, but nobody is allowed to take anything from here. We would like" -" to help you, but we already have enough mouths to feed." +"I am afraid you can't. Look, we are running low on our rations, and we " +"don't want to waste even more. Even if you just want to 'borrow' it. Too " +"bad, we could've helped you if you had come here earlier." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161239,14 +161357,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I don't know anymore. You see, we used to have 20 crates full of non-" -"perishables. That was months ago. We are running out." +"That information is a bit private, but you can see for yourself. We have " +"about 20 crates full of non-perishables." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"That information is a bit private, but you can see for yourself. We have " -"about 20 crates full of non-perishables." +"I don't know anymore. You see, we used to have 20 crates full of non-" +"perishables. That was months ago. We are running out." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161315,11 +161433,11 @@ msgid "That's good to hear." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Are you here to protect us?" +msgid "Pleased to meet you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Pleased to meet you." +msgid "Are you here to protect us?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161376,11 +161494,11 @@ msgid "That's the most hopeful thing I've heard so far." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Same way you got yours, I bet." +msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "CRISPR? Radiation? Something in the water? Maybe it was bunnies." +msgid "Same way you got yours, I bet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161392,19 +161510,19 @@ msgid "You're disgusting." msgstr "你真噁心。" #: lang/json/talk_topic_from_json.py -msgid "I'm very sorry to tell you this, but you should look in a mirror." +msgid "Insulting people who could help you is unlikely to aid survival." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Insulting people who could help you is unlikely to aid survival." +msgid "I'm very sorry to tell you this, but you should look in a mirror." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hey, ." +msgid "I can't believe my eyes. Please get me outta here…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I can't believe my eyes. Please get me outta here…" +msgid "Hey, ." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161430,9 +161548,7 @@ msgid "Sounds good, Barry." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge, I think you need to keep on walking, straight off this " -"property." +msgid "Hello Ma'am, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -161440,7 +161556,9 @@ msgid "Hello Sir, what brings you here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello Ma'am, what brings you here?" +msgid "" +"I see that badge, I think you need to keep on walking, straight off this " +"property." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161515,13 +161633,13 @@ msgid "Where can I find Chris?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"I see that badge. You need to leave our land, my relatives have no fondness" -" for Marshals." +msgid "Hi, what's up?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi, what's up?" +msgid "" +"I see that badge. You need to leave our land, my relatives have no fondness" +" for Marshals." msgstr "" #: lang/json/talk_topic_from_json.py @@ -161615,16 +161733,16 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Is that a U.S. Marshal's badge you're wearing?" -msgstr "你佩戴的是聯邦法警的徽章嗎？" +msgid "Hi, what brings you here?" +msgstr "嗨，什麼風把你吹來這？" #: lang/json/talk_topic_from_json.py msgid "Hello, what brings you here?" msgstr "哈囉，什麼風把你吹來這呢？" #: lang/json/talk_topic_from_json.py -msgid "Hi, what brings you here?" -msgstr "嗨，什麼風把你吹來這？" +msgid "Is that a U.S. Marshal's badge you're wearing?" +msgstr "你佩戴的是聯邦法警的徽章嗎？" #: lang/json/talk_topic_from_json.py msgid "Yes, I'm a marshal." @@ -161924,14 +162042,14 @@ msgstr "就這樣吧。我們可以討論別的嗎？" msgid "That's all for now. I'd best get going." msgstr "就這樣吧。我該走了。" -#: lang/json/talk_topic_from_json.py -msgid "Leave our property, Marshal." -msgstr "離開我們的財產，法警。" - #: lang/json/talk_topic_from_json.py msgid "Hello, We don't see many people these days." msgstr "哈囉，這些日子裡我們沒見到太多人。" +#: lang/json/talk_topic_from_json.py +msgid "Leave our property, Marshal." +msgstr "離開我們的財產，法警。" + #: lang/json/talk_topic_from_json.py msgid "Hi, it looks like you are doing well here." msgstr "嗨，看來你在這裡過得不錯。" @@ -162128,8 +162246,10 @@ msgid "Tell me about your dad." msgstr "告訴我關於你老爸的事情。" #: lang/json/talk_topic_from_json.py -msgid "Marshal, I hope you're here to assist us." -msgstr "法警, 我希望你是來幫忙的。" +msgid "" +"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 "" @@ -162138,10 +162258,8 @@ msgid "" 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 " -"you'll get out while you can." -msgstr "先生, 我不知道你是怎麼到這裡來的。如果你還有點理智的話, 趁現在你還能離開, 趕緊走吧。" +msgid "Marshal, I hope you're here to assist us." +msgstr "法警, 我希望你是來幫忙的。" #: lang/json/talk_topic_from_json.py msgid "What are you doing down here?" @@ -162202,16 +162320,16 @@ 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." -msgstr "法警, 在這看到你令我有點驚訝。" +msgid "Ma'am you are not authorized to be here… you should leave." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Sir you are not authorized to be here… you should leave." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ma'am you are not authorized to be here… you should leave." -msgstr "" +msgid "Marshal, I'm rather surprised to see you here." +msgstr "法警, 在這看到你令我有點驚訝。" #: lang/json/talk_topic_from_json.py msgid "[MISSION] The captain sent me to get a frequency list from you." @@ -162247,22 +162365,6 @@ msgid "" "hoping a few plain text messages can get picked up though." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Hello, marshal." -msgstr "你好，法警。" - -#: lang/json/talk_topic_from_json.py -msgid "Marshal, I'm afraid I can't talk now." -msgstr "元帥, 抱歉我現在無法跟你交談。" - -#: lang/json/talk_topic_from_json.py -msgid "I'm not in charge here, marshal." -msgstr "法警，我不是這裡的負責人。" - -#: lang/json/talk_topic_from_json.py -msgid "I'm supposed to direct all questions to my leadership, marshal." -msgstr "法警, 我想這些問題該交由我的領導回答。" - #: lang/json/talk_topic_from_json.py msgid "Hey, citizen… I'm not sure you belong here." msgstr "" @@ -162275,6 +162377,14 @@ msgstr "你應該管好自己的事, 這裡沒什麼好看的。" msgid "If you need something you'll need to talk to someone else." msgstr "如果你想要什麼的話, 你該找別人去。" +#: lang/json/talk_topic_from_json.py +msgid "Ma'am" +msgstr "夫人" + +#: lang/json/talk_topic_from_json.py +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 "Sir." msgstr "先生。" @@ -162284,12 +162394,20 @@ msgid "Dude, if you can hold your own you should look into enlisting." msgstr "老兄, 如果你靠得住, 你該去報名參軍的。" #: lang/json/talk_topic_from_json.py -msgid "Ma'am" -msgstr "夫人" +msgid "Hello, marshal." +msgstr "你好，法警。" #: lang/json/talk_topic_from_json.py -msgid "Hey miss, don't you think it would be safer if you stuck with me?" -msgstr "嘿小姐, 難道你不覺得和我一起會更安全麼?" +msgid "Marshal, I'm afraid I can't talk now." +msgstr "元帥, 抱歉我現在無法跟你交談。" + +#: lang/json/talk_topic_from_json.py +msgid "I'm not in charge here, marshal." +msgstr "法警，我不是這裡的負責人。" + +#: lang/json/talk_topic_from_json.py +msgid "I'm supposed to direct all questions to my leadership, marshal." +msgstr "法警, 我想這些問題該交由我的領導回答。" #: lang/json/talk_topic_from_json.py msgid "Don't mind me…" @@ -162346,15 +162464,14 @@ msgid "I've no use for weaklings. Run. Now." msgstr "我對懦夫沒興趣。快滾，現在。" #: lang/json/talk_topic_from_json.py -msgid "" -"So, any luck with convincing the others to come on your crazy adventure yet?" -msgstr "那麼，說服其他人加入你那瘋狂的冒險有什麼進展嗎？" +msgid "Please, help me. I need food." +msgstr "請幫幫我，我需要食物。" #: lang/json/talk_topic_from_json.py msgid "" -"I'm sorry to say it after all you've done for me, but… I don't suppose " -"you've got anything to eat?" -msgstr "" +"Please, help me. I need food. Aren't you their sheriff? Can't you help " +"me?" +msgstr "請幫幫我，我需要食物。你不是他們的警長嗎？難道你不能幫我嗎？" #: lang/json/talk_topic_from_json.py msgid "Thank you again. I really appreciate the food." @@ -162362,13 +162479,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Please, help me. I need food. Aren't you their sheriff? Can't you help " -"me?" -msgstr "請幫幫我，我需要食物。你不是他們的警長嗎？難道你不能幫我嗎？" +"I'm sorry to say it after all you've done for me, but… I don't suppose " +"you've got anything to eat?" +msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Please, help me. I need food." -msgstr "請幫幫我，我需要食物。" +msgid "" +"So, any luck with convincing the others to come on your crazy adventure yet?" +msgstr "那麼，說服其他人加入你那瘋狂的冒險有什麼進展嗎？" #: lang/json/talk_topic_from_json.py msgid "" @@ -162387,15 +162505,15 @@ msgstr "離我遠一點！" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm reduced to " -"begging to survive." -msgstr "" +"here as long as I keep it clean and don't make a fuss, but I'm so hungry." +msgstr "他們說他們人太多了，不能讓我加入。我被允許在這邊紮營只要我能保持乾淨跟不搞事，不過我好餓阿。" #: lang/json/talk_topic_from_json.py msgid "" "They won't let me in. They say they're too full. I'm allowed to camp out " -"here as long as I keep it clean and don't make a fuss, but I'm so hungry." -msgstr "他們說他們人太多了，不能讓我加入。我被允許在這邊紮營只要我能保持乾淨跟不搞事，不過我好餓阿。" +"here as long as I keep it clean and don't make a fuss, but I'm reduced to " +"begging to survive." +msgstr "" #: lang/json/talk_topic_from_json.py msgid "Why don't you scavenge your own food?" @@ -162494,16 +162612,16 @@ msgid "" "hurry to face that again." msgstr "謝謝你的好意，但我想我寧願留在這裡等待機會，也不願再去外面冒險。我還記得，我並不急著再次面對它。" +#: lang/json/talk_topic_from_json.py +msgid "I'm sorry, I'm too hungry to make a big decision like that." +msgstr "對不起，我太餓了，無法做出那麼重大的決定。" + #: lang/json/talk_topic_from_json.py msgid "" "That's quite the offer, but I don't think I'd survive the trip. I don't " "think you realize how useless I am in this world." msgstr "這是相當棒的提議，但我不認為我會在旅途中倖存下來。我不認為你意識到我在這個世界上是多麼無用。" -#: lang/json/talk_topic_from_json.py -msgid "I'm sorry, I'm too hungry to make a big decision like that." -msgstr "對不起，我太餓了，無法做出那麼重大的決定。" - #: lang/json/talk_topic_from_json.py msgid "I can keep you safe. I'll take you there myself." msgstr "我可以保證你的安全。我會親自把你帶到那裡。" @@ -162545,17 +162663,17 @@ 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?" -msgstr "朋友，我告訴過你關於硬紙板的事嗎？你有硬紙板嗎？" +msgid "" +"How's things with you? My cardboard collection is getting quite impressive." +msgstr "你好嗎？我的紙板收藏已經相當可觀了。" #: lang/json/talk_topic_from_json.py msgid "We've done it! We've solved the list!" msgstr "我們做到了！我們已經完成這個清單！" #: lang/json/talk_topic_from_json.py -msgid "" -"How's things with you? My cardboard collection is getting quite impressive." -msgstr "你好嗎？我的紙板收藏已經相當可觀了。" +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…" @@ -162585,16 +162703,16 @@ msgstr "你是認真的嗎？穿著恐龍裝？" msgid "Do you need something to eat?" msgstr "你需要吃點東西嗎？" -#: lang/json/talk_topic_from_json.py -msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Yeah, I'm real hungry and they put drugs in most of the food. I can see " "you're not like that." msgstr "是的，我真的很餓，他們把藥物放在大部分食物中。我可以看出你不是那樣的。" +#: lang/json/talk_topic_from_json.py +msgid "Oh nice. Crunchings and munchings. That's a cool, a cool thing." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Actually can I ask you something else?" msgstr "事實上，我可以問你別的嗎？" @@ -162684,12 +162802,6 @@ msgid "" "have shields up, to protect ourselves." msgstr "你問我能看到什麼，但我不告訴你你看到了什麼。有時候我們不得不屏蔽起來，保護自己。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well… I had it all pretty together, but the others have left, and now the " -"masters won't let me build my sanctuary. Can you help me figure them out?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "That's it! I'm just gonna need a little time to get it all set up. Thanks." @@ -162697,6 +162809,12 @@ msgid "" "keep me going." msgstr "就是這樣！我只需要一點時間就可以完成所有設置。謝謝。你幫了我很多忙。我對這一切感覺更加自信讓我繼續前進。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well… I had it all pretty together, but the others have left, and now the " +"masters won't let me build my sanctuary. Can you help me figure them out?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Why don't you leave this place? Come with me, I could use some help out " @@ -162714,16 +162832,19 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Fuck off, dickwaddle." -msgstr "滾開，蠢貨。" +msgid "Don't bother with these assholes." +msgstr "別理那些混蛋。" #: lang/json/talk_topic_from_json.py -msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" -msgstr "呦。還有其他人熱衷於從這個巴士站搬到你的帳篷城嗎？" +msgid "Hey there, not-asshole. Good to see you again." +msgstr "嘿，不混蛋的。很高興再次見到你。" #: lang/json/talk_topic_from_json.py -msgid "Hey there. Good to see you again." -msgstr "嘿。很高興再次見到你。" +msgid "" +"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " +"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" +" cranky. We cool?" +msgstr "嘿，我很抱歉先前有點嚇壞了。你可能是一個混蛋，但我相信你並不是那個意思。我的血糖很低，我有點暴躁。我們沒問題吧？" #: lang/json/talk_topic_from_json.py msgid "" @@ -162732,19 +162853,16 @@ msgid "" msgstr "小心點，我現在又累又餓，對自己的行為不負任何責任。" #: lang/json/talk_topic_from_json.py -msgid "" -"Look, I'm sorry for freaking out earlier. You might be an asshole but I'm " -"sure you didn't mean it like that. My blood sugar is hella low, I get a bit" -" cranky. We cool?" -msgstr "嘿，我很抱歉先前有點嚇壞了。你可能是一個混蛋，但我相信你並不是那個意思。我的血糖很低，我有點暴躁。我們沒問題吧？" +msgid "Hey there. Good to see you again." +msgstr "嘿。很高興再次見到你。" #: lang/json/talk_topic_from_json.py -msgid "Hey there, not-asshole. Good to see you again." -msgstr "嘿，不混蛋的。很高興再次見到你。" +msgid "Yo. Anyone else keen on moving from this bus stop to your tent city?" +msgstr "呦。還有其他人熱衷於從這個巴士站搬到你的帳篷城嗎？" #: lang/json/talk_topic_from_json.py -msgid "Don't bother with these assholes." -msgstr "別理那些混蛋。" +msgid "Fuck off, dickwaddle." +msgstr "滾開，蠢貨。" #: lang/json/talk_topic_from_json.py msgid "What's up?" @@ -163030,16 +163148,16 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " -"bring me a sample maybe I'll help you set up a lab to study this stuff. " -"Almost anything could work, but if this stuff is as dangerous as you make it" -" sound, maybe make sure it's not a sporulating body." +"I dunno, scientific interest? If you don't bring me anything, no worries. " +"I'm positively swimming in entertainment here, as you can see." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I dunno, scientific interest? If you don't bring me anything, no worries. " -"I'm positively swimming in entertainment here, as you can see." +"If you get me a sample, I'll join your crazy camp expedition. Hell, if you " +"bring me a sample maybe I'll help you set up a lab to study this stuff. " +"Almost anything could work, but if this stuff is as dangerous as you make it" +" sound, maybe make sure it's not a sporulating body." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163084,14 +163202,14 @@ msgstr "" msgid "I'll see what I can do." msgstr "我會看看我能做什麼。" -#: lang/json/talk_topic_from_json.py -msgid "Thanks again for the grub, my friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Hey, are you a big fan of survival of the fittest?" msgstr "你是適者生存的粉絲嗎？" +#: lang/json/talk_topic_from_json.py +msgid "Thanks again for the grub, my friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Why do you ask?" msgstr "你為什麼問？" @@ -163110,14 +163228,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Oh you know, the usual: sittin' out here until I starve to death, playin' " -"cards with Dave, that kinda thing." +"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " +"Help a poor sickly soul out?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Because I sure ain't fit, so I'm sittin' out here until I starve to death. " -"Help a poor sickly soul out?" +"Oh you know, the usual: sittin' out here until I starve to death, playin' " +"cards with Dave, that kinda thing." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163141,12 +163259,12 @@ msgid "Why are you camped out here if they won't let you in?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "That's awful kind of you, you really are a wonderful person." +msgid "" +"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, wow! You're a real gem, you know that? Thanks for even thinking of it." +msgid "That's awful kind of you, you really are a wonderful person." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163417,19 +163535,19 @@ msgid "What's your take on the situation here?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hey, it's you again." +msgid "Oh, uh… hi. You look new. I'm Aleesha." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You're back, and still alive! Whoa." +msgid "Oh, hey, it's you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Aw hey, look who's back." +msgid "You're back, and still alive! Whoa." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, uh… hi. You look new. I'm Aleesha." +msgid "Aw hey, look who's back." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163449,16 +163567,16 @@ msgid "Hi Aleesha. I can't stay to talk." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm sixteen." -msgstr "我不是小孩了，好嗎？我已經十六歲了。" +msgid "I'm not a kid, okay? I'm fourteen." +msgstr "我不是小孩了，好嗎？我已經十四歲了。" #: lang/json/talk_topic_from_json.py msgid "I'm not a kid, okay? I'm fifteen." msgstr "我不是小孩了，好嗎？我已經十五歲了。" #: lang/json/talk_topic_from_json.py -msgid "I'm not a kid, okay? I'm fourteen." -msgstr "我不是小孩了，好嗎？我已經十四歲了。" +msgid "I'm not a kid, okay? I'm sixteen." +msgstr "我不是小孩了，好嗎？我已經十六歲了。" #: lang/json/talk_topic_from_json.py msgid "Sorry, I didn't mean anything by it. What's up?" @@ -163468,6 +163586,14 @@ msgstr "" msgid "Sorry, I didn't mean anything by it. I'll be on my way." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"I don't know what's up. I'm not sure what we've even doing here. They say " +"we're supposed to wait until we can be moved to the shelter downstairs, but " +"we've been here days and there's no word on how long we'll be waiting. It's" +" all so stupid, and nobody can tell me anything." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "We're just standing around here waiting, like a bunch of idiots. We're " @@ -163477,14 +163603,6 @@ msgid "" " We can hear them at night." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"I don't know what's up. I'm not sure what we've even doing here. They say " -"we're supposed to wait until we can be moved to the shelter downstairs, but " -"we've been here days and there's no word on how long we'll be waiting. It's" -" all so stupid, and nobody can tell me anything." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You can't just go asking people questions like that nowadays. I'm a " @@ -163522,7 +163640,8 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again, gorgeous" +msgid "" +"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163532,8 +163651,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh my, you're a beautiful lady, so nice to see you. They call me Alonso." +msgid "Hello again, gorgeous" msgstr "" #: lang/json/talk_topic_from_json.py @@ -163563,33 +163681,33 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Well, it's a lot better now that you're here. Nice to see a familiar face." +"Now that you are here, everything. Is there anything Alonso can… *do for " +"you*?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Now that you are here, everything. Is there anything Alonso can… *do for " -"you*?" +"Well, it's a lot better now that you're here. Nice to see a familiar face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "You know me, I gotta be me, right?" +msgid "Alonso cannot help himself, in the face of someone so fine as you." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Alonso cannot help himself, in the face of someone so fine as you." +msgid "You know me, I gotta be me, right?" msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw man, why you gotta be like that? I'm just tryin' to get an air of " +"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Aw come on, why you gotta be like that? I'm just tryin' to get an air of " +"Aw man, why you gotta be like that? I'm just tryin' to get an air of " "mystery okay? Nobody wants to be with a slutty guy from Brooklyn, but " "Alonso the mysterious is another story." msgstr "" @@ -163618,6 +163736,12 @@ msgstr "" msgid "Thanks. I'd better get going." msgstr "謝謝。我該走了。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Alonso does not wish to talk about the past, only the future. There are " +"dark days ahead, but perhaps together we can bring a little light?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I'm tryin' ta forget, y'know? Don't like thinkin' about the past. Better " @@ -163626,8 +163750,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Alonso does not wish to talk about the past, only the future. There are " -"dark days ahead, but perhaps together we can bring a little light?" +"Here in the center, Alonso is a bit lonely. We get a few brave, strong " +"travellers like yourself, though, and seeing them brightens Alonso's day." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163637,9 +163761,7 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Here in the center, Alonso is a bit lonely. We get a few brave, strong " -"travellers like yourself, though, and seeing them brightens Alonso's day." +msgid "Ah, another new face. Hello. I am Boris." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163654,10 +163776,6 @@ msgstr "" msgid "It is good to see you again." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Ah, another new face. Hello. I am Boris." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Boris." msgstr "" @@ -163726,13 +163844,6 @@ msgstr "" msgid "I'm sorry. I'd better get going." msgstr "" -#: lang/json/talk_topic_from_json.py -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 "" - #: lang/json/talk_topic_from_json.py msgid "" "There isn't much to do with a hammer and a saw here indoors, and working " @@ -163743,6 +163854,13 @@ msgid "" "caravans bring food, so they get priority, I can't argue with that." msgstr "" +#: lang/json/talk_topic_from_json.py +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 "" + #: lang/json/talk_topic_from_json.py msgid "" "Everyone agrees this is bad. Sleeping on a cot on the floor, crowded in " @@ -163772,15 +163890,15 @@ msgid "Got any more bread I can trade flour for?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello, nice to see you again." +msgid "Hi there. I'm Dana, nice to see a new face." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "It's good to see you're still around." +msgid "Hello, nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there. I'm Dana, nice to see a new face." +msgid "It's good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163832,8 +163950,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Not since I last saw you, sorry. Come by in another day or two and I'll try" -" to keep a loaf set aside for you, but they disappear fast." +"I do a bit. I got a sourdough starter going almost as soon as I arrived, " +"and it's making passable bread already. I cooked some up yesterday " +"actually, I could probably trade a loaf of fresh bread for, say, about eight" +" cups of flour." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163844,10 +163964,8 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do a bit. I got a sourdough starter going almost as soon as I arrived, " -"and it's making passable bread already. I cooked some up yesterday " -"actually, I could probably trade a loaf of fresh bread for, say, about eight" -" cups of flour." +"Not since I last saw you, sorry. Come by in another day or two and I'll try" +" to keep a loaf set aside for you, but they disappear fast." msgstr "" #: lang/json/talk_topic_from_json.py @@ -163869,6 +163987,12 @@ msgid "" "that's a lot more than most." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " +"not too bad honestly. Everyone here seems to like it." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "Great, here's a loaf of the best damn sourdough bread in the world. I used " @@ -163890,12 +164014,6 @@ msgid "" "now." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Great, here's a loaf of my locally-famous, not-very-mature sourdough. It's " -"not too bad honestly. Everyone here seems to like it." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "You seem pretty unhappy about the quality of your bread. Is there something" @@ -163925,10 +164043,6 @@ msgid "" "gonna murder someone soon, mark my words." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Have you heard anything back from the ranch about jobs yet?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Huh. I've made a few friends here, but not so much as I'd stick around here" @@ -163936,6 +164050,10 @@ msgid "" "me. It does sound nice, if they're looking for more workers." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Have you heard anything back from the ranch about jobs yet?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I spoke to the foreman over at Tacoma Ranch. If you're willing to put in " @@ -163972,16 +164090,16 @@ msgid "" "consider getting out of here and signing up." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Always good to see you, friend." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Well now, good to see another new face! Welcome to the center, friend, I'm " "Draco." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Always good to see you, friend." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Draco." msgstr "" @@ -164216,12 +164334,12 @@ msgid "Well then, I'll leave you here where it's safe." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"My savior! My patron of the arts! You're always welcome here, friend." +msgid "Man, just imagine what I could do with a new guitar." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Man, just imagine what I could do with a new guitar." +msgid "" +"My savior! My patron of the arts! You're always welcome here, friend." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164321,14 +164439,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Yeah, no worries, though. I'm good at the moment. Ask me again later and " -"maybe I'll have scrounged up some more cash for you." +"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " +"up some Merch bucks for, say, five joints or joints-worth of the good stuff." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Amazing! My lucky day. Let's see here. What can I offer… I can scrounge " -"up some Merch bucks for, say, five joints or joints-worth of the good stuff." +"Yeah, no worries, though. I'm good at the moment. Ask me again later and " +"maybe I'll have scrounged up some more cash for you." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164380,21 +164498,21 @@ msgid "Is there anything I can do to help you out?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello again." +msgid "" +"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " +"meet new people but there are no beds to share." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you're still around." +msgid "Hello again." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hi." +msgid "Good to see you're still around." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hey, a new face. Hi, I'm Fatima. Just visiting I hope? It's nice to " -"meet new people but there are no beds to share." +msgid "Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164456,15 +164574,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Well, hello." +msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Good to see you again." +msgid "Well, hello." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi. Hi there. I'm Garry, Garry Villeneuve." +msgid "Good to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164529,6 +164647,12 @@ msgid "" "look like we'll be here for the long term. If we live that long." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " +"call me Gunny." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "Hi." msgstr "嗨。" @@ -164537,12 +164661,6 @@ msgstr "嗨。" msgid "Hey again." msgstr "嘿，又見面了。" -#: lang/json/talk_topic_from_json.py -msgid "" -"Oh, hello. I don't think I've seen you around before. I'm Guneet, people " -"call me Gunny." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, Gunny." msgstr "" @@ -164590,12 +164708,12 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Nice to see you again." +msgid "" +"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." +msgid "Nice to see you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164746,6 +164864,15 @@ msgid "" "like this before somebody snaps." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, there's a bunch of us. We're starting to form a bit of a community. " +"Fatima and I work together a fair bit, and I've been hanging out with Dana, " +"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " +"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " +"What did you want to know?" +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "For better or worse, we're a community now. Fatima and I work together a " @@ -164758,15 +164885,6 @@ msgid "" "want to know?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, there's a bunch of us. We're starting to form a bit of a community. " -"Fatima and I work together a fair bit, and I've been hanging out with Dana, " -"Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the " -"Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. " -"What did you want to know?" -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Can you tell me about the Free Merchants?" msgstr "你能告訴我有關自由商會的事情嗎？" @@ -164832,6 +164950,14 @@ msgid "" "hope that there's a future to be had." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Boris and Garry are married, I guess. They kinda keep to themselves, they " +"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" +" I'm not totally sure. He seems nice enough, but he's a man of few words. " +"I can't get a good bead on them. I've learned not to pry too much though." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "" "I didn't get to know Boris, Garry, and Stan so well for the first while. " @@ -164844,10 +164970,10 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Boris and Garry are married, I guess. They kinda keep to themselves, they " -"seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but" -" I'm not totally sure. He seems nice enough, but he's a man of few words. " -"I can't get a good bead on them. I've learned not to pry too much though." +"I really can't get a bead on them. They never really talk to anyone outside" +" of their little family group, they just sit in their own spot and speak " +"Punjabi. They always seem nice, and they do their share, they just don't " +"have any social connection." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164861,10 +164987,14 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I really can't get a bead on them. They never really talk to anyone outside" -" of their little family group, they just sit in their own spot and speak " -"Punjabi. They always seem nice, and they do their share, they just don't " -"have any social connection." +"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " +"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " +"both seem to want to run the show here, but I try to stay out of those " +"politics and just focus on building stuff. I don't see much good coming of " +"it. Alonso is fine, he's clearly interested in me, and also in every other " +"single woman here. Not my thing, in a group this small. John is a walking " +"stereotype, I imagine there must be more depth to him, but I haven't seen it" +" yet." msgstr "" #: lang/json/talk_topic_from_json.py @@ -164881,25 +165011,13 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Vanessa… well, she's nice, I guess. I gotta say, she kinda drives me nuts, " -"but we're in this together so I try not to be too harsh. Uyen and Rhyzaea " -"both seem to want to run the show here, but I try to stay out of those " -"politics and just focus on building stuff. I don't see much good coming of " -"it. Alonso is fine, he's clearly interested in me, and also in every other " -"single woman here. Not my thing, in a group this small. John is a walking " -"stereotype, I imagine there must be more depth to him, but I haven't seen it" -" yet." +"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Howdy, pardner." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Howdy, pardner. They call me Clemens. John Clemens. I'm an ol' cowhand." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Nice to meet you, John." msgstr "" @@ -164954,11 +165072,11 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello sir. I am Mandeep Singh." +msgid "Hello ma'am. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hello ma'am. I am Mandeep Singh." +msgid "Hello sir. I am Mandeep Singh." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165001,15 +165119,15 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hi there." +msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, hello there." +msgid "Hi there." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah! You are new. I'm sorry, I'm Mangalpreet." +msgid "Oh, hello there." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165210,12 +165328,12 @@ msgid "What brings you around here? We don't see a lot of new faces." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Need to talk?" +msgid "" +"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hi there. I don't think we've met before. I'm Rhyzaea, people call me Rhy." +msgid "Need to talk?" msgstr "" #: lang/json/talk_topic_from_json.py @@ -165307,17 +165425,17 @@ msgid "Do you want to talk about your story?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Hm? Oh, hi." +msgid "" +"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " +"Stan." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "...Hi." +msgid "Hm? Oh, hi." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Hello. I'm sorry, if we've met before, I don't really remember. I'm… I'm " -"Stan." +msgid "...Hi." msgstr "" #: lang/json/talk_topic_from_json.py @@ -165429,16 +165547,16 @@ msgstr "" msgid "Hmm, can we change this shave a little please?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Oh, you're back." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "" "Oh, great. Another new mouth to feed? Just what we need. Well, I'm " "Vanessa." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Oh, you're back." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "I'm not a new mouth to feed, but nice to meet you too." msgstr "" @@ -165475,14 +165593,6 @@ msgstr "" msgid "Could you give me a haircut?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "" -"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " -"the world's dead, and there's not enough food to go around. At least I can " -"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 "" - #: lang/json/talk_topic_from_json.py msgid "" "You want the sarcastic version, or the really sarcastic version? I'm stuck " @@ -165491,6 +165601,14 @@ msgid "" "out?" msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "" +"Well, I'm stuck in a dank shitty brick building with two dozen strangers, " +"the world's dead, and there's not enough food to go around. At least I can " +"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 "" + #: lang/json/talk_topic_from_json.py msgid "" "I can see you need one, but last time I used these shears it was to stab a " @@ -165668,15 +165786,15 @@ msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"I do. I don't know what you did to convince them to move out, but our " -"supply chain and I both thank you. I hope it wasn't too unseemly." +"Even once we got things sorted out, there weren't enough beds for everyone, " +"and definitely not enough supplies. These are harsh times. We're doing what" +" we can for those folks… at least they've got shelter." msgstr "" #: lang/json/talk_topic_from_json.py msgid "" -"Even once we got things sorted out, there weren't enough beds for everyone, " -"and definitely not enough supplies. These are harsh times. We're doing what" -" we can for those folks… at least they've got shelter." +"I do. I don't know what you did to convince them to move out, but our " +"supply chain and I both thank you. I hope it wasn't too unseemly." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166035,14 +166153,14 @@ msgstr "像個文明人, 不然我就讓你生不如死。" 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." -msgstr "夫人, 你真的不應該旅行到那裏。" - #: lang/json/talk_topic_from_json.py msgid "Rough out there, isn't it?" msgstr "外面盡是蠻荒, 對吧?" +#: lang/json/talk_topic_from_json.py +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 "" @@ -166071,14 +166189,14 @@ msgstr "" msgid "Well, I'd better be going. Bye." msgstr "我想我要走了，再見。" -#: lang/json/talk_topic_from_json.py -msgid "Welcome marshal..." -msgstr "歡迎法警…" - #: lang/json/talk_topic_from_json.py msgid "Welcome..." msgstr "歡迎…" +#: lang/json/talk_topic_from_json.py +msgid "Welcome marshal..." +msgstr "歡迎法警…" + #: lang/json/talk_topic_from_json.py msgid "" "Before you say anything else, we're full. We don't have the space, nor the " @@ -166310,14 +166428,14 @@ msgid "" "attacked by zombie hordes, as you might guess." msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "Marshal..." -msgstr "法警…" - #: lang/json/talk_topic_from_json.py msgid "Citizen..." msgstr "公民…" +#: lang/json/talk_topic_from_json.py +msgid "Marshal..." +msgstr "法警…" + #: lang/json/talk_topic_from_json.py msgid "Can I trade for supplies?" msgstr "我可以交易補給品嗎？" @@ -166374,14 +166492,14 @@ msgid "" "buy from you. I don't suppose you want to donate?" msgstr "不行。我們沒有多餘的物資能夠賣你，而且我們也沒有辦法跟你買任何東西。我想你應該不會想要捐贈吧？" -#: lang/json/talk_topic_from_json.py -msgid "That sure is a shiny badge you got there!" -msgstr "你那真是一個閃亮亮的警徽啊!" - #: lang/json/talk_topic_from_json.py msgid "Heh, you look important." msgstr "嘿, 你看起來很重要。" +#: lang/json/talk_topic_from_json.py +msgid "That sure is a shiny badge you got there!" +msgstr "你那真是一個閃亮亮的警徽啊!" + #: lang/json/talk_topic_from_json.py msgid "I'm actually new." msgstr "我其實是新來的。" @@ -166443,13 +166561,13 @@ msgid "" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "" -"Same way you got yours, I bet. Keep quiet about it, some people here look " -"down on people like us." +msgid "Ssh. Some people in here hate… mutations. This was an accident." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ssh. Some people in here hate… mutations. This was an accident." +msgid "" +"Same way you got yours, I bet. Keep quiet about it, some people here look " +"down on people like us." msgstr "" #: lang/json/talk_topic_from_json.py @@ -166474,22 +166592,22 @@ msgstr "我要買。" msgid "Who needs rebar?" msgstr "誰需要鋼筋?" -#: lang/json/talk_topic_from_json.py -msgid "As if you're one to talk. Screw You." -msgstr "" - #: lang/json/talk_topic_from_json.py msgid "Screw You!" msgstr "去你的!" #: lang/json/talk_topic_from_json.py -msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgid "As if you're one to talk. Screw You." msgstr "" #: lang/json/talk_topic_from_json.py msgid "Huh, thought I smelled someone new. Can I help you?" msgstr "嗯, 看來我聞到菜鳥味了。我能幫你什麼?" +#: lang/json/talk_topic_from_json.py +msgid "I thought I smelled a pig. I jest… please don't arrest me." +msgstr "" + #: lang/json/talk_topic_from_json.py msgid "You… smelled me?" msgstr "" @@ -166765,6 +166883,16 @@ msgstr "我猜你就是老大。" msgid "Glad to have you aboard." msgstr "很高興有你一同搭乘。" +#: lang/json/talk_topic_from_json.py +msgid "" +"Hold there. I don't care how you got access to this location, but you are " +"coming no further. Go away." +msgstr "等一下。我不在乎你是怎麼進來這裡的，但是你不能再前進了。快離開。" + +#: lang/json/talk_topic_from_json.py +msgid "We haven't changed our mind. Go away." +msgstr "我們沒有改變主意。快離開。" + #: lang/json/talk_topic_from_json.py msgid "So, do you need something?" msgstr "那麼，你需要什麼嗎？" @@ -166845,16 +166973,6 @@ msgstr "" msgid "If/you speak to/understand… you/me. Yes?" msgstr "" -#: lang/json/talk_topic_from_json.py -msgid "We haven't changed our mind. Go away." -msgstr "我們沒有改變主意。快離開。" - -#: lang/json/talk_topic_from_json.py -msgid "" -"Hold there. I don't care how you got access to this location, but you are " -"coming no further. Go away." -msgstr "等一下。我不在乎你是怎麼進來這裡的，但是你不能再前進了。快離開。" - #: lang/json/talk_topic_from_json.py msgid "Wait! What??" msgstr "" @@ -167127,6 +167245,14 @@ msgstr "其實，我認為我沒空做那個，抱歉。" msgid "Keep it civil, merc." msgstr "" +#: lang/json/talk_topic_from_json.py +msgid "Here to trade, I hope?" +msgstr "我希望在這裡進行交易，可以嗎？" + +#: lang/json/talk_topic_from_json.py +msgid "Safe travels, scavenger." +msgstr "旅途平安，拾荒者。" + #: lang/json/talk_topic_from_json.py msgid "" "Still plenty of outlaws in the roads, perhaps you should tend to your job, " @@ -167142,12 +167268,11 @@ msgid "Oh, a U.S. marshal, how quaint." msgstr "喔，一位聯邦法警，多麼復古。" #: lang/json/talk_topic_from_json.py -msgid "Here to trade, I hope?" -msgstr "我希望在這裡進行交易，可以嗎？" - -#: lang/json/talk_topic_from_json.py -msgid "Safe travels, scavenger." -msgstr "旅途平安，拾荒者。" +msgid "" +"We have been supplying this lab here with food from a few hunting and " +"farming communities nearby. The roads are though and dangerous, but it " +"makes good money, and beats scavenging the cities for scraps." +msgstr "我們一直在這里為該實驗室提供附近一些狩獵和農業社區的食物。道路雖然險峻，但是能賺很多錢，而且完勝在城市裡拾荒。" #: lang/json/talk_topic_from_json.py msgid "" @@ -167155,13 +167280,6 @@ msgid "" "fair deal?" msgstr "我管好我的事，你管好你自己的，法警。這樣可以接受嗎？" -#: lang/json/talk_topic_from_json.py -msgid "" -"We have been supplying this lab here with food from a few hunting and " -"farming communities nearby. The roads are though and dangerous, but it " -"makes good money, and beats scavenging the cities for scraps." -msgstr "我們一直在這里為該實驗室提供附近一些狩獵和農業社區的食物。道路雖然險峻，但是能賺很多錢，而且完勝在城市裡拾荒。" - #: lang/json/talk_topic_from_json.py msgid "Keep safe, then." msgstr "那麼請注意安全。" @@ -167378,16 +167496,16 @@ msgid "I'll talk with them then…" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Can I help you, marshal?" -msgstr "我能幫你什麼嗎，法警？" +msgid "Morning ma'am, how can I help you?" +msgstr "早安小姐, 我可以幫你做什麼嗎?" #: lang/json/talk_topic_from_json.py msgid "Morning sir, how can I help you?" msgstr "早安先生, 我可以幫你做什麼嗎?" #: lang/json/talk_topic_from_json.py -msgid "Morning ma'am, how can I help you?" -msgstr "早安小姐, 我可以幫你做什麼嗎?" +msgid "Can I help you, marshal?" +msgstr "我能幫你什麼嗎，法警？" #: lang/json/talk_topic_from_json.py msgid "" @@ -167495,14 +167613,14 @@ msgstr "你有什麼類型的工作可以給我做?" msgid "Not now." msgstr "現在不行。" -#: lang/json/talk_topic_from_json.py -msgid "Come back later, I need to take care of a few things first." -msgstr "晚點再回來, 我手頭上有點事情要忙。" - #: lang/json/talk_topic_from_json.py msgid "I can take a look at you or your companions if you are injured." msgstr "如果你或是你的同伴受傷了, 我能照料你們。" +#: lang/json/talk_topic_from_json.py +msgid "Come back later, I need to take care of a few things first." +msgstr "晚點再回來, 我手頭上有點事情要忙。" + #: lang/json/talk_topic_from_json.py msgid "[$200, 30m] I need you to patch me up." msgstr "[$200, 30分] 我需要你醫療我。" @@ -167735,7 +167853,7 @@ msgid "Ok." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "What are crypto coins?" +msgid "Crypto coins? Are you insane, there isn't any global internet now." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167758,9 +167876,10 @@ 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." +"We use so-called crypto coins for money here. They were a pre-Cataclysm " +"attempt to abstract money even further and create electronic cash. Now it's" +" a joke because we use physical coins. Barter only gets you so far. And " +"one day we'll have the Net back up." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167855,11 +167974,11 @@ msgid "I must purge this place before I can move on." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Oh, you again." +msgid "Huh? *mumble mumble* … Who are you?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Huh? *mumble mumble* … Who are you?" +msgid "Oh, you again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -167871,11 +167990,11 @@ msgid "And leave my tower and all my research? I think not." msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Ah, hello again." +msgid "Do you seek power as well?" msgstr "" #: lang/json/talk_topic_from_json.py -msgid "Do you seek power as well?" +msgid "Ah, hello again." msgstr "" #: lang/json/talk_topic_from_json.py @@ -175972,12 +176091,6 @@ msgstr "法力灌注" msgid "mana weaving" msgstr "法力編織" -#. ~ Adjective in "You block of the damage with your . -#: lang/json/trap_from_json.py src/advanced_inv.cpp src/magic.cpp -#: src/map_extras.cpp src/melee.cpp src/recipe.cpp -msgid "none" -msgstr "無" - #. ~ Trap-vehicle collision message for trap 'bubble wrap' #: lang/json/trap_from_json.py src/trapfunc.cpp msgid "Pop!" @@ -182345,16 +182458,18 @@ msgstr "[<] 頁面 %1$d／%2$d [>]" #: src/advanced_inv.cpp #, c-format -msgid "< [s]ort: %s >" -msgstr "< [s] 排序: %s >" +msgid "< [%s] Sort: %s >" +msgstr "" -#: src/advanced_inv.cpp -msgid "[F]ilter" -msgstr "[F] 篩選" +#: src/advanced_inv.cpp src/inventory_ui.cpp +#, c-format +msgid "[%s] Filter" +msgstr "" #: src/advanced_inv.cpp -msgid "[R]eset" -msgstr "[R] 重置" +#, c-format +msgid "[%s] Reset" +msgstr "" #: src/advanced_inv.cpp msgid "You look at the items, then your clothes, and scratch your head…" @@ -182389,8 +182504,9 @@ msgid "Unsorted (recently added first)" msgstr "未排序 (新增加的在前)" #: src/advanced_inv.cpp -msgid "< [?] show help >" -msgstr "< [?] 顯示說明 >" +#, c-format +msgid "< [%s] Show help >" +msgstr "" #: src/advanced_inv.cpp msgid "Default layout was saved." @@ -185370,6 +185486,13 @@ msgstr "生化能量：%s／%i千焦 msgid " BIONICS " msgstr " 生化插件 " +#: src/bionics_ui.cpp +#, c-format +msgid "" +"[%s] Reassign, [%s] Switch tabs, [%s] Toggle fuel saving mode, [%s] Toggle " +"auto start mode" +msgstr "" + #: src/bionics_ui.cpp msgid "" "Reassigning.\n" @@ -185379,19 +185502,13 @@ msgstr "" "選擇一個生化插件, 或是按空白鍵取消。" #: src/bionics_ui.cpp -msgid "" -"Activating ! to examine, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Activating [%s] Examine, %s" msgstr "" #: src/bionics_ui.cpp -msgid "" -"Examining ! to activate, " -"= to reassign, TAB to switch " -"tabs, s to toggle fuel saving mode, " -"A to toggle auto start mode." +#, c-format +msgid "Examining [%s] Activate, %s" msgstr "" #: src/bionics_ui.cpp @@ -185490,10 +185607,8 @@ msgstr "" #, c-format msgid "" "You can not activate %s!\n" -"To read a description of %s, press '!', then '%c'." +"To read a description of %s, press '%s', then '%c'." msgstr "" -"你無法啟動 %s!\n" -"若要檢視 %s 的描述, 按 ! 接著按 %c。" #: src/bonuses.cpp msgid "Accuracy" @@ -197777,7 +197892,7 @@ msgid "You can't crack a safe while deaf!" msgstr "你無法在耳聾時, 破解保險箱的鎖。" #: src/iexamine.cpp -msgid "You can't crack a safe with earbuds on!" +msgid "You can't crack a safe while listening to music!" msgstr "" #: src/iexamine.cpp @@ -199995,13 +200110,8 @@ msgstr "沒有可用的選擇" #: src/inventory_ui.cpp #, c-format -msgid "[%s]Filter" -msgstr "[%s] 篩選" - -#: src/inventory_ui.cpp -#, c-format -msgid "[%s]Filter: " -msgstr "[%s] 篩選: " +msgid "[%s] Filter: " +msgstr "" #: src/inventory_ui.cpp msgid "Next column" @@ -218566,6 +218676,16 @@ msgid "" "necessary glyphs." msgstr "" +#: src/options.cpp +msgid "Enable ASCII art in item descriptions" +msgstr "" + +#: src/options.cpp +msgid "" +"When available item description will show a picture of the item in ascii " +"art." +msgstr "" + #: src/options.cpp msgid "Use tiles" msgstr "使用圖像" @@ -220357,10 +220477,6 @@ msgstr "休息：" msgid "Heat :" msgstr "溫度：" -#: src/panels.cpp -msgid "Sound :" -msgstr "" - #: src/panels.cpp msgid "Deaf!" msgstr "聽不見!" @@ -225170,8 +225286,9 @@ msgid "Remove attached curtains first." msgstr "請先移除掛載的窗簾。" #: src/vehicle.cpp -msgid "Remove attached part first." -msgstr "請先移除掛載部件。" +#, c-format +msgid "Remove the attached %s first." +msgstr "" #: src/vehicle.cpp msgid "Remove battery from mount first." From ed471ccea6aec01334d95eed48590f793a3f7283 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sat, 22 Feb 2020 13:13:54 -0500 Subject: [PATCH 21/56] Disable all starve tests on clang sanitizer test Made a test category so I didn't need to disable them individually. --- .travis.yml | 2 +- tests/stomach_contents_test.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ed0aff6312e6d..aad4df4348fea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -84,7 +84,7 @@ jobs: packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "astyle"] sources: *apt_sources - - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~starve_test ~grenade_lethality" + - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~[starve] ~grenade_lethality" name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled" compiler: clang addons: &clang8 diff --git a/tests/stomach_contents_test.cpp b/tests/stomach_contents_test.cpp index 6b14e9993eee3..0ea0d8dcf2189 100644 --- a/tests/stomach_contents_test.cpp +++ b/tests/stomach_contents_test.cpp @@ -86,7 +86,7 @@ static void eat_all_nutrients( player &p ) // how long does it take to starve to death // player does not thirst or tire or require vitamins -TEST_CASE( "starve_test" ) +TEST_CASE( "starve_test", "[starve]" ) { // change this bool when editing the test const bool print_tests = false; @@ -116,7 +116,7 @@ TEST_CASE( "starve_test" ) // how long does it take to starve to death with extreme metabolism // player does not thirst or tire or require vitamins -TEST_CASE( "starve_test_hunger3" ) +TEST_CASE( "starve_test_hunger3", "[starve]" ) { // change this bool when editing the test const bool print_tests = false; @@ -149,7 +149,7 @@ TEST_CASE( "starve_test_hunger3" ) } // does eating enough food per day keep you alive -TEST_CASE( "all_nutrition_starve_test" ) +TEST_CASE( "all_nutrition_starve_test", "[starve]" ) { // change this bool when editing the test const bool print_tests = false; From 07c7ec068488e003bb453e05a39877041ba030c2 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sat, 22 Feb 2020 13:20:57 -0500 Subject: [PATCH 22/56] Disable vehicle efficiency on the gcc asan build Another test that's slow on a CI run that's sometimes taking too long. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aad4df4348fea..65bb25de8faeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,7 +75,7 @@ jobs: packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"] sources: [*apt_sources] - - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address + - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency" name: "GCC 8 Make build with Tiles, Sound, astyle and address sanitization" dist: bionic compiler: gcc From 90156182f7650bc0ccbc5cdee4520f7cd50bbf9a Mon Sep 17 00:00:00 2001 From: anothersimulacrum Date: Sat, 22 Feb 2020 11:43:04 -0800 Subject: [PATCH 23/56] Don't stale 0.E content frozen PRs (#38245) --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 641e4d9adb0ff..25e8b61ad628b 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -23,6 +23,7 @@ exemptLabels: - "(P5 - Long-term)" - "(S2 - Confirmed)" - "0.E Feature Freeze" + - "0.E Content Freeze" # Set to true to ignore issues in a project (defaults to false) exemptProjects: true From 49877426cedcb73c7c852c2e4b61dd0320dc5288 Mon Sep 17 00:00:00 2001 From: Eric <52087122+Ramza13@users.noreply.github.com> Date: Sun, 23 Feb 2020 11:50:56 -0500 Subject: [PATCH 24/56] Moved more string consts into single file (#38237) --- src/action.cpp | 2 +- src/activity_handlers.cpp | 2 +- src/activity_item_handling.cpp | 22 ++-- src/advanced_inv_area.cpp | 7 +- src/avatar_action.cpp | 4 +- src/cata_string_consts.h | 43 +++++++- src/cata_tiles.cpp | 2 +- src/character.cpp | 8 +- src/clzones.cpp | 94 ++++++++--------- src/crafting.cpp | 8 +- src/editmap.cpp | 2 +- src/faction_camp.cpp | 2 +- src/game.cpp | 34 +++--- src/handle_action.cpp | 24 ++--- src/inventory.cpp | 16 +-- src/inventory_ui.cpp | 6 +- src/item.cpp | 2 +- src/item_location.cpp | 2 +- src/lightmap.cpp | 2 +- src/map.cpp | 28 ++--- src/map_extras.cpp | 4 +- src/monmove.cpp | 4 +- src/npcmove.cpp | 12 +-- src/pickup.cpp | 4 +- src/player.cpp | 8 +- src/ranged.cpp | 2 +- src/savegame_json.cpp | 12 +-- src/sdltiles.cpp | 10 +- src/turret.cpp | 2 +- src/veh_interact.cpp | 6 +- src/veh_type.cpp | 2 +- src/vehicle.cpp | 178 ++++++++++++++++---------------- src/vehicle_move.cpp | 2 +- src/vehicle_use.cpp | 91 ++++++++-------- src/visitable.cpp | 4 +- tests/vehicle_test.cpp | 3 +- tests/visitable_remove_test.cpp | 3 +- 37 files changed, 353 insertions(+), 304 deletions(-) diff --git a/src/action.cpp b/src/action.cpp index 451974f278acf..f0597db91ff64 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -650,7 +650,7 @@ static bool can_pickup_at( const tripoint &p ) bool veh_has_items = false; const optional_vpart_position vp = g->m.veh_at( p ); if( vp ) { - const int cargo_part = vp->vehicle().part_with_feature( vp->part_index(), "CARGO", false ); + const int cargo_part = vp->vehicle().part_with_feature( vp->part_index(), flag_CARGO, false ); veh_has_items = cargo_part >= 0 && !vp->vehicle().get_items( cargo_part ).empty(); } return g->m.has_items( p ) || veh_has_items; diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index f170f6c0be48d..05c4a082744b2 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -2362,7 +2362,7 @@ struct weldrig_hack { return false; } - part = veh->part_with_feature( part, "WELDRIG", true ); + part = veh->part_with_feature( part, flag_WELDRIG, true ); return part >= 0; } diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp index 152b41b9c6754..e542aef712239 100644 --- a/src/activity_item_handling.cpp +++ b/src/activity_item_handling.cpp @@ -326,7 +326,8 @@ void put_into_vehicle_or_drop( Character &c, item_drop_reason reason, const std: void put_into_vehicle_or_drop( Character &c, item_drop_reason reason, const std::list &items, const tripoint &where, bool force_ground ) { - const cata::optional vp = g->m.veh_at( where ).part_with_feature( "CARGO", false ); + const cata::optional vp = g->m.veh_at( where ).part_with_feature( flag_CARGO, + false ); if( vp && !force_ground ) { put_into_vehicle( c, reason, items, vp->vehicle(), vp->part_index() ); return; @@ -883,7 +884,7 @@ static int move_cost( const item &it, const tripoint &src, const tripoint &dest tripoint cart_position = g->u.pos() + g->u.grab_point; if( const cata::optional vp = g->m.veh_at( - cart_position ).part_with_feature( "CARGO", false ) ) { + cart_position ).part_with_feature( flag_CARGO, false ) ) { auto veh = vp->vehicle(); auto vstor = vp->part_index(); auto capacity = veh.free_volume( vstor ); @@ -1216,7 +1217,7 @@ static bool are_requirements_nearby( const std::vector &loot_spots, temp_inv += elem2; } if( !in_loot_zones ) { - if( const cata::optional vp = g->m.veh_at( elem ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( elem ).part_with_feature( flag_CARGO, false ) ) { vehicle &src_veh = vp->vehicle(); int src_part = vp->part_index(); @@ -1232,7 +1233,7 @@ static bool are_requirements_nearby( const std::vector &loot_spots, const optional_vpart_position vp = g->m.veh_at( elem ); if( vp ) { vehicle &veh = vp->vehicle(); - const cata::optional weldpart = vp.part_with_feature( "WELDRIG", true ); + const cata::optional weldpart = vp.part_with_feature( flag_WELDRIG, true ); if( weldpart ) { item welder( "welder", 0 ); welder.charges = veh.fuel_left( fuel_type_battery, true ); @@ -1897,7 +1898,7 @@ static bool tidy_activity( player &p, const tripoint &src_loc, vehicle *dest_veh; int dest_part; if( const cata::optional vp = g->m.veh_at( - loot_src_lot ).part_with_feature( "CARGO", + loot_src_lot ).part_with_feature( flag_CARGO, false ) ) { dest_veh = &vp->vehicle(); dest_part = vp->part_index(); @@ -1937,7 +1938,7 @@ static void fetch_activity( player &p, const tripoint &src_loc, auto items_there = g->m.i_at( src_loc ); vehicle *src_veh = nullptr; int src_part = 0; - if( const cata::optional vp = g->m.veh_at( src_loc ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( src_loc ).part_with_feature( flag_CARGO, false ) ) { src_veh = &vp->vehicle(); src_part = vp->part_index(); @@ -2142,7 +2143,7 @@ void activity_on_turn_move_loot( player_activity &act, player &p ) } //nothing to sort? - const cata::optional vp = g->m.veh_at( src_loc ).part_with_feature( "CARGO", + const cata::optional vp = g->m.veh_at( src_loc ).part_with_feature( flag_CARGO, false ); if( ( !vp || vp->vehicle().get_items( vp->part_index() ).empty() ) && g->m.i_at( src_loc ).empty() ) { @@ -2213,7 +2214,7 @@ void activity_on_turn_move_loot( player_activity &act, player &p ) //Check source for cargo part //map_stack and vehicle_stack are different types but inherit from item_stack // TODO: use one for loop - if( const cata::optional vp = g->m.veh_at( src_loc ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( src_loc ).part_with_feature( flag_CARGO, false ) ) { src_veh = &vp->vehicle(); src_part = vp->part_index(); @@ -2258,8 +2259,9 @@ void activity_on_turn_move_loot( player_activity &act, player &p ) const tripoint &dest_loc = g->m.getlocal( dest ); //Check destination for cargo part - if( const cata::optional vp = g->m.veh_at( dest_loc ).part_with_feature( "CARGO", - false ) ) { + if( const cata::optional vp = g->m.veh_at( dest_loc ).part_with_feature( + flag_CARGO, + false ) ) { dest_veh = &vp->vehicle(); dest_part = vp->part_index(); } else { diff --git a/src/advanced_inv_area.cpp b/src/advanced_inv_area.cpp index 2890677790bef..8e3c3e77cc163 100644 --- a/src/advanced_inv_area.cpp +++ b/src/advanced_inv_area.cpp @@ -40,6 +40,7 @@ #include #include #include +#include "cata_string_consts.h" int advanced_inv_area::get_item_count() const { @@ -80,7 +81,7 @@ void advanced_inv_area::init() off = g->u.grab_point; // Reset position because offset changed pos = g->u.pos() + off; - if( const cata::optional vp = g->m.veh_at( pos ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( pos ).part_with_feature( flag_CARGO, false ) ) { veh = &vp->vehicle(); vstor = vp->part_index(); @@ -122,7 +123,7 @@ void advanced_inv_area::init() case AIM_NORTH: case AIM_NORTHEAST: { const cata::optional vp = - g->m.veh_at( pos ).part_with_feature( "CARGO", false ); + g->m.veh_at( pos ).part_with_feature( flag_CARGO, false ); if( vp ) { veh = &vp->vehicle(); vstor = vp->part_index(); @@ -398,7 +399,7 @@ void advanced_inv_area::set_container_position() // update the absolute position pos = g->u.pos() + off; // update vehicle information - if( const cata::optional vp = g->m.veh_at( pos ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( pos ).part_with_feature( flag_CARGO, false ) ) { veh = &vp->vehicle(); vstor = vp->part_index(); diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index 3fbb612f360f2..9bd38c5ea9c0c 100644 --- a/src/avatar_action.cpp +++ b/src/avatar_action.cpp @@ -304,7 +304,7 @@ bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz ) } else if( veh1 != veh0 ) { add_msg( m_info, _( "There is another vehicle in the way." ) ); return false; - } else if( !vp1.part_with_feature( "BOARDABLE", true ) ) { + } else if( !vp1.part_with_feature( flag_BOARDABLE, true ) ) { add_msg( m_info, _( "That part of the vehicle is currently unsafe." ) ); return false; } @@ -679,7 +679,7 @@ bool avatar_action::fire_check( avatar &you, const map &m, const targeting_data } if( mode_map.second->has_flag( flag_MOUNTED_GUN ) ) { - const bool v_mountable = static_cast( m.veh_at( you.pos() ).part_with_feature( "MOUNTABLE", + const bool v_mountable = static_cast( m.veh_at( you.pos() ).part_with_feature( flag_MOUNTABLE, true ) ); bool t_mountable = m.has_flag_ter_or_furn( flag_MOUNTABLE, you.pos() ); if( !t_mountable && !v_mountable ) { diff --git a/src/cata_string_consts.h b/src/cata_string_consts.h index 775eba95b9e54..3410037bdc561 100644 --- a/src/cata_string_consts.h +++ b/src/cata_string_consts.h @@ -926,6 +926,7 @@ static const std::string flag_ACID_IMMUNE( "ACID_IMMUNE" ); static const std::string flag_ACT_IN_FIRE( "ACT_IN_FIRE" ); static const std::string flag_ACT_ON_RANGED_HIT( "ACT_ON_RANGED_HIT" ); static const std::string flag_ACTIVE_CLOAKING( "ACTIVE_CLOAKING" ); +static const std::string flag_ADVANCED_PLANTER( "ADVANCED_PLANTER" ); static const std::string flag_AISLE( "AISLE" ); static const std::string flag_ALARMCLOCK( "ALARMCLOCK" ); static const std::string flag_ALARMED( "ALARMED" ); @@ -941,6 +942,7 @@ static const std::string flag_ALLOW_OUTSIDE( "ALLOW_OUTSIDE" ); static const std::string flag_ALLOW_ROTTEN( "ALLOW_ROTTEN" ); static const std::string flag_ALLOWS_NATURAL_ATTACKS( "ALLOWS_NATURAL_ATTACKS" ); static const std::string flag_ALLOWS_REMOTE_USE( "ALLOWS_REMOTE_USE" ); +static const std::string flag_ALTERNATOR( "ALTERNATOR" ); static const std::string flag_ALWAYS_TWOHAND( "ALWAYS_TWOHAND" ); static const std::string flag_ANESTHESIA( "ANESTHESIA" ); static const std::string flag_ANIMAL_CTRL( "ANIMAL_CTRL" ); @@ -948,6 +950,7 @@ static const std::string flag_ARMOR( "ARMOR" ); static const std::string flag_AURA( "AURA" ); static const std::string flag_AUT_START( "AUT_START" ); static const std::string flag_auto_wield( "auto_wield" ); +static const std::string flag_AUTOCLAVE( "AUTOCLAVE" ); static const std::string flag_AUTODOC( "AUTODOC" ); static const std::string flag_AUTODOC_COUCH( "AUTODOC_COUCH" ); static const std::string flag_AUTOPILOT( "AUTOPILOT" ); @@ -963,6 +966,7 @@ static const std::string flag_BED( "BED" ); static const std::string flag_BEEPER( "BEEPER" ); static const std::string flag_BELTABLE( "BELTABLE" ); static const std::string flag_BELTED( "BELTED" ); +static const std::string flag_BIKE_RACK_VEH( "BIKE_RACK_VEH" ); static const std::string flag_BIO_IMMUNE( "BIO_IMMUNE" ); static const std::string flag_BIPOD( "BIPOD" ); static const std::string flag_BIRD( "BIRD" ); @@ -986,6 +990,7 @@ static const std::string flag_CAN_SIT( "CAN_SIT" ); static const std::string flag_CANNIBAL( "CANNIBAL" ); static const std::string flag_CANNIBALISM( "CANNIBALISM" ); static const std::string flag_CANT_HEAL_EVERYONE( "CANT_HEAL_EVERYONE" ); +static const std::string flag_CAPTURE_MONSTER_VEH( "CAPTURE_MONSTER_VEH" ); static const std::string flag_CARGO( "CARGO" ); static const std::string flag_CARGO_LOCKING( "CARGO_LOCKING" ); static const std::string flag_CARNIVORE_OK( "CARNIVORE_OK" ); @@ -1013,7 +1018,10 @@ static const std::string flag_CONTROLS( "CONTROLS" ); static const std::string flag_COOKED( "COOKED" ); static const std::string flag_COOLER( "COOLER" ); static const std::string flag_CORPSE( "CORPSE" ); +static const std::string flag_COVERED( "COVERED" ); static const std::string flag_CRAFTRIG( "CRAFTRIG" ); +static const std::string flag_CRASH_TERRAIN_AROUND( "CRASH_TERRAIN_AROUND" ); +static const std::string flag_CTRL_ELECTRONIC( "CTRL_ELECTRONIC" ); static const std::string flag_CURRENT( "CURRENT" ); static const std::string flag_CURTAIN( "CURTAIN" ); static const std::string flag_CUT_IMMUNE( "CUT_IMMUNE" ); @@ -1030,6 +1038,7 @@ static const std::string flag_DIGGABLE_CAN_DEEPEN( "DIGGABLE_CAN_DEEPEN" ); static const std::string flag_DIMENSIONAL_ANCHOR( "DIMENSIONAL_ANCHOR" ); static const std::string flag_DIRTY( "DIRTY" ); static const std::string flag_DISABLE_SIGHTS( "DISABLE_SIGHTS" ); +static const std::string flag_DISHWASHER( "DISHWASHER" ); static const std::string flag_DONT_REMOVE_ROTTEN( "DONT_REMOVE_ROTTEN" ); static const std::string flag_DOOR( "DOOR" ); static const std::string flag_DOOR_MOTOR( "DOOR_MOTOR" ); @@ -1038,6 +1047,7 @@ static const std::string flag_DURABLE_MELEE( "DURABLE_MELEE" ); static const std::string flag_E_ALTERNATOR( "E_ALTERNATOR" ); static const std::string flag_E_COLD_START( "E_COLD_START" ); static const std::string flag_E_COMBUSTION( "E_COMBUSTION" ); +static const std::string flag_E_HEATER( "E_HEATER" ); static const std::string flag_E_HIGHER_SKILL( "E_HIGHER_SKILL" ); static const std::string flag_E_STARTS_INSTANTLY( "E_STARTS_INSTANTLY" ); static const std::string flag_EASY_DECONSTRUCT( "EASY_DECONSTRUCT" ); @@ -1100,7 +1110,9 @@ static const std::string flag_FORAGE_POISON( "FORAGE_POISON" ); static const std::string flag_FORGE( "FORGE" ); static const std::string flag_FRAGILE( "FRAGILE" ); static const std::string flag_FRAGILE_MELEE( "FRAGILE_MELEE" ); +static const std::string flag_FREEZER( "FREEZER" ); static const std::string flag_FREEZERBURN( "FREEZERBURN" ); +static const std::string flag_FRIDGE( "FRIDGE" ); static const std::string flag_FROZEN( "FROZEN" ); static const std::string flag_FUEL_TANK( "FUEL_TANK" ); static const std::string flag_FULL_BOARD( "FULL_BOARD" ); @@ -1144,6 +1156,7 @@ static const std::string flag_IRREMOVABLE( "IRREMOVABLE" ); static const std::string flag_IS_ARMOR( "IS_ARMOR" ); static const std::string flag_IS_PET_ARMOR( "IS_PET_ARMOR" ); static const std::string flag_IS_UPS( "IS_UPS" ); +static const std::string flag_KILN( "KILN" ); static const std::string flag_KITCHEN( "KITCHEN" ); static const std::string flag_LADDER( "LADDER" ); static const std::string flag_LEAK_ALWAYS( "LEAK_ALWAYS" ); @@ -1279,6 +1292,7 @@ static const std::string flag_RAMP_END( "RAMP_END" ); static const std::string flag_RAW( "RAW" ); static const std::string flag_REACH_ATTACK( "REACH_ATTACK" ); static const std::string flag_REACH3( "REACH3" ); +static const std::string flag_REAPER( "REAPER" ); static const std::string flag_REBREATHER( "REBREATHER" ); static const std::string flag_RECHARGE( "RECHARGE" ); static const std::string flag_REDUCED_BASHING( "REDUCED_BASHING" ); @@ -1303,6 +1317,7 @@ static const std::string flag_SAFECRACK( "SAFECRACK" ); static const std::string flag_SALT_WATER( "SALT_WATER" ); static const std::string flag_SAPIOVORE( "SAPIOVORE" ); static const std::string flag_SCEN_ONLY( "SCEN_ONLY" ); +static const std::string flag_SCOOP( "SCOOP" ); static const std::string flag_SEALED( "SEALED" ); static const std::string flag_SEAT( "SEAT" ); static const std::string flag_SEATBELT( "SEATBELT" ); @@ -1315,6 +1330,15 @@ static const std::string flag_SHORT( "SHORT" ); static const std::string flag_SHRUB( "SHRUB" ); static const std::string flag_SIGN( "SIGN" ); static const std::string flag_SILENT( "SILENT" ); +static const std::string flag_MULTISQUARE( "MULTISQUARE" ); +static const std::string flag_CONE_LIGHT( "CONE_LIGHT" ); +static const std::string flag_CIRCLE_LIGHT( "CIRCLE_LIGHT" ); +static const std::string flag_AISLE_LIGHT( "AISLE_LIGHT" ); +static const std::string flag_ROCKWHEEL( "ROCKWHEEL" ); +static const std::string flag_PLOW( "PLOW" ); +static const std::string flag_ROADHEAD( "ROADHEAD" ); +static const std::string flag_DOME_LIGHT( "DOME_LIGHT" ); +static const std::string flag_ATOMIC_LIGHT( "ATOMIC_LIGHT" ); static const std::string flag_SKINNED( "SKINNED" ); static const std::string flag_SKINTIGHT( "SKINTIGHT" ); static const std::string flag_SLEEP_AID( "SLEEP_AID" ); @@ -1352,9 +1376,11 @@ static const std::string flag_TIE_UP( "TIE_UP" ); static const std::string flag_TINDER( "TINDER" ); static const std::string flag_TINY( "TINY" ); static const std::string flag_TOBACCO( "TOBACCO" ); +static const std::string flag_TOWEL( "TOWEL" ); static const std::string flag_TRACK( "TRACK" ); static const std::string flag_TRACKED( "TRACKED" ); static const std::string flag_TRADER_AVOID( "TRADER_AVOID" ); +static const std::string flag_TRANSFORM_TERRAIN( "TRANSFORM_TERRAIN" ); static const std::string flag_TRANSLOCATOR( "TRANSLOCATOR" ); static const std::string flag_TRANSPARENT( "TRANSPARENT" ); static const std::string flag_TREE( "TREE" ); @@ -1385,6 +1411,7 @@ static const std::string flag_VEHICLE( "VEHICLE" ); static const std::string flag_VISION( "VISION" ); static const std::string flag_WAIST( "WAIST" ); static const std::string flag_WALL( "WALL" ); +static const std::string flag_WASHING_MACHINE( "WASHING_MACHINE" ); static const std::string flag_WATCH( "WATCH" ); static const std::string flag_WATER_EXTINGUISH( "WATER_EXTINGUISH" ); static const std::string flag_WATER_FRIENDLY( "WATER_FRIENDLY" ); @@ -1412,7 +1439,6 @@ static const std::string flag_WRITE_MESSAGE( "WRITE_MESSAGE" ); static const std::string flag_YOUNG( "YOUNG" ); static const std::string flag_ZOOM( "ZOOM" ); - static const skill_id skill_archery( "archery" ); static const skill_id skill_barter( "barter" ); static const skill_id skill_bashing( "bashing" ); @@ -1473,6 +1499,19 @@ static const zone_type_id zone_type_LOOT_WOOD( "LOOT_WOOD" ); static const zone_type_id zone_type_NO_AUTO_PICKUP( "NO_AUTO_PICKUP" ); static const zone_type_id zone_type_VEHICLE_DECONSTRUCT( "VEHICLE_DECONSTRUCT" ); static const zone_type_id zone_type_VEHICLE_REPAIR( "VEHICLE_REPAIR" ); +static const zone_type_id zone_type_LOOT_CUSTOM( "LOOT_CUSTOM" ); +static const zone_type_id zone_type_NO_NPC_PICKUP( "NO_NPC_PICKUP" ); +static const zone_type_id zone_type_NPC_RETREAT( "NPC_RETREAT" ); +static const zone_type_id zone_type_NPC_NO_INVESTIGATE( "NPC_NO_INVESTIGATE" ); +static const zone_type_id zone_type_NPC_INVESTIGATE_ONLY( "NPC_INVESTIGATE_ONLY" ); +static const zone_type_id zone_type_SOURCE_FIREWOOD( "SOURCE_FIREWOOD" ); +static const zone_type_id zone_type_VEHICLE_PATROL( "VEHICLE_PATROL" ); +static const zone_type_id zone_type_CAMP_STORAGE( "CAMP_STORAGE" ); +static const zone_type_id zone_type_LOOT_PDRINK( "LOOT_PDRINK" ); +static const zone_type_id zone_type_LOOT_DRINK( "LOOT_DRINK" ); +static const zone_type_id zone_type_LOOT_PFOOD( "LOOT_PFOOD" ); +static const zone_type_id zone_type_LOOT_FOOD( "LOOT_FOOD" ); +static const zone_type_id zone_type_CAMP_FOOD( "CAMP_FOOD" ); static const zone_type_id z_camp_food( "CAMP_FOOD" ); static const zone_type_id z_camp_storage( "CAMP_STORAGE" ); @@ -1487,7 +1526,7 @@ static const itype_id fuel_type_animal( "animal" ); static const itype_id fuel_type_battery( "battery" ); static const itype_id fuel_type_muscle( "muscle" ); static const itype_id fuel_type_none( "null" ); -static const itype_id fuel_type_plutonium_cell( "plut_cell" ); +static const itype_id fuel_type_plut_cell( "plut_cell" ); static const itype_id fuel_type_sun_light( "sunlight" ); static const itype_id fuel_type_water( "water" ); static const itype_id fuel_type_water_clean( "water_clean" ); diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index 0ae953c69f1a3..4d0228049613b 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -2600,7 +2600,7 @@ bool cata_tiles::draw_vpart( const tripoint &p, lit_level ll, int &height_3d, g->u.memorize_tile( g->m.getabs( p ), vpname, subtile, rotation ); } if( !overridden ) { - const cata::optional cargopart = vp.part_with_feature( "CARGO", true ); + const cata::optional cargopart = vp.part_with_feature( flag_CARGO, true ); const bool draw_highlight = cargopart && !veh.get_items( cargopart->part_index() ).empty(); const bool ret = draw_from_id_string( vpname, C_VEHICLE_PART, empty_string, p, subtile, rotation, ll, nv_goggles_activated, height_3d ); diff --git a/src/character.cpp b/src/character.cpp index 574d220401d1b..bd9844298ed85 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -4432,7 +4432,7 @@ void Character::update_bodytemp() const bool has_climate_control = in_climate_control(); const bool use_floor_warmth = can_use_floor_warmth(); const furn_id furn_at_pos = g->m.furn( pos() ); - const cata::optional boardable = vp.part_with_feature( "BOARDABLE", true ); + const cata::optional boardable = vp.part_with_feature( flag_BOARDABLE, true ); // Temperature norms // Ambient normal temperature is lower while asleep const int ambient_norm = has_sleep ? 3100 : 1900; @@ -4934,8 +4934,8 @@ Character::comfort_response_t Character::base_comfort_value( const tripoint &p ) comfort += 1 + static_cast( comfort_level::slightly_comfortable ); // Note: shelled individuals can still use sleeping aids! } else if( vp ) { - const cata::optional carg = vp.part_with_feature( "CARGO", false ); - const cata::optional board = vp.part_with_feature( "BOARDABLE", true ); + const cata::optional carg = vp.part_with_feature( flag_CARGO, false ); + const cata::optional board = vp.part_with_feature( flag_BOARDABLE, true ); if( carg ) { const vehicle_stack items = vp->vehicle().get_items( carg->part_index() ); for( const item &items_it : items ) { @@ -8335,7 +8335,7 @@ int Character::floor_bedding_warmth( const tripoint &pos ) int floor_bedding_warmth = 0; const optional_vpart_position vp = g->m.veh_at( pos ); - const cata::optional boardable = vp.part_with_feature( "BOARDABLE", true ); + const cata::optional boardable = vp.part_with_feature( flag_BOARDABLE, true ); // Search the floor for bedding if( furn_at_pos != f_null ) { floor_bedding_warmth += furn_at_pos.obj().floor_bedding_warmth; diff --git a/src/clzones.cpp b/src/clzones.cpp index 8355b4be7b6f8..d80e523807dfc 100644 --- a/src/clzones.cpp +++ b/src/clzones.cpp @@ -38,19 +38,19 @@ zone_manager::zone_manager() { - types.emplace( zone_type_id( "NO_AUTO_PICKUP" ), + types.emplace( zone_type_NO_AUTO_PICKUP, zone_type( translate_marker( "No Auto Pickup" ), translate_marker( "You won't auto-pickup items inside the zone." ) ) ); - types.emplace( zone_type_id( "NO_NPC_PICKUP" ), + types.emplace( zone_type_NO_NPC_PICKUP, zone_type( translate_marker( "No NPC Pickup" ), translate_marker( "Friendly NPCs don't pickup items inside the zone." ) ) ); - types.emplace( zone_type_id( "NPC_RETREAT" ), + types.emplace( zone_type_NPC_RETREAT, zone_type( translate_marker( "NPC Retreat" ), translate_marker( "When fleeing, friendly NPCs will attempt to retreat toward this zone if it is within 60 tiles." ) ) ); - types.emplace( zone_type_id( "NPC_NO_INVESTIGATE" ), + types.emplace( zone_type_NPC_NO_INVESTIGATE, zone_type( translate_marker( "NPC Ignore Sounds" ), translate_marker( "Friendly NPCs won't investigate unseen sounds coming from this zone." ) ) ); - types.emplace( zone_type_id( "NPC_INVESTIGATE_ONLY" ), + types.emplace( zone_type_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." ) ) ); @@ -58,35 +58,35 @@ zone_manager::zone_manager() types.emplace( zone.id, zone ); } - types.emplace( zone_type_id( "SOURCE_FIREWOOD" ), + types.emplace( zone_type_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. " "This will be done to maintain light during long-running tasks such as crafting, reading or waiting." ) ) ); - types.emplace( zone_type_id( "CONSTRUCTION_BLUEPRINT" ), + types.emplace( zone_type_CONSTRUCTION_BLUEPRINT, zone_type( translate_marker( "Construction: Blueprint" ), translate_marker( "Designate a blueprint zone for construction." ) ) ); - types.emplace( zone_type_id( "FARM_PLOT" ), + types.emplace( zone_type_FARM_PLOT, zone_type( translate_marker( "Farm: Plot" ), translate_marker( "Designate a farm plot for tilling and planting." ) ) ); - types.emplace( zone_type_id( "CHOP_TREES" ), + types.emplace( zone_type_CHOP_TREES, zone_type( translate_marker( "Chop Trees" ), translate_marker( "Designate an area to chop down trees." ) ) ); - types.emplace( zone_type_id( "FISHING_SPOT" ), + types.emplace( zone_type_FISHING_SPOT, zone_type( translate_marker( "Fishing Spot" ), translate_marker( "Designate an area to fish from." ) ) ); - types.emplace( zone_type_id( "VEHICLE_DECONSTRUCT" ), + types.emplace( zone_type_VEHICLE_DECONSTRUCT, zone_type( translate_marker( "Vehicle Deconstruct Zone" ), translate_marker( "Any vehicles in this area are marked for deconstruction." ) ) ); - types.emplace( zone_type_id( "VEHICLE_REPAIR" ), + types.emplace( zone_type_VEHICLE_REPAIR, zone_type( translate_marker( "Vehicle Repair Zone" ), translate_marker( "Any vehicles in this area are marked for repair work." ) ) ); - types.emplace( zone_type_id( "VEHICLE_PATROL" ), + types.emplace( zone_type_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" ), + types.emplace( zone_type_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" ), + types.emplace( zone_type_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." ) ) ); @@ -138,11 +138,11 @@ void zone_type::load( const JsonObject &jo, const std::string & ) shared_ptr_fast zone_options::create( const zone_type_id &type ) { - if( type == zone_type_id( "FARM_PLOT" ) ) { + if( type == zone_type_FARM_PLOT ) { return make_shared_fast(); - } else if( type == zone_type_id( "CONSTRUCTION_BLUEPRINT" ) ) { + } else if( type == zone_type_CONSTRUCTION_BLUEPRINT ) { return make_shared_fast(); - } else if( type == zone_type_id( "LOOT_CUSTOM" ) ) { + } else if( type == zone_type_LOOT_CUSTOM ) { return make_shared_fast(); } @@ -151,11 +151,11 @@ shared_ptr_fast zone_options::create( const zone_type_id &type ) bool zone_options::is_valid( const zone_type_id &type, const zone_options &options ) { - if( type == zone_type_id( "FARM_PLOT" ) ) { + if( type == zone_type_FARM_PLOT ) { return dynamic_cast( &options ) != nullptr; - } else if( type == zone_type_id( "CONSTRUCTION_BLUEPRINT" ) ) { + } else if( type == zone_type_CONSTRUCTION_BLUEPRINT ) { return dynamic_cast( &options ) != nullptr; - } else if( type == zone_type_id( "LOOT_CUSTOM" ) ) { + } else if( type == zone_type_LOOT_CUSTOM ) { return dynamic_cast( &options ) != nullptr; } @@ -604,7 +604,7 @@ std::unordered_set zone_manager::get_point_set_loot( const tripoint &w if( ( !zone ) || ( zone->get_type().str().substr( 0, 4 ) != "LOOT" ) ) { continue; } - if( npc_search && ( has( zone_type_id( "NO_NPC_PICKUP" ), elem ) ) ) { + if( npc_search && ( has( zone_type_NO_NPC_PICKUP, elem ) ) ) { continue; } res.insert( elem ); @@ -660,10 +660,10 @@ bool zone_manager::has_loot_dest_near( const tripoint &where ) const { for( const auto &ztype : get_manager().get_types() ) { const zone_type_id &type = ztype.first; - if( type == zone_type_id( "CAMP_FOOD" ) || type == zone_type_id( "FARM_PLOT" ) || - type == zone_type_id( "LOOT_UNSORTED" ) || type == zone_type_id( "LOOT_IGNORE" ) || - type == zone_type_id( "CONSTRUCTION_BLUEPRINT" ) || - type == zone_type_id( "NO_AUTO_PICKUP" ) || type == zone_type_id( "NO_NPC_PICKUP" ) ) { + if( type == zone_type_CAMP_FOOD || type == zone_type_FARM_PLOT || + type == zone_type_LOOT_UNSORTED || type == zone_type_LOOT_IGNORE || + type == zone_type_CONSTRUCTION_BLUEPRINT || + type == zone_type_NO_AUTO_PICKUP || type == zone_type_NO_NPC_PICKUP ) { continue; } if( has_near( type, where ) ) { @@ -691,7 +691,7 @@ const zone_data *zone_manager::get_zone_at( const tripoint &where, const zone_ty bool zone_manager::custom_loot_has( const tripoint &where, const item *it ) const { - auto zone = get_zone_at( where, zone_type_id( "LOOT_CUSTOM" ) ); + auto zone = get_zone_at( where, zone_type_LOOT_CUSTOM ); if( !zone || !it ) { return false; } @@ -711,7 +711,7 @@ std::unordered_set zone_manager::get_near( const zone_type_id &type, for( auto &point : point_set ) { if( point.z == where.z ) { if( square_dist( point, where ) <= range ) { - if( it && has( zone_type_id( "LOOT_CUSTOM" ), point ) ) { + if( it && has( zone_type_LOOT_CUSTOM, point ) ) { if( custom_loot_has( point, it ) ) { near_point_set.insert( point ); } @@ -726,7 +726,7 @@ std::unordered_set zone_manager::get_near( const zone_type_id &type, for( auto &point : vzone_set ) { if( point.z == where.z ) { if( square_dist( point, where ) <= range ) { - if( it && has( zone_type_id( "LOOT_CUSTOM" ), point ) ) { + if( it && has( zone_type_LOOT_CUSTOM, point ) ) { if( custom_loot_has( point, it ) ) { near_point_set.insert( point ); } @@ -783,20 +783,20 @@ zone_type_id zone_manager::get_near_zone_type_for_item( const item &it, { const item_category &cat = it.get_category(); - if( has_near( zone_type_id( "LOOT_CUSTOM" ), where, range ) ) { - for( const auto elem : get_near( zone_type_id( "LOOT_CUSTOM" ), where, range, &it ) ) { + if( has_near( zone_type_LOOT_CUSTOM, where, range ) ) { + for( const auto elem : get_near( zone_type_LOOT_CUSTOM, where, range, &it ) ) { ( void )elem; - return zone_type_id( "LOOT_CUSTOM" ); + return zone_type_LOOT_CUSTOM; } } if( it.has_flag( flag_FIREWOOD ) ) { - if( has_near( zone_type_id( "LOOT_WOOD" ), where, range ) ) { - return zone_type_id( "LOOT_WOOD" ); + if( has_near( zone_type_LOOT_WOOD, where, range ) ) { + return zone_type_LOOT_WOOD; } } if( it.is_corpse() ) { - if( has_near( zone_type_id( "LOOT_CORPSE" ), where, range ) ) { - return zone_type_id( "LOOT_CORPSE" ); + if( has_near( zone_type_LOOT_CORPSE, where, range ) ) { + return zone_type_LOOT_CORPSE; } } @@ -814,20 +814,20 @@ zone_type_id zone_manager::get_near_zone_type_for_item( const item &it, // skip food without comestible, like MREs if( const item *it_food = it.get_food() ) { - if( it_food->get_comestible()->comesttype == "DRINK" ) { - if( !preserves && it_food->goes_bad() && has_near( zone_type_id( "LOOT_PDRINK" ), where, range ) ) { - return zone_type_id( "LOOT_PDRINK" ); - } else if( has_near( zone_type_id( "LOOT_DRINK" ), where, range ) ) { - return zone_type_id( "LOOT_DRINK" ); + if( it_food->get_comestible()->comesttype == comesttype_DRINK ) { + if( !preserves && it_food->goes_bad() && has_near( zone_type_LOOT_PDRINK, where, range ) ) { + return zone_type_LOOT_PDRINK; + } else if( has_near( zone_type_LOOT_DRINK, where, range ) ) { + return zone_type_LOOT_DRINK; } } - if( !preserves && it_food->goes_bad() && has_near( zone_type_id( "LOOT_PFOOD" ), where, range ) ) { - return zone_type_id( "LOOT_PFOOD" ); + if( !preserves && it_food->goes_bad() && has_near( zone_type_LOOT_PFOOD, where, range ) ) { + return zone_type_LOOT_PFOOD; } } - return zone_type_id( "LOOT_FOOD" ); + return zone_type_LOOT_FOOD; } return zone_type_id(); @@ -912,11 +912,11 @@ void zone_manager::add( const std::string &name, const zone_type_id &type, const zone_data new_zone = zone_data( name, type, fac, invert, enabled, start, end, options ); //the start is a vehicle tile with cargo space if( const cata::optional vp = g->m.veh_at( g->m.getlocal( - start ) ).part_with_feature( "CARGO", false ) ) { + start ) ).part_with_feature( flag_CARGO, false ) ) { // TODO:Allow for loot zones on vehicles to be larger than 1x1 if( start == end && query_yn( _( "Bind this zone to the cargo part here?" ) ) ) { // TODO: refactor zone options for proper validation code - if( type == zone_type_id( "FARM_PLOT" ) || type == zone_type_id( "CONSTRUCTION_BLUEPRINT" ) ) { + if( type == zone_type_FARM_PLOT || type == zone_type_CONSTRUCTION_BLUEPRINT ) { popup( _( "You cannot add that type of zone to a vehicle." ), PF_NONE ); return; } @@ -1178,7 +1178,7 @@ void zone_manager::revert_vzones() for( auto zone : removed_vzones ) { //Code is copied from add() to avoid yn query if( const cata::optional vp = g->m.veh_at( g->m.getlocal( - zone.get_start_point() ) ).part_with_feature( "CARGO", false ) ) { + zone.get_start_point() ) ).part_with_feature( flag_CARGO, false ) ) { zone.set_is_vehicle( true ); vp->vehicle().loot_zones.emplace( vp->mount(), zone ); vp->vehicle().zones_dirty = false; diff --git a/src/crafting.cpp b/src/crafting.cpp index e777d0451e082..e7401b9b379d5 100644 --- a/src/crafting.cpp +++ b/src/crafting.cpp @@ -172,7 +172,7 @@ static float workbench_crafting_speed_multiplier( const item &craft, const tripo allowed_mass = f.workbench->allowed_mass; allowed_volume = f.workbench->allowed_volume; } else if( const cata::optional vp = g->m.veh_at( - loc ).part_with_feature( "WORKBENCH", true ) ) { + loc ).part_with_feature( flag_WORKBENCH, true ) ) { // Vehicle workbench const vpart_info &vp_info = vp->part().info(); if( const cata::optional &wb_info = vp_info.get_workbench_info() ) { @@ -454,7 +454,7 @@ std::vector player::get_eligible_containers_for_crafting() const } } - if( const cata::optional vp = g->m.veh_at( loc ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( loc ).part_with_feature( flag_CARGO, true ) ) { for( const auto &it : vp->vehicle().get_items( vp->part_index() ) ) { if( is_container_eligible_for_crafting( it, false ) ) { @@ -641,7 +641,7 @@ static item_location set_item_map( const tripoint &loc, item &newit ) */ static item_location set_item_map_or_vehicle( const player &p, const tripoint &loc, item &newit ) { - if( const cata::optional vp = g->m.veh_at( loc ).part_with_feature( "CARGO", + if( const cata::optional vp = g->m.veh_at( loc ).part_with_feature( flag_CARGO, false ) ) { if( const cata::optional it = vp->vehicle().add_item( vp->part_index(), @@ -709,7 +709,7 @@ void player::start_craft( craft_command &command, const tripoint &loc ) target = adj; } } else if( const cata::optional vp = g->m.veh_at( - adj ).part_with_feature( "WORKBENCH", true ) ) { + adj ).part_with_feature( flag_WORKBENCH, true ) ) { if( const cata::optional &wb_info = vp->part().info().get_workbench_info() ) { if( wb_info->multiplier > best_bench_multi ) { best_bench_multi = wb_info->multiplier; diff --git a/src/editmap.cpp b/src/editmap.cpp index 08b592c0321ae..4fe9872e3b8db 100644 --- a/src/editmap.cpp +++ b/src/editmap.cpp @@ -1630,7 +1630,7 @@ void editmap::mapgen_preview( const real_coords &tc, uilist &gmenu ) const int veh_part = vp->part_index(); char part_mod = 0; const vpart_id &vp_id = veh.part_id_string( veh_part, part_mod ); - const cata::optional cargopart = vp.part_with_feature( "CARGO", true ); + const cata::optional cargopart = vp.part_with_feature( flag_CARGO, true ); bool draw_highlight = cargopart && !veh.get_items( cargopart->part_index() ).empty(); int veh_dir = veh.face.dir(); g->draw_vpart_override( map_p, vp_id, part_mod, veh_dir, draw_highlight, vp->mount() ); diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index e0d9a5dce0064..6b54ffa94e3b0 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -3605,7 +3605,7 @@ std::string camp_car_description( vehicle *car ) { std::string entry = string_format( _( "Name: %s\n" ), right_justify( car->name, 25 ) ); entry += _( "---- Engines ----\n" ); - for( const vpart_reference &vpr : car->get_any_parts( "ENGINE" ) ) { + for( const vpart_reference &vpr : car->get_any_parts( flag_ENGINE ) ) { const vehicle_part &pt = vpr.part(); const vpart_info &vp = pt.info(); entry += string_format( _( "Engine: %s\n" ), right_justify( vp.name(), 25 ) ); diff --git a/src/game.cpp b/src/game.cpp index 578ec4787364b..63b6e08a4bacc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2644,7 +2644,7 @@ void game::load( const save_t &name ) // The vehicle stores the IDs of the boarded players, so update it, too. if( u.in_vehicle ) { if( const cata::optional vp = m.veh_at( - u.pos() ).part_with_feature( "BOARDABLE", true ) ) { + u.pos() ).part_with_feature( flag_BOARDABLE, true ) ) { vp->part().passenger_id = u.getID(); } } @@ -5058,14 +5058,14 @@ void game::control_vehicle() } } if( veh != nullptr && veh->player_in_control( u ) && - veh->avail_part_with_feature( veh_part, "CONTROLS", true ) >= 0 ) { + veh->avail_part_with_feature( veh_part, flag_CONTROLS, true ) >= 0 ) { veh->use_controls( u.pos() ); } else if( veh && veh->player_in_control( u ) && - veh->avail_part_with_feature( veh_part, "CONTROL_ANIMAL", true ) >= 0 ) { + veh->avail_part_with_feature( veh_part, flag_CONTROL_ANIMAL, true ) >= 0 ) { u.controlling_vehicle = false; add_msg( m_info, _( "You let go of the reins." ) ); - } else if( veh && ( veh->avail_part_with_feature( veh_part, "CONTROLS", true ) >= 0 || - ( veh->avail_part_with_feature( veh_part, "CONTROL_ANIMAL", true ) >= 0 && + } else if( veh && ( veh->avail_part_with_feature( veh_part, flag_CONTROLS, true ) >= 0 || + ( veh->avail_part_with_feature( veh_part, flag_CONTROL_ANIMAL, true ) >= 0 && veh->has_engine_type( fuel_type_animal, false ) && veh->has_harnessed_animal() ) ) && u.in_vehicle ) { if( !veh->interact_vehicle_locked() ) { @@ -5090,7 +5090,8 @@ void game::control_vehicle() cata::optional vehicle_controls; for( const tripoint elem : m.points_in_radius( g->u.pos(), 1 ) ) { if( const optional_vpart_position vp = m.veh_at( elem ) ) { - const cata::optional controls = vp.value().part_with_feature( "CONTROLS", true ); + const cata::optional controls = vp.value().part_with_feature( flag_CONTROLS, + true ); if( controls ) { num_valid_controls++; vehicle_position = elem; @@ -5108,7 +5109,7 @@ void game::control_vehicle() } const optional_vpart_position vp = m.veh_at( *vehicle_position ); if( vp ) { - vehicle_controls = vp.value().part_with_feature( "CONTROLS", true ); + vehicle_controls = vp.value().part_with_feature( flag_CONTROLS, true ); if( !vehicle_controls ) { add_msg( _( "The vehicle doesn't have controls there." ) ); return; @@ -6171,7 +6172,7 @@ void game::zones_manager() as_m.entries.emplace_back( 1, true, '1', _( "Edit name" ) ); as_m.entries.emplace_back( 2, true, '2', _( "Edit type" ) ); as_m.entries.emplace_back( 3, zone.get_options().has_options(), '3', - zone.get_type() == zone_type_id( "LOOT_CUSTOM" ) ? _( "Edit filter" ) : _( "Edit options" ) ); + zone.get_type() == zone_type_LOOT_CUSTOM ? _( "Edit filter" ) : _( "Edit options" ) ); as_m.entries.emplace_back( 4, !zone.get_is_vehicle(), '4', _( "Edit position" ) ); as_m.query(); @@ -8450,7 +8451,8 @@ void game::wield( item_location &loc ) m.add_item( pos, to_wield ); break; case item_location::type::vehicle: { - const cata::optional vp = g->m.veh_at( pos ).part_with_feature( "CARGO", false ); + const cata::optional vp = g->m.veh_at( pos ).part_with_feature( flag_CARGO, + false ); // If we fail to return the item to the vehicle for some reason, add it to the map instead. if( !vp || !( vp->vehicle().add_item( vp->part_index(), to_wield ) ) ) { m.add_item( pos, to_wield ); @@ -8642,7 +8644,7 @@ std::vector game::get_dangerous_tile( const tripoint &dest_loc ) co if( !u.is_blind() ) { const trap &tr = m.tr_at( dest_loc ); - const bool boardable = static_cast( m.veh_at( dest_loc ).part_with_feature( "BOARDABLE", + const bool boardable = static_cast( m.veh_at( dest_loc ).part_with_feature( flag_BOARDABLE, true ) ); // HACK: Hack for now, later ledge should stop being a trap // Note: in non-z-level mode, ledges obey different rules and so should be handled as regular traps @@ -9223,7 +9225,7 @@ point game::place_player( const tripoint &dest_loc ) } // If the new tile is a boardable part, board it - if( vp1.part_with_feature( "BOARDABLE", true ) && !u.is_mounted() ) { + if( vp1.part_with_feature( flag_BOARDABLE, true ) && !u.is_mounted() ) { m.board_vehicle( u.pos(), &u ); } @@ -9243,7 +9245,7 @@ point game::place_player( const tripoint &dest_loc ) // List items here if( !m.has_flag( flag_SEALED, u.pos() ) ) { if( get_option( "NO_AUTO_PICKUP_ZONES_LIST_ITEMS" ) || - !g->check_zone( zone_type_id( "NO_AUTO_PICKUP" ), u.pos() ) ) { + !g->check_zone( zone_type_NO_AUTO_PICKUP, u.pos() ) ) { if( u.is_blind() && !m.i_at( u.pos() ).empty() ) { add_msg( _( "There's something here, but you can't see what it is." ) ); } else if( m.has_items( u.pos() ) ) { @@ -9316,13 +9318,13 @@ point game::place_player( const tripoint &dest_loc ) } } - if( ( vp1.part_with_feature( "CONTROL_ANIMAL", true ) || - vp1.part_with_feature( "CONTROLS", true ) ) && u.in_vehicle && !u.is_mounted() ) { + if( ( vp1.part_with_feature( flag_CONTROL_ANIMAL, true ) || + vp1.part_with_feature( flag_CONTROLS, true ) ) && u.in_vehicle && !u.is_mounted() ) { add_msg( _( "There are vehicle controls here." ) ); if( !u.has_trait( trait_WAYFARER ) ) { add_msg( m_info, _( "%s to drive." ), press_x( ACTION_CONTROL_VEHICLE ) ); } - } else if( vp1.part_with_feature( "CONTROLS", true ) && u.in_vehicle && + } else if( vp1.part_with_feature( flag_CONTROLS, true ) && u.in_vehicle && u.is_mounted() ) { add_msg( _( "There are vehicle controls here but you cannot reach them whilst mounted." ) ); } @@ -9423,7 +9425,7 @@ bool game::phasing_move( const tripoint &dest_loc ) u.moves -= 100; //tunneling costs 100 moves u.setpos( dest ); - if( m.veh_at( u.pos() ).part_with_feature( "BOARDABLE", true ) ) { + if( m.veh_at( u.pos() ).part_with_feature( flag_BOARDABLE, true ) ) { m.board_vehicle( u.pos(), &u ); } diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 6230d737f48f2..1095bbaf4ac55 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -486,7 +486,7 @@ static void open() } } else { // If there are any OPENABLE parts here, they must be already open - if( const cata::optional already_open = vp.part_with_feature( "OPENABLE", + if( const cata::optional already_open = vp.part_with_feature( flag_OPENABLE, true ) ) { const std::string name = already_open->info().name(); add_msg( m_info, _( "That %s is already open." ), name ); @@ -1039,25 +1039,25 @@ static void loot() // but with a stale cache we never get that far. mgr.cache_vzones(); - 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 |= g->check_near_zone( zone_type_LOOT_UNSORTED, u.pos() ) ? SortLoot : 0; + if( g->check_near_zone( zone_type_FARM_PLOT, u.pos() ) ) { flags |= FertilizePlots; flags |= MultiFarmPlots; } - flags |= g->check_near_zone( zone_type_id( "CONSTRUCTION_BLUEPRINT" ), + flags |= g->check_near_zone( zone_type_CONSTRUCTION_BLUEPRINT, u.pos() ) ? ConstructPlots : 0; - flags |= g->check_near_zone( zone_type_id( "CHOP_TREES" ), u.pos() ) ? Multichoptrees : 0; - flags |= g->check_near_zone( zone_type_id( "LOOT_WOOD" ), u.pos() ) ? Multichopplanks : 0; - flags |= g->check_near_zone( zone_type_id( "VEHICLE_DECONSTRUCT" ), + flags |= g->check_near_zone( zone_type_CHOP_TREES, u.pos() ) ? Multichoptrees : 0; + flags |= g->check_near_zone( zone_type_LOOT_WOOD, u.pos() ) ? Multichopplanks : 0; + flags |= g->check_near_zone( zone_type_VEHICLE_DECONSTRUCT, u.pos() ) ? Multideconvehicle : 0; - flags |= g->check_near_zone( zone_type_id( "VEHICLE_REPAIR" ), u.pos() ) ? Multirepairvehicle : 0; - flags |= g->check_near_zone( zone_type_id( "LOOT_CORPSE" ), u.pos() ) ? MultiButchery : 0; + flags |= g->check_near_zone( zone_type_VEHICLE_REPAIR, u.pos() ) ? Multirepairvehicle : 0; + flags |= g->check_near_zone( zone_type_LOOT_CORPSE, u.pos() ) ? MultiButchery : 0; if( flags == 0 ) { add_msg( m_info, _( "There is no compatible zone nearby." ) ); add_msg( m_info, _( "Compatible zones are %s and %s" ), - mgr.get_name_from_type( zone_type_id( "LOOT_UNSORTED" ) ), - mgr.get_name_from_type( zone_type_id( "FARM_PLOT" ) ) ); + mgr.get_name_from_type( zone_type_LOOT_UNSORTED ), + mgr.get_name_from_type( zone_type_FARM_PLOT ) ); return; } @@ -1277,7 +1277,7 @@ static void fire() return; } - if( vp.part_with_feature( "CONTROLS", true ) ) { + if( vp.part_with_feature( flag_CONTROLS, true ) ) { if( vp->vehicle().turrets_aim_and_fire() ) { return; } diff --git a/src/inventory.cpp b/src/inventory.cpp index b18b315df1c44..e3f84bb228fc5 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -506,14 +506,14 @@ void inventory::form_from_map( map &m, std::vector pts, const Characte //Adds faucet to kitchen stuff; may be horribly wrong to do such.... //ShouldBreak into own variable - const cata::optional kpart = vp.part_with_feature( "KITCHEN", true ); - const cata::optional faupart = vp.part_with_feature( "FAUCET", true ); - const cata::optional weldpart = vp.part_with_feature( "WELDRIG", true ); - const cata::optional craftpart = vp.part_with_feature( "CRAFTRIG", true ); - const cata::optional forgepart = vp.part_with_feature( "FORGE", true ); - const cata::optional kilnpart = vp.part_with_feature( "KILN", true ); - const cata::optional chempart = vp.part_with_feature( "CHEMLAB", true ); - const cata::optional cargo = vp.part_with_feature( "CARGO", true ); + const cata::optional kpart = vp.part_with_feature( flag_KITCHEN, true ); + const cata::optional faupart = vp.part_with_feature( flag_FAUCET, true ); + const cata::optional weldpart = vp.part_with_feature( flag_WELDRIG, true ); + const cata::optional craftpart = vp.part_with_feature( flag_CRAFTRIG, true ); + const cata::optional forgepart = vp.part_with_feature( flag_FORGE, true ); + const cata::optional kilnpart = vp.part_with_feature( flag_KILN, true ); + const cata::optional chempart = vp.part_with_feature( flag_CHEMLAB, true ); + const cata::optional cargo = vp.part_with_feature( flag_CARGO, true ); if( cargo ) { const auto items = veh->get_items( cargo->part_index() ); diff --git a/src/inventory_ui.cpp b/src/inventory_ui.cpp index 656d92230a2c0..b14ced5285c12 100644 --- a/src/inventory_ui.cpp +++ b/src/inventory_ui.cpp @@ -41,6 +41,7 @@ #include #include #include +#include "cata_string_consts.h" /** The maximum distance from the screen edge, to snap a window to it */ static const size_t max_win_snap_distance = 4; @@ -650,7 +651,7 @@ void inventory_column::set_stack_favorite( const item_location &location, bool f } } else if( location.where() == item_location::type::vehicle ) { const cata::optional vp = g->m.veh_at( - location.position() ).part_with_feature( "CARGO", true ); + location.position() ).part_with_feature( flag_CARGO, true ); assert( vp ); auto items = vp->vehicle().get_items( vp->part_index() ); @@ -1184,7 +1185,8 @@ void inventory_selector::add_map_items( const tripoint &target ) void inventory_selector::add_vehicle_items( const tripoint &target ) { - const cata::optional vp = g->m.veh_at( target ).part_with_feature( "CARGO", true ); + const cata::optional vp = g->m.veh_at( target ).part_with_feature( flag_CARGO, + true ); if( !vp ) { return; } diff --git a/src/item.cpp b/src/item.cpp index 687179425f4d5..f16a4ce6a33d4 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -8886,7 +8886,7 @@ cata::optional item::get_cable_target( Character *p, const tripoint &p } const optional_vpart_position vp_pos = g->m.veh_at( pos ); if( vp_pos ) { - const cata::optional seat = vp_pos.part_with_feature( "BOARDABLE", true ); + const cata::optional seat = vp_pos.part_with_feature( flag_BOARDABLE, true ); if( seat && p == seat->vehicle().get_passenger( seat->part_index() ) ) { return pos; } diff --git a/src/item_location.cpp b/src/item_location.cpp index 903cd46cdf293..5dd52acfc6e2e 100644 --- a/src/item_location.cpp +++ b/src/item_location.cpp @@ -423,7 +423,7 @@ class item_location::impl::item_on_vehicle : public item_location::impl if( auto label = part_pos.get_label() ) { res = colorize( *label, c_light_blue ) + " "; } - if( auto cargo_part = part_pos.part_with_feature( "CARGO", true ) ) { + if( auto cargo_part = part_pos.part_with_feature( flag_CARGO, true ) ) { res += cargo_part->part().name(); } else { debugmsg( "item in vehicle part without cargo storage" ); diff --git a/src/lightmap.cpp b/src/lightmap.cpp index 80a3a01b9284f..dee86db0ce83d 100644 --- a/src/lightmap.cpp +++ b/src/lightmap.cpp @@ -424,7 +424,7 @@ void map::generate_lightmap( const int zlev ) if( !inbounds( pp ) ) { continue; } - if( vp.has_feature( VPFLAG_CARGO ) && !vp.has_feature( "COVERED" ) ) { + if( vp.has_feature( VPFLAG_CARGO ) && !vp.has_feature( flag_COVERED ) ) { add_light_from_items( pp, v->get_items( static_cast( p ) ).begin(), v->get_items( static_cast( p ) ).end() ); } diff --git a/src/map.cpp b/src/map.cpp index 3c8788dda98a4..290f45f579ea7 100755 --- a/src/map.cpp +++ b/src/map.cpp @@ -849,7 +849,7 @@ void map::register_vehicle_zone( vehicle *veh, const int zlev ) bool map::deregister_vehicle_zone( zone_data &zone ) { if( const cata::optional vp = veh_at( getlocal( - zone.get_start_point() ) ).part_with_feature( "CARGO", false ) ) { + zone.get_start_point() ) ).part_with_feature( flag_CARGO, false ) ) { auto bounds = vp->vehicle().loot_zones.equal_range( vp->mount() ); for( auto it = bounds.first; it != bounds.second; it++ ) { if( &zone == &( it->second ) ) { @@ -2117,7 +2117,7 @@ bool map::can_put_items( const tripoint &p ) const return true; } const optional_vpart_position vp = veh_at( p ); - return static_cast( vp.part_with_feature( "CARGO", true ) ); + return static_cast( vp.part_with_feature( flag_CARGO, true ) ); } bool map::can_put_items_ter_furn( const tripoint &p ) const @@ -2588,7 +2588,7 @@ bool map::has_nearby_table( const tripoint &p, int radius ) if( has_flag( flag_FLAT_SURF, pt ) ) { return true; } - if( vp && ( vp->vehicle().has_part( "KITCHEN" ) || vp->vehicle().has_part( "FLAT_SURF" ) ) ) { + if( vp && ( vp->vehicle().has_part( flag_KITCHEN ) || vp->vehicle().has_part( flag_FLAT_SURF ) ) ) { return true; } } @@ -2602,7 +2602,7 @@ bool map::has_nearby_chair( const tripoint &p, int radius ) if( has_flag( flag_CAN_SIT, pt ) ) { return true; } - if( vp && vp->vehicle().has_part( "SEAT" ) ) { + if( vp && vp->vehicle().has_part( flag_SEAT ) ) { return true; } } @@ -4347,7 +4347,7 @@ static void process_vehicle_items( vehicle &cur_veh, int part ) } if( cur_veh.part_with_feature( part, VPFLAG_RECHARGE, true ) >= 0 && - cur_veh.has_part( "RECHARGE", true ) ) { + cur_veh.has_part( flag_RECHARGE, true ) ) { for( auto &n : cur_veh.get_items( part ) ) { if( !n.has_flag( flag_RECHARGE ) && !n.has_flag( flag_USE_UPS ) ) { continue; @@ -4486,7 +4486,7 @@ void map::process_items_in_vehicles( submap ¤t_submap, const int gridz, void map::process_items_in_vehicle( vehicle &cur_veh, submap ¤t_submap, const int /*gridz*/, map::map_process_func processor, const std::string &signal ) { - const bool engine_heater_is_on = cur_veh.has_part( "E_HEATER", true ) && cur_veh.engine_on; + const bool engine_heater_is_on = cur_veh.has_part( flag_E_HEATER, true ) && cur_veh.engine_on; for( const vpart_reference &vp : cur_veh.get_any_parts( VPFLAG_FLUIDTANK ) ) { vp.part().process_contents( vp.pos(), engine_heater_is_on ); } @@ -4635,7 +4635,7 @@ std::list map::use_amount_square( const tripoint &p, const itype_id &type, return ret; } - if( const cata::optional vp = veh_at( p ).part_with_feature( "CARGO", true ) ) { + if( const cata::optional vp = veh_at( p ).part_with_feature( flag_CARGO, true ) ) { std::list tmp = use_amount_stack( vp->vehicle().get_items( vp->part_index() ), type, quantity, filter ); ret.splice( ret.end(), tmp ); @@ -4781,13 +4781,13 @@ std::list map::use_charges( const tripoint &origin, const int range, continue; } - const cata::optional kpart = vp.part_with_feature( "FAUCET", true ); - const cata::optional weldpart = vp.part_with_feature( "WELDRIG", true ); - const cata::optional craftpart = vp.part_with_feature( "CRAFTRIG", true ); - const cata::optional forgepart = vp.part_with_feature( "FORGE", true ); - const cata::optional kilnpart = vp.part_with_feature( "KILN", true ); - const cata::optional chempart = vp.part_with_feature( "CHEMLAB", true ); - const cata::optional cargo = vp.part_with_feature( "CARGO", true ); + const cata::optional kpart = vp.part_with_feature( flag_FAUCET, true ); + const cata::optional weldpart = vp.part_with_feature( flag_WELDRIG, true ); + const cata::optional craftpart = vp.part_with_feature( flag_CRAFTRIG, true ); + const cata::optional forgepart = vp.part_with_feature( flag_FORGE, true ); + const cata::optional kilnpart = vp.part_with_feature( flag_KILN, true ); + const cata::optional chempart = vp.part_with_feature( flag_CHEMLAB, true ); + const cata::optional cargo = vp.part_with_feature( flag_CARGO, true ); if( kpart ) { // we have a faucet, now to see what to drain itype_id ftype = "null"; diff --git a/src/map_extras.cpp b/src/map_extras.cpp index caf08d0a45d4b..c228004b8b87d 100644 --- a/src/map_extras.cpp +++ b/src/map_extras.cpp @@ -304,8 +304,8 @@ static void mx_helicopter( map &m, const tripoint &abs_sub ) 1 ); const auto controls_at = []( vehicle * wreckage, const tripoint & pos ) { - return !wreckage->get_parts_at( pos, "CONTROLS", part_status_flag::any ).empty() || - !wreckage->get_parts_at( pos, "CTRL_ELECTRONIC", part_status_flag::any ).empty(); + return !wreckage->get_parts_at( pos, flag_CONTROLS, part_status_flag::any ).empty() || + !wreckage->get_parts_at( pos, flag_CTRL_ELECTRONIC, part_status_flag::any ).empty(); }; if( wreckage != nullptr ) { diff --git a/src/monmove.cpp b/src/monmove.cpp index e963176459143..a11fece252eaf 100644 --- a/src/monmove.cpp +++ b/src/monmove.cpp @@ -553,7 +553,7 @@ static float get_stagger_adjust( const tripoint &source, const tripoint &destina bool monster::is_aquatic_danger( const tripoint &at_pos ) { return g->m.has_flag_ter( TFLAG_DEEP_WATER, at_pos ) && g->m.has_flag( flag_LIQUID, at_pos ) && - can_drown() && !g->m.veh_at( at_pos ).part_with_feature( "BOARDABLE", false ); + can_drown() && !g->m.veh_at( at_pos ).part_with_feature( flag_BOARDABLE, false ); } bool monster::die_if_drowning( const tripoint &at_pos, const int chance ) @@ -697,7 +697,7 @@ void monster::move() // don't move if a passenger in a moving vehicle auto vp = g->m.veh_at( pos() ); - bool harness_part = static_cast( g->m.veh_at( pos() ).part_with_feature( "ANIMAL_CTRL", + bool harness_part = static_cast( g->m.veh_at( pos() ).part_with_feature( flag_ANIMAL_CTRL, true ) ); if( vp && vp->vehicle().is_moving() && vp->vehicle().get_pet( vp->part_index() ) ) { moves = 0; diff --git a/src/npcmove.cpp b/src/npcmove.cpp index 5883d470023b9..e102d9b385c47 100644 --- a/src/npcmove.cpp +++ b/src/npcmove.cpp @@ -159,7 +159,7 @@ static bool clear_shot_reach( const tripoint &from, const tripoint &to, bool che tripoint npc::good_escape_direction( bool include_pos ) { if( path.empty() ) { - zone_type_id retreat_zone = zone_type_id( "NPC_RETREAT" ); + zone_type_id retreat_zone = zone_type_NPC_RETREAT; const tripoint &abs_pos = global_square_location(); const zone_manager &mgr = zone_manager::get_manager(); cata::optional retreat_target = mgr.get_nearest( retreat_zone, abs_pos, 60, @@ -2719,15 +2719,13 @@ void npc::find_item() continue; } const cata::optional cargo = vp.part_with_feature( VPFLAG_CARGO, true ); - static const std::string locked_string( "LOCKED" ); // TODO: Let player know what parts are safe from NPC thieves - if( !cargo || cargo->has_feature( locked_string ) ) { + if( !cargo || cargo->has_feature( flag_LOCKED ) ) { cache_tile(); continue; } - static const std::string cargo_locking_string( "CARGO_LOCKING" ); - if( vp.part_with_feature( cargo_locking_string, true ) ) { + if( vp.part_with_feature( flag_CARGO_LOCKING, true ) ) { cache_tile(); continue; } @@ -2780,11 +2778,11 @@ void npc::pick_up_item() const cata::optional vp = g->m.veh_at( wanted_item_pos ).part_with_feature( VPFLAG_CARGO, false ); - const bool has_cargo = vp && !vp->has_feature( "LOCKED" ); + const bool has_cargo = vp && !vp->has_feature( flag_LOCKED ); if( ( !g->m.has_items( wanted_item_pos ) && !has_cargo && !g->m.is_harvestable( wanted_item_pos ) && sees( wanted_item_pos ) ) || - ( is_player_ally() && g->check_zone( zone_type_id( "NO_NPC_PICKUP" ), wanted_item_pos ) ) ) { + ( is_player_ally() && g->check_zone( zone_type_NO_NPC_PICKUP, wanted_item_pos ) ) ) { // Items we wanted no longer exist and we can see it // Or player who is leading us doesn't want us to pick it up fetching_item = false; diff --git a/src/pickup.cpp b/src/pickup.cpp index 22c7165bb8b3f..c0abaf506cbf9 100644 --- a/src/pickup.cpp +++ b/src/pickup.cpp @@ -419,7 +419,7 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from ) if( min != -1 ) { if( veh != nullptr && get_items_from == prompt ) { - const cata::optional carg = vp.part_with_feature( "CARGO", false ); + const cata::optional carg = vp.part_with_feature( flag_CARGO, false ); const bool veh_has_items = carg && !veh->get_items( carg->part_index() ).empty(); const bool map_has_items = g->m.has_items( p ); if( veh_has_items && map_has_items ) { @@ -433,7 +433,7 @@ void Pickup::pick_up( const tripoint &p, int min, from_where get_items_from ) } } if( get_items_from == from_cargo ) { - const cata::optional carg = vp.part_with_feature( "CARGO", false ); + const cata::optional carg = vp.part_with_feature( flag_CARGO, false ); cargo_part = carg ? carg->part_index() : -1; from_vehicle = cargo_part >= 0; } else { diff --git a/src/player.cpp b/src/player.cpp index 38d6012990b17..ba6546e38462f 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1773,14 +1773,14 @@ int player::impact( const int force, const tripoint &p ) // Slamming into vehicles // TODO: Integrate it with vehicle collision function somehow target_name = vp->vehicle().disp_name(); - if( vp.part_with_feature( "SHARP", true ) ) { + if( vp.part_with_feature( flag_SHARP, true ) ) { // Now we're actually getting impaled cut = force; // Lots of fun } mod = slam ? 1.0f : fall_damage_mod(); armor_eff = 0.25f; // Not much - if( !slam && vp->part_with_feature( "ROOF", true ) ) { + if( !slam && vp->part_with_feature( flag_ROOF, true ) ) { // Roof offers better landing than frame or pavement // TODO: Make this not happen with heavy duty/plated roof effective_force /= 2; @@ -4414,8 +4414,8 @@ void player::try_to_sleep( const time_duration &dur ) ter_at_pos == t_improvised_shelter || trap_at_pos.comfort > static_cast( comfort_level::neutral ) || in_shell || websleeping || watersleep || - vp.part_with_feature( "SEAT", true ) || - vp.part_with_feature( "BED", true ) ) ) { + vp.part_with_feature( flag_SEAT, true ) || + vp.part_with_feature( flag_BED, true ) ) ) { add_msg_if_player( m_good, _( "This is a comfortable place to sleep." ) ); } else if( !plantsleep && !fungaloid_cosplay && !watersleep ) { if( !vp && ter_at_pos != t_floor ) { diff --git a/src/ranged.cpp b/src/ranged.cpp index c1d31187e249a..45b634fbd1499 100644 --- a/src/ranged.cpp +++ b/src/ranged.cpp @@ -2190,7 +2190,7 @@ static void cycle_action( item &weap, const tripoint &pos ) const optional_vpart_position vp = g->m.veh_at( pos ); std::vector cargo; if( vp && weap.has_flag( flag_VEHICLE ) ) { - cargo = vp->vehicle().get_parts_at( pos, "CARGO", part_status_flag::any ); + cargo = vp->vehicle().get_parts_at( pos, flag_CARGO, part_status_flag::any ); } if( weap.ammo_data() && weap.ammo_data()->ammo->casing ) { diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index 964bd61f91d37..f9004820d816b 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -2685,35 +2685,35 @@ void vehicle::deserialize( JsonIn &jsin ) } } - for( const vpart_reference &vp : get_any_parts( "TURRET" ) ) { + for( const vpart_reference &vp : get_any_parts( flag_TURRET ) ) { install_part( vp.mount(), vpart_turret_mount, false ); //Forcibly set turrets' targeting mode to manual if no turret control unit is present on turret's tile on loading save - if( !has_part( global_part_pos3( vp.part() ), "TURRET_CONTROLS" ) ) { + if( !has_part( global_part_pos3( vp.part() ), flag_TURRET_CONTROLS ) ) { vp.part().enabled = false; } //Set turret control unit's state equal to turret's targeting mode on loading save - for( const vpart_reference &turret_part : get_any_parts( "TURRET_CONTROLS" ) ) { + for( const vpart_reference &turret_part : get_any_parts( flag_TURRET_CONTROLS ) ) { turret_part.part().enabled = vp.part().enabled; } } // Add vehicle mounts to cars that are missing them. - for( const vpart_reference &vp : get_any_parts( "NEEDS_WHEEL_MOUNT_LIGHT" ) ) { + for( const vpart_reference &vp : get_any_parts( flag_NEEDS_WHEEL_MOUNT_LIGHT ) ) { if( vp.info().has_flag( flag_STEERABLE ) ) { install_part( vp.mount(), vpart_wheel_mount_light_steerable, false ); } else { install_part( vp.mount(), vpart_wheel_mount_light, false ); } } - for( const vpart_reference &vp : get_any_parts( "NEEDS_WHEEL_MOUNT_MEDIUM" ) ) { + for( const vpart_reference &vp : get_any_parts( flag_NEEDS_WHEEL_MOUNT_MEDIUM ) ) { if( vp.info().has_flag( flag_STEERABLE ) ) { install_part( vp.mount(), vpart_wheel_mount_medium_steerable, false ); } else { install_part( vp.mount(), vpart_wheel_mount_medium, false ); } } - for( const vpart_reference &vp : get_any_parts( "NEEDS_WHEEL_MOUNT_HEAVY" ) ) { + for( const vpart_reference &vp : get_any_parts( flag_NEEDS_WHEEL_MOUNT_HEAVY ) ) { if( vp.info().has_flag( flag_STEERABLE ) ) { install_part( vp.mount(), vpart_wheel_mount_heavy_steerable, false ); } else { diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp index ced7ef5859fbf..01f7add3679fd 100644 --- a/src/sdltiles.cpp +++ b/src/sdltiles.cpp @@ -1836,7 +1836,7 @@ input_context touch_input_context; std::string get_quick_shortcut_name( const std::string &category ) { - if( category == "DEFAULTMODE" && g->check_zone( zone_type_id( "NO_AUTO_PICKUP" ), g->u.pos() ) && + if( category == "DEFAULTMODE" && g->check_zone( zone_type_NO_AUTO_PICKUP, g->u.pos() ) && get_option( "ANDROID_SHORTCUT_ZONE" ) ) { return "DEFAULTMODE____SHORTCUTS"; } @@ -2650,19 +2650,19 @@ static void CheckMessages() vehicle *const veh = veh_pointer_or_null( vp ); if( veh ) { const int veh_part = vp ? vp->part_index() : -1; - if( veh->part_with_feature( veh_part, "CONTROLS", true ) >= 0 ) { + if( veh->part_with_feature( veh_part, flag_CONTROLS, true ) >= 0 ) { actions.insert( ACTION_CONTROL_VEHICLE ); } - const int openablepart = veh->part_with_feature( veh_part, "OPENABLE", true ); + const int openablepart = veh->part_with_feature( veh_part, flag_OPENABLE, true ); if( openablepart >= 0 && veh->is_open( openablepart ) && ( dx != 0 || dy != 0 ) ) { // an open door adjacent to us actions.insert( ACTION_CLOSE ); } - const int curtainpart = veh->part_with_feature( veh_part, "CURTAIN", true ); + const int curtainpart = veh->part_with_feature( veh_part, flag_CURTAIN, true ); if( curtainpart >= 0 && veh->is_open( curtainpart ) && ( dx != 0 || dy != 0 ) ) { actions.insert( ACTION_CLOSE ); } - const int cargopart = veh->part_with_feature( veh_part, "CARGO", true ); + const int cargopart = veh->part_with_feature( veh_part, flag_CARGO, true ); if( cargopart >= 0 && ( !veh->get_items( cargopart ).empty() ) ) { actions.insert( ACTION_PICKUP ); } diff --git a/src/turret.cpp b/src/turret.cpp index bdaae9db90ea4..89b3ca8ca6656 100644 --- a/src/turret.cpp +++ b/src/turret.cpp @@ -64,7 +64,7 @@ turret_data vehicle::turret_query( const vehicle_part &pt ) const turret_data vehicle::turret_query( const tripoint &pos ) { - auto res = get_parts_at( pos, "TURRET", part_status_flag::any ); + auto res = get_parts_at( pos, flag_TURRET, part_status_flag::any ); return !res.empty() ? turret_query( *res.front() ) : turret_data(); } diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp index 9107ea531bf10..b5fe18527e42f 100644 --- a/src/veh_interact.cpp +++ b/src/veh_interact.cpp @@ -2207,7 +2207,7 @@ void veh_interact::display_stats() const units::volume total_cargo = 0_ml; units::volume free_cargo = 0_ml; - for( const vpart_reference &vp : veh->get_any_parts( "CARGO" ) ) { + for( const vpart_reference &vp : veh->get_any_parts( flag_CARGO ) ) { const size_t p = vp.part_index(); total_cargo += veh->max_volume( p ); free_cargo += veh->free_volume( p ); @@ -2735,7 +2735,7 @@ void act_vehicle_unload_fuel( vehicle *veh ) uilist smenu; smenu.text = _( "Remove what?" ); for( auto &fuel : fuels ) { - if( fuel == fuel_type_plutonium_cell && veh->fuel_left( fuel ) < PLUTONIUM_CHARGES ) { + if( fuel == fuel_type_plut_cell && veh->fuel_left( fuel ) < PLUTONIUM_CHARGES ) { continue; } smenu.addentry( item::nname( fuel ) ); @@ -2751,7 +2751,7 @@ void act_vehicle_unload_fuel( vehicle *veh ) } int qty = veh->fuel_left( fuel ); - if( fuel == fuel_type_plutonium_cell ) { + if( fuel == fuel_type_plut_cell ) { if( qty / PLUTONIUM_CHARGES == 0 ) { add_msg( m_info, _( "The vehicle has no charged plutonium cells." ) ); return; diff --git a/src/veh_type.cpp b/src/veh_type.cpp index f4d3ab1a59529..a3d7418f8a196 100644 --- a/src/veh_type.cpp +++ b/src/veh_type.cpp @@ -449,7 +449,7 @@ void vpart_info::finalize() // Calculate and cache z-ordering based off of location // list_order is used when inspecting the vehicle - if( e.second.location == "on_roof" ) { + if( e.second.location == part_location_onroof ) { e.second.z_order = 9; e.second.list_order = 3; } else if( e.second.location == "on_cargo" ) { diff --git a/src/vehicle.cpp b/src/vehicle.cpp index a7eea2a7ddaf5..23d5ba0fa8dc7 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -228,7 +228,7 @@ bool vehicle::player_in_control( const player &p ) const const optional_vpart_position vp = g->m.veh_at( p.pos() ); if( vp && &vp->vehicle() == this && - ( ( part_with_feature( vp->part_index(), "CONTROL_ANIMAL", true ) >= 0 && + ( ( part_with_feature( vp->part_index(), flag_CONTROL_ANIMAL, true ) >= 0 && has_engine_type( fuel_type_animal, false ) && has_harnessed_animal() ) || ( part_with_feature( vp->part_index(), VPFLAG_CONTROLS, false ) >= 0 ) ) && p.controlling_vehicle ) { @@ -292,7 +292,7 @@ void vehicle::add_steerable_wheels() // Find wheels that have steerable versions. // Convert the wheel(s) with the largest x value. for( const vpart_reference &vp : get_all_parts() ) { - if( vp.has_feature( "STEERABLE" ) || vp.has_feature( "TRACKED" ) ) { + if( vp.has_feature( flag_STEERABLE ) || vp.has_feature( flag_TRACKED ) ) { // Has a wheel that is inherently steerable // (e.g. unicycle, casters), this vehicle doesn't // need conversion. @@ -440,15 +440,15 @@ void vehicle::init_state( int init_veh_fuel, int init_veh_status ) blood_inside = true; } - for( const vpart_reference &vp : get_parts_including_carried( "FRIDGE" ) ) { + for( const vpart_reference &vp : get_parts_including_carried( flag_FRIDGE ) ) { vp.part().enabled = true; } - for( const vpart_reference &vp : get_parts_including_carried( "FREEZER" ) ) { + for( const vpart_reference &vp : get_parts_including_carried( flag_FREEZER ) ) { vp.part().enabled = true; } - for( const vpart_reference &vp : get_parts_including_carried( "WATER_PURIFIER" ) ) { + for( const vpart_reference &vp : get_parts_including_carried( flag_WATER_PURIFIER ) ) { vp.part().enabled = true; } } @@ -465,44 +465,44 @@ void vehicle::init_state( int init_veh_fuel, int init_veh_status ) if( pt.is_reactor() ) { if( veh_fuel_mult == 100 ) { // Mint condition vehicle - pt.ammo_set( "plut_cell", pt.ammo_capacity() ); + pt.ammo_set( fuel_type_plut_cell, pt.ammo_capacity() ); } else if( one_in( 2 ) && veh_fuel_mult > 0 ) { // Randomize charge a bit - pt.ammo_set( "plut_cell", pt.ammo_capacity() * ( veh_fuel_mult + rng( 0, 10 ) ) / 100 ); + pt.ammo_set( fuel_type_plut_cell, pt.ammo_capacity() * ( veh_fuel_mult + rng( 0, 10 ) ) / 100 ); } else if( one_in( 2 ) && veh_fuel_mult > 0 ) { - pt.ammo_set( "plut_cell", pt.ammo_capacity() * ( veh_fuel_mult - rng( 0, 10 ) ) / 100 ); + pt.ammo_set( fuel_type_plut_cell, pt.ammo_capacity() * ( veh_fuel_mult - rng( 0, 10 ) ) / 100 ); } else { - pt.ammo_set( "plut_cell", pt.ammo_capacity() * veh_fuel_mult / 100 ); + pt.ammo_set( fuel_type_plut_cell, pt.ammo_capacity() * veh_fuel_mult / 100 ); } } if( pt.is_battery() ) { if( veh_fuel_mult == 100 ) { // Mint condition vehicle - pt.ammo_set( "battery", pt.ammo_capacity() ); + pt.ammo_set( fuel_type_battery, pt.ammo_capacity() ); } else if( one_in( 2 ) && veh_fuel_mult > 0 ) { // Randomize battery ammo a bit - pt.ammo_set( "battery", pt.ammo_capacity() * ( veh_fuel_mult + rng( 0, 10 ) ) / 100 ); + pt.ammo_set( fuel_type_battery, pt.ammo_capacity() * ( veh_fuel_mult + rng( 0, 10 ) ) / 100 ); } else if( one_in( 2 ) && veh_fuel_mult > 0 ) { - pt.ammo_set( "battery", pt.ammo_capacity() * ( veh_fuel_mult - rng( 0, 10 ) ) / 100 ); + pt.ammo_set( fuel_type_battery, pt.ammo_capacity() * ( veh_fuel_mult - rng( 0, 10 ) ) / 100 ); } else { - pt.ammo_set( "battery", pt.ammo_capacity() * veh_fuel_mult / 100 ); + pt.ammo_set( fuel_type_battery, pt.ammo_capacity() * veh_fuel_mult / 100 ); } } - if( pt.is_tank() && type->parts[p].fuel != "null" ) { + if( pt.is_tank() && type->parts[p].fuel != fuel_type_none ) { int qty = pt.ammo_capacity() * veh_fuel_mult / 100; qty *= std::max( item::find_type( type->parts[p].fuel )->stack_size, 1 ); qty /= to_milliliter( units::legacy_volume_factor ); pt.ammo_set( type->parts[ p ].fuel, qty ); - } else if( pt.is_fuel_store() && type->parts[p].fuel != "null" ) { + } else if( pt.is_fuel_store() && type->parts[p].fuel != fuel_type_none ) { int qty = pt.ammo_capacity() * veh_fuel_mult / 100; pt.ammo_set( type->parts[ p ].fuel, qty ); } - if( vp.has_feature( "OPENABLE" ) ) { // doors are closed + if( vp.has_feature( flag_OPENABLE ) ) { // doors are closed if( !pt.open && one_in( 4 ) ) { open( p ); } } - if( vp.has_feature( "BOARDABLE" ) ) { // no passengers + if( vp.has_feature( flag_BOARDABLE ) ) { // no passengers pt.remove_flag( vehicle_part::passenger_flag ); } @@ -537,9 +537,9 @@ void vehicle::init_state( int init_veh_fuel, int init_veh_status ) } while( one_in( 3 ) ); } - } else if( ( destroySeats && ( vp.has_feature( "SEAT" ) || vp.has_feature( "SEATBELT" ) ) ) || - ( destroyControls && ( vp.has_feature( "CONTROLS" ) || vp.has_feature( "SECURITY" ) ) ) || - ( destroyAlarm && vp.has_feature( "SECURITY" ) ) ) { + } else if( ( destroySeats && ( vp.has_feature( flag_SEAT ) || vp.has_feature( flag_SEATBELT ) ) ) || + ( destroyControls && ( vp.has_feature( flag_CONTROLS ) || vp.has_feature( flag_SECURITY ) ) ) || + ( destroyAlarm && vp.has_feature( flag_SECURITY ) ) ) { set_hp( pt, 0 ); } @@ -550,7 +550,7 @@ void vehicle::init_state( int init_veh_fuel, int init_veh_status ) } //Solar panels have 25% of being destroyed - if( vp.has_feature( "SOLAR_PANEL" ) && one_in( 4 ) ) { + if( vp.has_feature( flag_SOLAR_PANEL ) && one_in( 4 ) ) { set_hp( pt, 0 ); } @@ -577,14 +577,14 @@ void vehicle::init_state( int init_veh_fuel, int init_veh_status ) if( distSq <= 1 ) { pt.blood = rng( 200, 400 ) - distSq * 100; } - } else if( vp.has_feature( "SEAT" ) ) { + } else if( vp.has_feature( flag_SEAT ) ) { // Set the center of the bloody mess inside blood_inside_pos.emplace( vp.mount() ); } } } //sets the vehicle to locked, if there is no key and an alarm part exists - if( vp.has_feature( "SECURITY" ) && has_no_key && pt.is_available() ) { + if( vp.has_feature( flag_SECURITY ) && has_no_key && pt.is_available() ) { is_locked = true; if( one_in( 2 ) ) { @@ -653,7 +653,7 @@ void vehicle::autopilot_patrol() return; } zone_manager &mgr = zone_manager::get_manager(); - const auto &zone_src_set = mgr.get_near( zone_type_id( "VEHICLE_PATROL" ), + const auto &zone_src_set = mgr.get_near( zone_type_VEHICLE_PATROL, g->m.getabs( global_pos3() ), 60 ); if( zone_src_set.empty() ) { is_patrolling = false; @@ -1556,15 +1556,15 @@ bool vehicle::can_unmount( const int p, std::string &reason ) const // Check if the part is required by another part. Do not allow removing those. // { "FLAG THAT IS REQUIRED", "FLAG THAT REQUIRES", "Reason why can't remove." } static const std::array, 9> blocking_flags = {{ - std::make_tuple( "ENGINE", "ALTERNATOR", translate_marker( "Remove attached alternator first." ) ), - std::make_tuple( "BELTABLE", "SEATBELT", translate_marker( "Remove attached seatbelt first." ) ), - std::make_tuple( "WINDOW", "CURTAIN", translate_marker( "Remove attached curtains first." ) ), - std::make_tuple( "CONTROLS", "ON_CONTROLS", translate_marker( "Remove the attached %s first." ) ), - std::make_tuple( "BATTERY_MOUNT", "NEEDS_BATTERY_MOUNT", translate_marker( "Remove battery from mount first." ) ), - std::make_tuple( "TURRET_MOUNT", "TURRET", translate_marker( "Remove attached mounted weapon first." ) ), - std::make_tuple( "WHEEL_MOUNT_LIGHT", "NEEDS_WHEEL_MOUNT_LIGHT", translate_marker( "Remove attached wheel first." ) ), - std::make_tuple( "WHEEL_MOUNT_MEDIUM", "NEEDS_WHEEL_MOUNT_MEDIUM", translate_marker( "Remove attached wheel first." ) ), - std::make_tuple( "WHEEL_MOUNT_HEAVY", "NEEDS_WHEEL_MOUNT_HEAVY", translate_marker( "Remove attached wheel first." ) ) + std::make_tuple( flag_ENGINE, flag_ALTERNATOR, translate_marker( "Remove attached alternator first." ) ), + std::make_tuple( flag_BELTABLE, flag_SEATBELT, translate_marker( "Remove attached seatbelt first." ) ), + std::make_tuple( flag_WINDOW, flag_CURTAIN, translate_marker( "Remove attached curtains first." ) ), + std::make_tuple( flag_CONTROLS, flag_ON_CONTROLS, translate_marker( "Remove the attached %s first." ) ), + std::make_tuple( flag_BATTERY_MOUNT, flag_NEEDS_BATTERY_MOUNT, translate_marker( "Remove battery from mount first." ) ), + std::make_tuple( flag_TURRET_MOUNT, flag_TURRET, translate_marker( "Remove attached mounted weapon first." ) ), + std::make_tuple( flag_WHEEL_MOUNT_LIGHT, flag_NEEDS_WHEEL_MOUNT_LIGHT, translate_marker( "Remove attached wheel first." ) ), + std::make_tuple( flag_WHEEL_MOUNT_MEDIUM, flag_NEEDS_WHEEL_MOUNT_MEDIUM, translate_marker( "Remove attached wheel first." ) ), + std::make_tuple( flag_WHEEL_MOUNT_HEAVY, flag_NEEDS_WHEEL_MOUNT_HEAVY, translate_marker( "Remove attached wheel first." ) ) } }; for( auto &flag_check : blocking_flags ) { @@ -1747,26 +1747,26 @@ int vehicle::install_part( const point &dp, const vehicle_part &new_part ) } else { // TODO: read toggle groups from JSON static const std::vector enable_like = {{ - "CONE_LIGHT", - "CIRCLE_LIGHT", - "AISLE_LIGHT", - "AUTOPILOT", - "DOME_LIGHT", - "ATOMIC_LIGHT", - "STEREO", - "CHIMES", - "FRIDGE", - "FREEZER", - "RECHARGE", - "PLOW", - "REAPER", - "PLANTER", - "SCOOP", - "SPACE_HEATER", - "COOLER", - "WATER_PURIFIER", - "ROCKWHEEL", - "ROADHEAD" + flag_CONE_LIGHT, + flag_CIRCLE_LIGHT, + flag_AISLE_LIGHT, + flag_AUTOPILOT, + flag_DOME_LIGHT, + flag_ATOMIC_LIGHT, + flag_STEREO, + flag_CHIMES, + flag_FRIDGE, + flag_FREEZER, + flag_RECHARGE, + flag_PLOW, + flag_REAPER, + flag_PLANTER, + flag_SCOOP, + flag_SPACE_HEATER, + flag_COOLER, + flag_WATER_PURIFIER, + flag_ROCKWHEEL, + flag_ROADHEAD } }; @@ -2027,12 +2027,12 @@ bool vehicle::remove_part( const int p, RemovePartHandler &handler ) // if a windshield is removed (usually destroyed) also remove curtains // attached to it. - if( remove_dependent_part( "WINDOW", "CURTAIN" ) || part_flag( p, VPFLAG_OPAQUE ) ) { + if( remove_dependent_part( flag_WINDOW, flag_CURTAIN ) || part_flag( p, VPFLAG_OPAQUE ) ) { handler.set_transparency_cache_dirty( sm_pos.z ); } - remove_dependent_part( "SEAT", "SEATBELT" ); - remove_dependent_part( "BATTERY_MOUNT", "NEEDS_BATTERY_MOUNT" ); + remove_dependent_part( flag_SEAT, flag_SEATBELT ); + remove_dependent_part( flag_BATTERY_MOUNT, flag_NEEDS_BATTERY_MOUNT ); // Release any animal held by the part if( parts[p].has_flag( vehicle_part::animal_flag ) ) { @@ -2938,7 +2938,7 @@ std::vector> vehicle::find_lines_of_parts( int part, const std: point target = parts[ part ].mount; for( const vpart_reference &vp : possible_parts ) { if( vp.part().is_unavailable() || - !vp.has_feature( "MULTISQUARE" ) || + !vp.has_feature( flag_MULTISQUARE ) || vp.info().get_id() != part_id ) { continue; } @@ -3114,7 +3114,7 @@ int vehicle::roof_at_part( const int part ) const { std::vector parts_in_square = parts_at_relative( parts[part].mount, true ); for( const int p : parts_in_square ) { - if( part_info( p ).location == "on_roof" || part_flag( p, flag_ROOF ) ) { + if( part_info( p ).location == part_location_onroof || part_flag( p, flag_ROOF ) ) { return p; } } @@ -4382,9 +4382,8 @@ std::map vehicle::fuel_usage() const const size_t e = engines[ i ]; const auto &info = part_info( e ); - static const itype_id null_fuel_type( "null" ); const itype_id &cur_fuel = parts[ e ].fuel_current(); - if( cur_fuel == null_fuel_type ) { + if( cur_fuel == fuel_type_none ) { continue; } @@ -4713,11 +4712,11 @@ void vehicle::power_parts() if( battery_deficit != 0 ) { // Scoops need a special case since they consume power during actual use - for( const vpart_reference &vp : get_enabled_parts( "SCOOP" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_SCOOP ) ) { vp.part().enabled = false; } // Rechargers need special case since they consume power on demand - for( const vpart_reference &vp : get_enabled_parts( "RECHARGE" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_RECHARGE ) ) { vp.part().enabled = false; } @@ -4953,7 +4952,7 @@ void vehicle::idle( bool on_map ) } if( !warm_enough_to_plant( g->u.pos() ) ) { - for( const vpart_reference &vp : get_enabled_parts( "PLANTER" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_PLANTER ) ) { if( g->u.sees( global_pos3() ) ) { add_msg( _( "The %s's planter turns off due to low temperature." ), name ); } @@ -4967,15 +4966,15 @@ void vehicle::idle( bool on_map ) update_time( calendar::turn ); } - if( has_part( "STEREO", true ) ) { + if( has_part( flag_STEREO, true ) ) { play_music(); } - if( has_part( "CHIMES", true ) ) { + if( has_part( flag_CHIMES, true ) ) { play_chimes(); } - if( has_part( "CRASH_TERRAIN_AROUND", true ) ) { + if( has_part( flag_CRASH_TERRAIN_AROUND, true ) ) { crash_terrain_around(); } @@ -4986,16 +4985,16 @@ void vehicle::idle( bool on_map ) void vehicle::on_move() { - if( has_part( "TRANSFORM_TERRAIN", true ) ) { + if( has_part( flag_TRANSFORM_TERRAIN, true ) ) { transform_terrain(); } - if( has_part( "SCOOP", true ) ) { + if( has_part( flag_SCOOP, true ) ) { operate_scoop(); } - if( has_part( "PLANTER", true ) ) { + if( has_part( flag_PLANTER, true ) ) { operate_planter(); } - if( has_part( "REAPER", true ) ) { + if( has_part( flag_REAPER, true ) ) { operate_reaper(); } @@ -5017,11 +5016,11 @@ void vehicle::slow_leak() const tripoint dest = global_pos3() + tripoint( q, 0 ); // damaged batteries self-discharge without leaking, plutonium leaks slurry - if( fuel != fuel_type_battery && fuel != fuel_type_plutonium_cell ) { + if( fuel != fuel_type_battery && fuel != fuel_type_plut_cell ) { item leak( fuel, calendar::turn, qty ); g->m.add_item_or_charges( dest, leak ); p.ammo_consume( qty, global_part_pos3( p ) ); - } else if( fuel == fuel_type_plutonium_cell ) { + } else if( fuel == fuel_type_plut_cell ) { if( p.ammo_remaining() >= PLUTONIUM_CHARGES / 10 ) { item leak( "plut_slurry_dense", calendar::turn, qty ); g->m.add_item_or_charges( dest, leak ); @@ -5057,7 +5056,7 @@ void vehicle::make_active( item_location &loc ) if( !target.needs_processing() ) { return; } - auto cargo_parts = get_parts_at( loc.position(), "CARGO", part_status_flag::any ); + auto cargo_parts = get_parts_at( loc.position(), flag_CARGO, part_status_flag::any ); if( cargo_parts.empty() ) { return; } @@ -5190,7 +5189,7 @@ void vehicle::place_spawn_items() for( const auto &pt : type->parts ) { if( pt.with_ammo ) { - int turret = part_with_feature( pt.pos, "TURRET", true ); + int turret = part_with_feature( pt.pos, flag_TURRET, true ); if( turret >= 0 && x_in_y( pt.with_ammo, 100 ) ) { parts[ turret ].ammo_set( random_entry( pt.ammo_types ), rng( pt.ammo_qty.first, pt.ammo_qty.second ) ); @@ -5200,7 +5199,7 @@ void vehicle::place_spawn_items() for( const auto &spawn : type.obj().item_spawns ) { if( rng( 1, 100 ) <= spawn.chance ) { - int part = part_with_feature( spawn.pos, "CARGO", false ); + int part = part_with_feature( spawn.pos, flag_CARGO, false ); if( part < 0 ) { debugmsg( "No CARGO parts at (%d, %d) of %s!", spawn.pos.x, spawn.pos.y, name ); @@ -5482,7 +5481,8 @@ void vehicle::refresh() } else if( !camera_on && vpi.has_flag( flag_CAMERA ) ) { vp.part().enabled = false; } - if( vpi.has_flag( flag_TURRET ) && !has_part( global_part_pos3( vp.part() ), "TURRET_CONTROLS" ) ) { + if( vpi.has_flag( flag_TURRET ) && + !has_part( global_part_pos3( vp.part() ), flag_TURRET_CONTROLS ) ) { vp.part().enabled = false; } } @@ -5589,7 +5589,7 @@ void vehicle::refresh_pivot() const // broken wheels don't roll on either axis weight_i = contact_area * 2.0; weight_p = contact_area * 2.0; - } else if( part_with_feature( wheel.mount, "STEERABLE", true ) != -1 ) { + } else if( part_with_feature( wheel.mount, flag_STEERABLE, true ) != -1 ) { // Unbroken steerable wheels can handle motion on both axes // (but roll a little more easily inline) weight_i = contact_area * 0.1; @@ -5658,7 +5658,7 @@ void vehicle::shed_loose_parts() bool vehicle::enclosed_at( const tripoint &pos ) { refresh_insides(); - std::vector parts_here = get_parts_at( pos, "BOARDABLE", + std::vector parts_here = get_parts_at( pos, flag_BOARDABLE, part_status_flag::working ); if( !parts_here.empty() ) { return parts_here.front()->inside; @@ -5679,7 +5679,7 @@ void vehicle::refresh_insides() } /* If there's no roof, or there is a roof but it's broken, it's outside. * (Use short-circuiting && so broken frames don't screw this up) */ - if( !( part_with_feature( p, "ROOF", true ) >= 0 && vp.part().is_available() ) ) { + if( !( part_with_feature( p, flag_ROOF, true ) >= 0 && vp.part().is_available() ) ) { vp.part().inside = false; continue; } @@ -5785,7 +5785,7 @@ int vehicle::damage( int p, int dmg, damage_type type, bool aimed ) int damage_dealt; - int armor_part = part_with_feature( p, "ARMOR", true ); + int armor_part = part_with_feature( p, flag_ARMOR, true ); if( armor_part < 0 ) { // Not covered by armor -- damage part damage_dealt = damage_direct( target_part, dmg, type ); @@ -5794,7 +5794,7 @@ int vehicle::damage( int p, int dmg, damage_type type, bool aimed ) int protection = part_info( armor_part ).damage_reduction[ type ]; // Parts on roof aren't protected bool overhead = part_flag( target_part, flag_ROOF ) || - part_info( target_part ).location == "on_roof"; + part_info( target_part ).location == part_location_onroof; // Calling damage_direct may remove the damaged part // completely, therefore the other index (target_part) becomes // wrong if target_part > armor_part. @@ -5880,8 +5880,8 @@ bool vehicle::shift_if_needed() } //Find a frame, any frame, to shift to for( const vpart_reference &vp : get_all_parts() ) { - if( vp.info().location == "structure" - && !vp.has_feature( "PROTRUSION" ) + if( vp.info().location == part_location_structure + && !vp.has_feature( flag_PROTRUSION ) && !vp.part().removed ) { shift_parts( vp.mount() ); refresh(); @@ -6090,7 +6090,7 @@ std::map vehicle::fuels_left() const bool vehicle::is_foldable() const { for( const vpart_reference &vp : get_all_parts() ) { - if( !vp.has_feature( "FOLDABLE" ) ) { + if( !vp.has_feature( flag_FOLDABLE ) ) { return false; } } @@ -6276,12 +6276,12 @@ void vehicle::update_time( const time_point &update_to ) int cost_to_purify = c_qty * item::find_type( "water_purifier" )->charges_to_use(); if( qty > 0 ) { - if( has_part( global_part_pos3( pt ), "WATER_PURIFIER", true ) && - ( fuel_left( "battery", true ) > cost_to_purify ) ) { - tank->ammo_set( "water_clean", c_qty ); + if( has_part( global_part_pos3( pt ), flag_WATER_PURIFIER, true ) && + ( fuel_left( fuel_type_battery, true ) > cost_to_purify ) ) { + tank->ammo_set( fuel_type_water_clean, c_qty ); discharge_battery( cost_to_purify ); } else { - tank->ammo_set( "water", tank->ammo_remaining() + qty ); + tank->ammo_set( fuel_type_water, tank->ammo_remaining() + qty ); } invalidate_mass(); } @@ -6444,7 +6444,7 @@ bool vehicle::refresh_zones() zone_data zone = z.second; //Get the global position of the first cargo part at the relative coordinate - const int part_idx = part_with_feature( z.first, "CARGO", false ); + const int part_idx = part_with_feature( z.first, flag_CARGO, false ); if( part_idx == -1 ) { debugmsg( "Could not find cargo part at %d,%d on vehicle %s for loot zone. Removing loot zone.", z.first.x, z.first.y, this->name ); diff --git a/src/vehicle_move.cpp b/src/vehicle_move.cpp index fe75bf33e5588..12b33b78c7baf 100644 --- a/src/vehicle_move.cpp +++ b/src/vehicle_move.cpp @@ -512,7 +512,7 @@ veh_collision vehicle::part_collision( int part, const tripoint &p, !g->m.has_flag_ter_or_furn( flag_TINY, p ) ) && // Protrusions don't collide with short terrain. // Tiny also doesn't, but it's already excluded unless there's a wheel present. - !( part_with_feature( ret.part, "PROTRUSION", true ) >= 0 && + !( part_with_feature( ret.part, flag_PROTRUSION, true ) >= 0 && g->m.has_flag_ter_or_furn( flag_SHORT, p ) ) && // These are bashable, but don't interact with vehicles. !g->m.has_flag_ter_or_furn( flag_NOCOLLIDE, p ) && diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp index f09462cf799c1..b0679c78ead31 100644 --- a/src/vehicle_use.cpp +++ b/src/vehicle_use.cpp @@ -256,11 +256,11 @@ void vehicle::set_electronics_menu_options( std::vector &options, add_toggle( pgettext( "electronics menu option", "water purifier" ), keybind( "TOGGLE_WATER_PURIFIER" ), "WATER_PURIFIER" ); - if( has_part( "DOOR_MOTOR" ) ) { + if( has_part( flag_DOOR_MOTOR ) ) { options.emplace_back( _( "Toggle doors" ), keybind( "TOGGLE_DOORS" ) ); actions.push_back( [&] { control_doors(); refresh(); } ); } - if( camera_on || ( has_part( "CAMERA" ) && has_part( "CAMERA_CONTROL" ) ) ) { + if( camera_on || ( has_part( flag_CAMERA ) && has_part( flag_CAMERA_CONTROL ) ) ) { options.emplace_back( camera_on ? colorize( _( "Turn off camera system" ), c_pink ) : _( "Turn on camera system" ), @@ -449,7 +449,7 @@ void vehicle::smash_security_system() for( int p : speciality ) { if( part_flag( p, flag_SECURITY ) && !parts[ p ].is_broken() ) { s = p; - c = part_with_feature( s, "CONTROLS", true ); + c = part_with_feature( s, flag_CONTROLS, true ); break; } } @@ -493,7 +493,7 @@ std::string vehicle::tracking_toggle_string() void vehicle::autopilot_patrol_check() { zone_manager &mgr = zone_manager::get_manager(); - if( mgr.has_near( zone_type_id( "VEHICLE_PATROL" ), g->m.getabs( global_pos3() ), 60 ) ) { + if( mgr.has_near( zone_type_VEHICLE_PATROL, g->m.getabs( global_pos3() ), 60 ) ) { enable_patrol(); } else { g->zones_manager(); @@ -562,7 +562,7 @@ void vehicle::use_controls( const tripoint &pos ) refresh(); } ); - has_electronic_controls = has_part( "CTRL_ELECTRONIC" ) || has_part( "REMOTE_CONTROLS" ); + has_electronic_controls = has_part( flag_CTRL_ELECTRONIC ) || has_part( flag_REMOTE_CONTROLS ); } else if( veh_pointer_or_null( g->m.veh_at( pos ) ) == this ) { if( g->u.controlling_vehicle ) { @@ -573,11 +573,12 @@ void vehicle::use_controls( const tripoint &pos ) refresh(); } ); } - has_electronic_controls = !get_parts_at( pos, "CTRL_ELECTRONIC", + has_electronic_controls = !get_parts_at( pos, flag_CTRL_ELECTRONIC, part_status_flag::any ).empty(); } - if( get_parts_at( pos, "CONTROLS", part_status_flag::any ).empty() && !has_electronic_controls ) { + if( get_parts_at( pos, flag_CONTROLS, part_status_flag::any ).empty() && + !has_electronic_controls ) { add_msg( m_info, _( "No controls there" ) ); return; } @@ -587,7 +588,7 @@ void vehicle::use_controls( const tripoint &pos ) return; } - if( has_part( "ENGINE" ) ) { + if( has_part( flag_ENGINE ) ) { if( g->u.controlling_vehicle || ( remote && engine_on ) ) { options.emplace_back( _( "Stop driving" ), keybind( "TOGGLE_ENGINE" ) ); actions.push_back( [&] { @@ -649,12 +650,12 @@ void vehicle::use_controls( const tripoint &pos ) } } - if( has_part( "HORN" ) ) { + if( has_part( flag_HORN ) ) { options.emplace_back( _( "Honk horn" ), keybind( "SOUND_HORN" ) ); actions.push_back( [&] { honk_horn(); refresh(); } ); } - if( has_part( "AUTOPILOT" ) && ( has_part( "CTRL_ELECTRONIC" ) || - has_part( "REMOTE_CONTROLS" ) ) ) { + if( has_part( flag_AUTOPILOT ) && ( has_part( flag_CTRL_ELECTRONIC ) || + has_part( flag_REMOTE_CONTROLS ) ) ) { options.emplace_back( _( "Control autopilot" ), keybind( "CONTROL_AUTOPILOT" ) ); actions.push_back( [&] { toggle_autopilot(); refresh(); } ); @@ -684,7 +685,7 @@ void vehicle::use_controls( const tripoint &pos ) actions.push_back( [&] { fold_up(); } ); } - if( has_part( "ENGINE" ) ) { + if( has_part( flag_ENGINE ) ) { options.emplace_back( _( "Control individual engines" ), keybind( "CONTROL_ENGINES" ) ); actions.push_back( [&] { control_engines(); refresh(); } ); } @@ -694,7 +695,7 @@ void vehicle::use_controls( const tripoint &pos ) options.emplace_back( _( "Try to disarm alarm." ), keybind( "TOGGLE_ALARM" ) ); actions.push_back( [&] { smash_security_system(); refresh(); } ); - } else if( has_electronic_controls && has_part( "SECURITY" ) ) { + } else if( has_electronic_controls && has_part( flag_SECURITY ) ) { options.emplace_back( _( "Trigger alarm" ), keybind( "TOGGLE_ALARM" ) ); actions.push_back( [&] { is_alarm_on = true; @@ -704,7 +705,7 @@ void vehicle::use_controls( const tripoint &pos ) } } - if( has_part( "TURRET" ) ) { + if( has_part( flag_TURRET ) ) { options.emplace_back( _( "Set turret targeting modes" ), keybind( "TURRET_TARGET_MODE" ) ); actions.push_back( [&] { turrets_set_targeting(); refresh(); } ); @@ -780,7 +781,7 @@ bool vehicle::fold_up() item bicycle( can_be_folded ? "generic_folded_vehicle" : "folding_bicycle", calendar::turn ); // Drop stuff in containers on ground - for( const vpart_reference &vp : get_any_parts( "CARGO" ) ) { + for( const vpart_reference &vp : get_any_parts( flag_CARGO ) ) { const size_t p = vp.part_index(); for( auto &elem : get_items( p ) ) { g->m.add_item_or_charges( g->u.pos(), elem ); @@ -1152,7 +1153,7 @@ void vehicle::beeper_sound() void vehicle::play_music() { - for( const vpart_reference &vp : get_enabled_parts( "STEREO" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_STEREO ) ) { iuse::play_music( g->u, vp.pos(), 15, 30 ); } } @@ -1163,7 +1164,7 @@ void vehicle::play_chimes() return; } - for( const vpart_reference &vp : get_enabled_parts( "CHIMES" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_CHIMES ) ) { sounds::sound( vp.pos(), 40, sounds::sound_t::music, _( "a simple melody blaring from the loudspeakers." ), false, "vehicle", "chimes" ); } @@ -1174,7 +1175,7 @@ void vehicle::crash_terrain_around() if( total_power_w() <= 0 ) { return; } - for( const vpart_reference &vp : get_enabled_parts( "CRASH_TERRAIN_AROUND" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_CRASH_TERRAIN_AROUND ) ) { tripoint crush_target( 0, 0, -OVERMAP_LAYERS ); const tripoint start_pos = vp.pos(); const transform_terrain_data &ttd = vp.info().transform_terrain; @@ -1205,7 +1206,7 @@ void vehicle::crash_terrain_around() void vehicle::transform_terrain() { - for( const vpart_reference &vp : get_enabled_parts( "TRANSFORM_TERRAIN" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_TRANSFORM_TERRAIN ) ) { const tripoint start_pos = vp.pos(); const transform_terrain_data &ttd = vp.info().transform_terrain; bool prereq_fulfilled = false; @@ -1240,7 +1241,7 @@ void vehicle::transform_terrain() void vehicle::operate_reaper() { - for( const vpart_reference &vp : get_enabled_parts( "REAPER" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_REAPER ) ) { const size_t reaper_id = vp.part_index(); const tripoint reaper_pos = vp.pos(); const int plant_produced = rng( 1, vp.info().bonus ); @@ -1267,7 +1268,7 @@ void vehicle::operate_reaper() } sounds::sound( reaper_pos, rng( 10, 25 ), sounds::sound_t::combat, _( "Swish" ), false, "vehicle", "reaper" ); - if( vp.has_feature( "CARGO" ) ) { + if( vp.has_feature( flag_CARGO ) ) { for( map_stack::iterator iter = items.begin(); iter != items.end(); ) { if( ( iter->volume() <= max_pickup_volume ) && add_item( reaper_id, *iter ) ) { @@ -1282,14 +1283,14 @@ void vehicle::operate_reaper() void vehicle::operate_planter() { - for( const vpart_reference &vp : get_enabled_parts( "PLANTER" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_PLANTER ) ) { const size_t planter_id = vp.part_index(); const tripoint loc = vp.pos(); vehicle_stack v = get_items( planter_id ); for( auto i = v.begin(); i != v.end(); i++ ) { if( i->is_seed() ) { // If it is an "advanced model" then it will avoid damaging itself or becoming damaged. It's a real feature. - if( g->m.ter( loc ) != t_dirtmound && vp.has_feature( "ADVANCED_PLANTER" ) ) { + if( g->m.ter( loc ) != t_dirtmound && vp.has_feature( flag_ADVANCED_PLANTER ) ) { //then don't put the item there. break; } else if( g->m.ter( loc ) == t_dirtmound ) { @@ -1319,7 +1320,7 @@ void vehicle::operate_planter() void vehicle::operate_scoop() { - for( const vpart_reference &vp : get_enabled_parts( "SCOOP" ) ) { + for( const vpart_reference &vp : get_enabled_parts( flag_SCOOP ) ) { const size_t scoop = vp.part_index(); const int chance_to_damage_item = 9; const units::volume max_pickup_volume = vp.info().size / 10; @@ -1842,43 +1843,45 @@ void vehicle::interact_with( const tripoint &pos, int interact_part ) auto turret = turret_query( pos ); - const int curtain_part = avail_part_with_feature( interact_part, "CURTAIN", true ); + const int curtain_part = avail_part_with_feature( interact_part, flag_CURTAIN, true ); const bool curtain_closed = ( curtain_part == -1 ) ? false : !parts[curtain_part].open; - const bool has_kitchen = avail_part_with_feature( interact_part, "KITCHEN", true ) >= 0; - const bool has_faucet = avail_part_with_feature( interact_part, "FAUCET", true ) >= 0; - const bool has_towel = avail_part_with_feature( interact_part, "TOWEL", true ) >= 0; - const bool has_weldrig = avail_part_with_feature( interact_part, "WELDRIG", true ) >= 0; - const bool has_chemlab = avail_part_with_feature( interact_part, "CHEMLAB", true ) >= 0; - const bool has_purify = avail_part_with_feature( interact_part, "WATER_PURIFIER", true ) >= 0; - const bool has_controls = avail_part_with_feature( interact_part, "CONTROLS", true ) >= 0; - const bool has_electronics = avail_part_with_feature( interact_part, "CTRL_ELECTRONIC", true ) >= 0; - const int cargo_part = part_with_feature( interact_part, "CARGO", false ); + const bool has_kitchen = avail_part_with_feature( interact_part, flag_KITCHEN, true ) >= 0; + const bool has_faucet = avail_part_with_feature( interact_part, flag_FAUCET, true ) >= 0; + const bool has_towel = avail_part_with_feature( interact_part, flag_TOWEL, true ) >= 0; + const bool has_weldrig = avail_part_with_feature( interact_part, flag_WELDRIG, true ) >= 0; + const bool has_chemlab = avail_part_with_feature( interact_part, flag_CHEMLAB, true ) >= 0; + const bool has_purify = avail_part_with_feature( interact_part, flag_WATER_PURIFIER, true ) >= 0; + const bool has_controls = avail_part_with_feature( interact_part, flag_CONTROLS, true ) >= 0; + const bool has_electronics = avail_part_with_feature( interact_part, flag_CTRL_ELECTRONIC, + true ) >= 0; + const int cargo_part = part_with_feature( interact_part, flag_CARGO, false ); const bool from_vehicle = cargo_part >= 0 && !get_items( cargo_part ).empty(); const bool can_be_folded = is_foldable(); const bool is_convertible = tags.count( "convertible" ) > 0; const bool remotely_controlled = g->remoteveh() == this; - const int autoclave_part = avail_part_with_feature( interact_part, "AUTOCLAVE", true ); + const int autoclave_part = avail_part_with_feature( interact_part, flag_AUTOCLAVE, true ); const bool has_autoclave = autoclave_part >= 0; bool autoclave_on = ( autoclave_part == -1 ) ? false : parts[autoclave_part].enabled; - const int washing_machine_part = avail_part_with_feature( interact_part, "WASHING_MACHINE", true ); + const int washing_machine_part = avail_part_with_feature( interact_part, flag_WASHING_MACHINE, + true ); const bool has_washmachine = washing_machine_part >= 0; bool washing_machine_on = ( washing_machine_part == -1 ) ? false : parts[washing_machine_part].enabled; - const int dishwasher_part = avail_part_with_feature( interact_part, "DISHWASHER", true ); + const int dishwasher_part = avail_part_with_feature( interact_part, flag_DISHWASHER, true ); const bool has_dishwasher = dishwasher_part >= 0; bool dishwasher_on = ( dishwasher_part == -1 ) ? false : parts[dishwasher_part].enabled; - const int monster_capture_part = avail_part_with_feature( interact_part, "CAPTURE_MONSTER_VEH", + const int monster_capture_part = avail_part_with_feature( interact_part, flag_CAPTURE_MONSTER_VEH, true ); const bool has_monster_capture = monster_capture_part >= 0; - const int bike_rack_part = avail_part_with_feature( interact_part, "BIKE_RACK_VEH", true ); - const int harness_part = avail_part_with_feature( interact_part, "ANIMAL_CTRL", true ); + const int bike_rack_part = avail_part_with_feature( interact_part, flag_BIKE_RACK_VEH, true ); + const int harness_part = avail_part_with_feature( interact_part, flag_ANIMAL_CTRL, true ); const bool has_harness = harness_part >= 0; const bool has_bike_rack = bike_rack_part >= 0; - const bool has_planter = avail_part_with_feature( interact_part, "PLANTER", true ) >= 0 || - avail_part_with_feature( interact_part, "ADVANCED_PLANTER", true ) >= 0; - const int workbench_part = avail_part_with_feature( interact_part, "WORKBENCH", true ); + const bool has_planter = avail_part_with_feature( interact_part, flag_PLANTER, true ) >= 0 || + avail_part_with_feature( interact_part, flag_ADVANCED_PLANTER, true ) >= 0; + const int workbench_part = avail_part_with_feature( interact_part, flag_WORKBENCH, true ); const bool has_workbench = workbench_part >= 0; enum { @@ -2055,7 +2058,7 @@ void vehicle::interact_with( const tripoint &pos, int interact_part ) act.coords.push_back( pos ); // Finally tell if it is the vehicle part with welding rig act.values.resize( 2 ); - act.values[1] = part_with_feature( interact_part, "WELDRIG", true ); + act.values[1] = part_with_feature( interact_part, flag_WELDRIG, true ); } } return; diff --git a/src/visitable.cpp b/src/visitable.cpp index 216e71e91941e..859c67936830a 100644 --- a/src/visitable.cpp +++ b/src/visitable.cpp @@ -465,7 +465,7 @@ VisitResponse visitable::visit_items( { auto self = static_cast( this ); - int idx = self->veh.part_with_feature( self->part, "CARGO", true ); + int idx = self->veh.part_with_feature( self->part, flag_CARGO, true ); if( idx >= 0 ) { for( auto &e : self->veh.get_items( idx ) ) { if( visit_internal( func, &e ) == VisitResponse::ABORT ) { @@ -715,7 +715,7 @@ std::list visitable::remove_items_with( const return res; } - int idx = cur->veh.part_with_feature( cur->part, "CARGO", false ); + int idx = cur->veh.part_with_feature( cur->part, flag_CARGO, false ); if( idx < 0 ) { return res; } diff --git a/tests/vehicle_test.cpp b/tests/vehicle_test.cpp index ee7e528450364..46b35022da6b2 100644 --- a/tests/vehicle_test.cpp +++ b/tests/vehicle_test.cpp @@ -10,6 +10,7 @@ #include "enums.h" #include "type_id.h" #include "point.h" +#include "cata_string_consts.h" TEST_CASE( "detaching_vehicle_unboards_passengers" ) { @@ -55,7 +56,7 @@ TEST_CASE( "add_item_to_broken_vehicle_part" ) REQUIRE( veh_ptr != nullptr ); const tripoint pos = vehicle_origin + tripoint_west; - auto cargo_parts = veh_ptr->get_parts_at( pos, "CARGO", part_status_flag::any ); + auto cargo_parts = veh_ptr->get_parts_at( pos, flag_CARGO, part_status_flag::any ); REQUIRE( !cargo_parts.empty( ) ); vehicle_part *cargo_part = cargo_parts.front(); REQUIRE( cargo_part != nullptr ); diff --git a/tests/visitable_remove_test.cpp b/tests/visitable_remove_test.cpp index 2b8fce5a50d07..abd7bc2624602 100644 --- a/tests/visitable_remove_test.cpp +++ b/tests/visitable_remove_test.cpp @@ -22,6 +22,7 @@ #include "optional.h" #include "type_id.h" #include "point.h" +#include "cata_string_consts.h" template static int count_items( const T &src, const itype_id &id ) @@ -416,7 +417,7 @@ TEST_CASE( "visitable_remove", "[visitable]" ) return static_cast( g->m.veh_at( e ) ); } ) == 1 ); - const cata::optional vp = g->m.veh_at( veh ).part_with_feature( "CARGO", true ); + const cata::optional vp = g->m.veh_at( veh ).part_with_feature( flag_CARGO, true ); REQUIRE( vp ); vehicle *const v = &vp->vehicle(); const int part = vp->part_index(); From 4e3f9e114809a22e66634640d2009a4dc57b6a6c Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sun, 23 Feb 2020 12:34:13 -0500 Subject: [PATCH 25/56] fix spelling error (#38231) --- data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json | 2 +- data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json | 4 ++-- data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json index 2057b0d5855e5..479afcc5931d7 100644 --- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json @@ -59,7 +59,7 @@ "condition": { "u_is_wearing": "badge_marshal" } }, { - "text": "Hi, looks like you are building a forage setup.", + "text": "Hi, looks like you are building a forge setup.", "topic": "TALK_ISHERWOOD_CARLOS_TALK1", "effect": { "u_add_var": "u_met_carlos_isherwood", "type": "general", "context": "meeting", "value": "yes" } }, diff --git a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json index 9cc39feab88af..3e3cf878fd831 100644 --- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json @@ -164,8 +164,8 @@ { "type": "talk_topic", "id": "TALK_EDDIE_CARLOS", - "dynamic_line": "Carlos will be in his workshop if he isn't out hunting. He is trying to get a forage set up.", - "speaker_effect": { "effect": { "u_add_var": "u_learned_about_forage", "type": "general", "context": "meeting", "value": "yes" } }, + "dynamic_line": "Carlos will be in his workshop if he isn't out hunting. He is trying to get a forge set up.", + "speaker_effect": { "effect": { "u_add_var": "u_learned_about_forge", "type": "general", "context": "meeting", "value": "yes" } }, "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_EDDIE_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } diff --git a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json index c934bed3d7820..65142463fc41a 100644 --- a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json @@ -155,7 +155,7 @@ { "type": "talk_topic", "id": "TALK_JESSE_CARLOS", - "dynamic_line": "Carlos will be in his workshop if he isn't out hunting. He is trying to get a forage set up.", + "dynamic_line": "Carlos will be in his workshop if he isn't out hunting. He is trying to get a forge set up.", "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JESSE_TOPICS" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } From 087338b53ed3552590e1dcc73ba2b057a8ba937b Mon Sep 17 00:00:00 2001 From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com> Date: Sun, 23 Feb 2020 09:36:07 -0800 Subject: [PATCH 26/56] item_groups penultimate (#38240) item_groups sorting --- data/json/itemgroups/art_antiques_crafts.json | 270 +++++++++ data/json/itemgroups/drugs.json | 5 + data/json/itemgroups/electronics.json | 11 + data/json/itemgroups/item_groups.json | 550 ------------------ data/json/itemgroups/misc.json | 24 + data/json/itemgroups/monster_drops_lairs.json | 10 + data/json/itemgroups/trash_and_debris.json | 174 ++++++ data/json/itemgroups/weapons_misc.json | 62 ++ 8 files changed, 556 insertions(+), 550 deletions(-) create mode 100644 data/json/itemgroups/art_antiques_crafts.json create mode 100644 data/json/itemgroups/trash_and_debris.json create mode 100644 data/json/itemgroups/weapons_misc.json diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json new file mode 100644 index 0000000000000..fe97e08571c3e --- /dev/null +++ b/data/json/itemgroups/art_antiques_crafts.json @@ -0,0 +1,270 @@ +[ + { + "type": "item_group", + "id": "art", + "items": [ + [ "petrified_eye", 1 ], + [ "spiral_stone", 20 ], + [ "cane", 10 ], + [ "candlestick", 20 ], + { "group": "tinware", "prob": 5 }, + [ "heels", 50 ], + [ "coat_fur_sf", 1 ], + [ "tricorne", 3 ], + [ "gold_bracelet", 8 ], + [ "gold_necklace", 8 ], + [ "gold_locket", 3 ], + [ "gold_ring", 8 ], + [ "gold_ear", 8 ], + [ "pearl_collar", 1 ], + [ "diamond_ring", 1 ], + [ "copper_bracelet", 1 ], + [ "copper_necklace", 1 ], + [ "copper_locket", 1 ], + [ "copper_ring", 1 ], + [ "copper_ear", 1 ], + [ "silver_bracelet", 10 ], + [ "silver_necklace", 10 ], + [ "silver_locket", 4 ], + [ "silver_ring", 10 ], + [ "silver_ear", 10 ], + [ "bead_ear", 10 ], + [ "jade_brooch", 2 ], + [ "diamond", 1 ], + [ "manual_dodge", 1 ], + [ "fancy_sunglasses", 2 ], + [ "pocketwatch", 5 ], + [ "well_pump", 1 ], + [ "nodachi", 1 ], + [ "katana", 2 ], + [ "rapier", 3 ], + [ "cavalry_sabre", 2 ], + [ "sf_watch", 5 ], + [ "platinum_watch", 1 ], + [ "ring_signet", 1 ], + [ "magic_8_ball", 1 ], + [ "coin_quarter", 1 ] + ] + }, + { + "type": "item_group", + "id": "medieval", + "items": [ + [ "katana", 2 ], + [ "katana_inferior", 2 ], + [ "cestus", 2 ], + [ "mace", 20 ], + [ "mace_inferior", 25 ], + [ "morningstar", 10 ], + [ "morningstar_inferior", 15 ], + [ "glaive", 10 ], + [ "rapier", 3 ], + [ "cavalry_sabre", 3 ], + [ "estoc", 3 ], + [ "estoc_inferior", 3 ], + [ "cutlass", 3 ], + [ "cutlass_inferior", 3 ], + [ "scimitar", 20 ], + [ "scimitar_inferior", 25 ], + [ "arming_sword", 25 ], + [ "arming_sword_inferior", 25 ], + [ "broadsword", 30 ], + [ "broadsword_inferior", 30 ], + [ "longsword", 25 ], + [ "longsword_inferior", 25 ], + [ "zweihander", 20 ], + [ "zweihander_inferior", 20 ], + [ "battleaxe", 20 ], + [ "battleaxe_inferior", 20 ], + [ "warhammer", 10 ], + [ "halberd", 5 ], + [ "lucern_hammer", 3 ], + [ "lucern_hammerfake", 5 ], + [ "pike", 5 ], + [ "pike_inferior", 10 ], + [ "spear_steel", 5 ], + [ "shillelagh", 3 ], + [ "shillelagh_weighted", 2 ], + [ "helmet_plate", 1 ], + [ "armor_plate", 2 ], + [ "huge_crossbow", 2 ], + [ "quiver", 2 ], + [ "quiver_large", 1 ], + [ "baldric", 4 ], + [ "nodachi", 1 ], + [ "nodachi_inferior", 2 ], + [ "gambeson", 3 ], + [ "tunic", 1 ], + [ "armor_lamellar", 2 ], + [ "armor_lightplate", 1 ], + [ "cuirass_lightplate", 2 ], + [ "armguard_lightplate", 1 ], + [ "legguard_lightplate", 1 ], + [ "armor_samurai", 1 ], + [ "helmet_kabuto", 1 ], + [ "gloves_plate", 1 ], + [ "boots_plate", 1 ], + [ "helmet_barbute", 1 ], + [ "helmet_conical", 1 ], + [ "helmet_galea", 1 ], + [ "helmet_nasal", 1 ], + [ "chainmail_suit", 1 ], + [ "chainmail_hood", 3 ], + [ "chainmail_vest", 3 ], + [ "chainmail_arms", 3 ], + [ "chainmail_legs", 3 ], + [ "chainmail_feet", 3 ], + [ "chainmail_hands", 3 ], + [ "legguard_metal", 1 ], + [ "textbook_weapwest", 5 ], + [ "textbook_weapeast", 5 ], + [ "textbook_armwest", 5 ], + [ "textbook_armeast", 5 ], + [ "textbook_armschina", 5 ], + [ "q_staff", 10 ], + [ "i_staff", 5 ], + [ "sword_bayonet", 10 ], + [ "bagh_nakha", 5 ], + [ "kris", 5 ], + [ "cheese_hard", 1 ], + [ "tinderbox", 4 ], + [ "flint_steel", 7 ], + [ "canteen_wood", 5 ], + [ "apron_leather", 1 ], + [ "pot_copper", 3 ], + { "group": "tinware", "prob": 10 } + ] + }, + { + "type": "item_group", + "id": "antique", + "ammo": 75, + "magazine": 100, + "items": [ + [ "oxylamp", 50 ], + [ "cow_bell", 15 ], + [ "sickle", 2 ], + [ "scythe", 2 ], + [ "hollow_cane", 2 ], + [ "sword_cane", 2 ], + [ "pipe_tobacco", 10 ], + [ "talking_doll", 10 ], + [ "brazier", 12 ], + [ "candle", 10 ], + [ "alarmclock", 10 ], + [ "golf_club", 10 ], + [ "pocketwatch", 8 ], + [ "cane", 12 ], + [ "bat", 8 ], + [ "football", 12 ], + [ "baseball", 12 ], + [ "glass_plate", 15 ], + [ "glass_bowl", 15 ], + [ "glass", 15 ], + [ "ceramic_cup", 15 ], + [ "ceramic_bowl", 15 ], + [ "ceramic_plate", 15 ], + { "group": "tinware", "prob": 25 }, + [ "bowling_ball", 12 ], + [ "spiral_stone", 1 ], + [ "petrified_eye", 1 ], + [ "teapot", 15 ], + [ "briefcase", 10 ], + [ "gold_watch", 5 ], + [ "silver_watch", 10 ], + [ "jade_brooch", 12 ], + [ "silver_locket", 8 ], + [ "gold_locket", 4 ], + [ "ring_signet", 4 ], + [ "ring_engagement", 2 ], + [ "ring_wedding", 1 ], + [ "pistol_flintlock", 4 ], + [ "carbine_flintlock", 4 ], + [ "rifle_flintlock", 4 ], + [ "boxing_gloves", 12 ], + [ "straw_doll", 1 ], + [ "pitchfork", 1 ], + [ "straw_sandals", 1 ], + [ "holy_symbol", 10 ], + [ "magic_8_ball", 1 ], + [ "coin_quarter", 1 ], + [ "bronze_medal", 1 ], + [ "silver_medal", 1 ], + [ "gold_medal", 1 ] + ] + }, + { + "type": "item_group", + "id": "antique_rare", + "items": [ + [ "trex_gun", 4 ], + [ "spiral_stone", 2 ], + [ "cutlass", 2 ], + [ "broadsword", 2 ], + [ "nodachi", 2 ], + [ "zweihander", 2 ], + [ "longsword", 2 ], + [ "katana", 2 ], + [ "kris", 2 ], + [ "rapier", 2 ], + [ "cavalry_sabre", 2 ], + [ "glaive", 2 ], + [ "naginata", 2 ], + [ "naginata_fake", 2 ], + [ "naginata_inferior", 3 ], + [ "estoc", 2 ], + [ "estoc_fake", 6 ], + [ "qiang", 3 ], + [ "halberd", 2 ], + [ "halberd_fake", 7 ], + [ "lucern_hammer", 2 ], + [ "lucern_hammerfake", 7 ], + [ "katana_fake", 4 ], + [ "katana_inferior", 8 ], + [ "zweihander_fake", 4 ], + [ "zweihander_inferior", 8 ], + [ "cutlass_fake", 4 ], + [ "cutlass_inferior", 8 ], + [ "jian", 2 ], + [ "jian_fake", 4 ], + [ "jian_inferior", 8 ], + [ "scimitar", 4 ], + [ "scimitar_fake", 8 ], + [ "arming_sword", 4 ], + [ "arming_sword_fake", 8 ], + [ "broadsword_fake", 4 ], + [ "broadsword_inferior", 8 ], + [ "longsword_fake", 4 ], + [ "longsword_inferior", 8 ], + [ "rapier_fake", 4 ], + [ "cavalry_sabre_fake", 4 ], + [ "wakizashi_fake", 4 ], + [ "wakizashi_inferior", 8 ], + [ "kris_fake", 8 ], + [ "pistol_flintlock", 4 ], + [ "carbine_flintlock", 4 ], + [ "rifle_flintlock", 4 ], + [ "petrified_eye", 2 ], + [ "ji", 1 ], + [ "dao", 3 ], + [ "sword_xiphos", 4 ], + [ "khopesh", 4 ], + [ "spear_dory", 3 ] + ] + }, + { + "id": "pottery", + "type": "item_group", + "items": [ + [ "bowl_clay", 10 ], + [ "clay_canister", 15 ], + [ "clay_hydria", 10 ], + [ "clay_watercont", 10 ], + [ "jug_clay", 15 ], + [ "ceramic_plate", 15 ], + [ "ceramic_bowl", 15 ], + [ "ceramic_cup", 15 ], + [ "jug_clay", 15 ] + ] + } +] diff --git a/data/json/itemgroups/drugs.json b/data/json/itemgroups/drugs.json index 865427188fcbf..038e054ecb350 100644 --- a/data/json/itemgroups/drugs.json +++ b/data/json/itemgroups/drugs.json @@ -147,5 +147,10 @@ [ "flu_shot", 5 ], [ "syringe", 8 ] ] + }, + { + "type": "item_group", + "id": "meth_ingredients", + "items": [ [ "dayquil", 2 ], [ "aspirin", 40 ], [ "adderall", 5 ], [ "energy_drink", 2 ], [ "caffeine", 20 ] ] } ] diff --git a/data/json/itemgroups/electronics.json b/data/json/itemgroups/electronics.json index 0beed9d1f863b..d6d6122259d8c 100644 --- a/data/json/itemgroups/electronics.json +++ b/data/json/itemgroups/electronics.json @@ -101,5 +101,16 @@ [ "l-stick", 1 ], [ "reading_light", 6 ] ] + }, + { + "type": "item_group", + "subtype": "distribution", + "id": "phones", + "items": [ + { "item": "cell_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, + { "item": "cell_phone", "prob": 1, "charges-min": 150, "charges-max": 150 }, + { "item": "smart_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, + { "item": "smart_phone", "prob": 1, "charges-min": 130, "charges-max": 130 } + ] } ] diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 32fc78ef60dff..e424787c33ada 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -10,301 +10,6 @@ [ "beekeeping_gloves", 5 ] ] }, - { - "type": "item_group", - "id": "trash", - "ammo": 20, - "magazine": 50, - "items": [ - [ "plastic_shopping_bag", 35 ], - [ "iodine", 5 ], - [ "prussian_blue", 5 ], - [ "bum_wine", 5 ], - [ "meth", 2 ], - [ "heroin", 1 ], - [ "wrapper", 50 ], - [ "fp_loyalty_card", 5 ], - [ "string_6", 2 ], - [ "chain", 20 ], - [ "glass_sheet", 5 ], - { "item": "glass_shard", "prob": 20, "count": [ 1, 8 ] }, - [ "ceramic_shard", 15 ], - [ "stick", 95 ], - [ "seed_wheat", 5 ], - [ "seed_tomato", 5 ], - [ "seed_weed", 5 ], - [ "seed_flower", 5 ], - [ "seed_tobacco", 1 ], - [ "joint_roach", 5 ], - [ "pipe", 20 ], - [ "bag_plastic", 10 ], - [ "bottle_plastic", 10 ], - [ "bottle_plastic_small", 5 ], - [ "bag_canvas", 5 ], - [ "bag_canvas_small", 5 ], - [ "bottle_glass", 10 ], - [ "can_drink_unsealed", 10 ], - [ "can_food_unsealed", 10 ], - [ "box_small", 10 ], - [ "bubblewrap", 50 ], - [ "cig_butt", 30 ], - { "item": "lighter", "prob": 60, "charges-min": 0, "charges-max": 10 }, - { "item": "matches", "prob": 60, "charges-min": 0, "charges-max": 20 }, - [ "syringe", 8 ], - [ "tinder", 1 ], - [ "rag", 1 ], - [ "hairpin", 1 ], - [ "kevlar_plate", 1 ], - [ "ceramic_armor", 1 ], - [ "leather", 1 ], - [ "software_hacking", 10 ], - [ "news_regional", 8 ], - [ "file", 5 ], - [ "decoy_elfa", 10 ], - [ "recipe_elfa", 1 ], - [ "jug_plastic", 10 ], - [ "spray_can", 50 ], - [ "jar_glass", 10 ], - [ "jar_3l_glass", 8 ], - [ "flyer", 10 ], - [ "scorecard", 10 ], - [ "talking_doll", 60 ], - [ "marble", 65 ], - [ "handflare_dead", 3 ], - [ "creepy_doll", 1 ], - [ "straw_doll", 1 ], - [ "striped_shirt", 1 ], - [ "striped_pants", 1 ], - [ "foodperson_mask", 1 ], - [ "razor_blade", 10 ], - [ "survnote", 5 ], - [ "eclipse_glasses", 1 ], - [ "plastic_sheet", 5 ], - [ "balloon", 5 ], - [ "box_medium", 15 ], - [ "thermos", 30 ], - { "group": "tinware", "prob": 15 } - ] - }, - { - "type": "item_group", - "id": "trash_cart", - "items": [ - [ "bottle_plastic", 5 ], - [ "bottle_plastic_small", 15 ], - [ "bottle_glass", 2 ], - { "group": "tinware", "prob": 2 }, - [ "can_drink_unsealed", 5 ], - [ "plastic_shopping_bag", 13 ], - [ "bag_plastic", 15 ], - [ "wrapper", 30 ], - [ "flyer", 15 ], - [ "scorecard", 10 ], - [ "eclipse_glasses", 1 ], - [ "plastic_sheet", 5 ] - ] - }, - { - "type": "item_group", - "id": "art", - "items": [ - [ "petrified_eye", 1 ], - [ "spiral_stone", 20 ], - [ "cane", 10 ], - [ "candlestick", 20 ], - { "group": "tinware", "prob": 5 }, - [ "heels", 50 ], - [ "coat_fur_sf", 1 ], - [ "tricorne", 3 ], - [ "gold_bracelet", 8 ], - [ "gold_necklace", 8 ], - [ "gold_locket", 3 ], - [ "gold_ring", 8 ], - [ "gold_ear", 8 ], - [ "pearl_collar", 1 ], - [ "diamond_ring", 1 ], - [ "copper_bracelet", 1 ], - [ "copper_necklace", 1 ], - [ "copper_locket", 1 ], - [ "copper_ring", 1 ], - [ "copper_ear", 1 ], - [ "silver_bracelet", 10 ], - [ "silver_necklace", 10 ], - [ "silver_locket", 4 ], - [ "silver_ring", 10 ], - [ "silver_ear", 10 ], - [ "bead_ear", 10 ], - [ "jade_brooch", 2 ], - [ "diamond", 1 ], - [ "manual_dodge", 1 ], - [ "fancy_sunglasses", 2 ], - [ "pocketwatch", 5 ], - [ "well_pump", 1 ], - [ "nodachi", 1 ], - [ "katana", 2 ], - [ "rapier", 3 ], - [ "cavalry_sabre", 2 ], - [ "sf_watch", 5 ], - [ "platinum_watch", 1 ], - [ "ring_signet", 1 ], - [ "magic_8_ball", 1 ], - [ "coin_quarter", 1 ] - ] - }, - { - "type": "item_group", - "id": "medieval", - "items": [ - [ "katana", 2 ], - [ "katana_inferior", 2 ], - [ "cestus", 2 ], - [ "mace", 20 ], - [ "mace_inferior", 25 ], - [ "morningstar", 10 ], - [ "morningstar_inferior", 15 ], - [ "glaive", 10 ], - [ "rapier", 3 ], - [ "cavalry_sabre", 3 ], - [ "estoc", 3 ], - [ "estoc_inferior", 3 ], - [ "cutlass", 3 ], - [ "cutlass_inferior", 3 ], - [ "scimitar", 20 ], - [ "scimitar_inferior", 25 ], - [ "arming_sword", 25 ], - [ "arming_sword_inferior", 25 ], - [ "broadsword", 30 ], - [ "broadsword_inferior", 30 ], - [ "longsword", 25 ], - [ "longsword_inferior", 25 ], - [ "zweihander", 20 ], - [ "zweihander_inferior", 20 ], - [ "battleaxe", 20 ], - [ "battleaxe_inferior", 20 ], - [ "warhammer", 10 ], - [ "halberd", 5 ], - [ "lucern_hammer", 3 ], - [ "lucern_hammerfake", 5 ], - [ "pike", 5 ], - [ "pike_inferior", 10 ], - [ "spear_steel", 5 ], - [ "shillelagh", 3 ], - [ "shillelagh_weighted", 2 ], - [ "helmet_plate", 1 ], - [ "armor_plate", 2 ], - [ "huge_crossbow", 2 ], - [ "quiver", 2 ], - [ "quiver_large", 1 ], - [ "baldric", 4 ], - [ "nodachi", 1 ], - [ "nodachi_inferior", 2 ], - [ "gambeson", 3 ], - [ "tunic", 1 ], - [ "armor_lamellar", 2 ], - [ "armor_lightplate", 1 ], - [ "cuirass_lightplate", 2 ], - [ "armguard_lightplate", 1 ], - [ "legguard_lightplate", 1 ], - [ "armor_samurai", 1 ], - [ "helmet_kabuto", 1 ], - [ "gloves_plate", 1 ], - [ "boots_plate", 1 ], - [ "helmet_barbute", 1 ], - [ "helmet_conical", 1 ], - [ "helmet_galea", 1 ], - [ "helmet_nasal", 1 ], - [ "chainmail_suit", 1 ], - [ "chainmail_hood", 3 ], - [ "chainmail_vest", 3 ], - [ "chainmail_arms", 3 ], - [ "chainmail_legs", 3 ], - [ "chainmail_feet", 3 ], - [ "chainmail_hands", 3 ], - [ "legguard_metal", 1 ], - [ "textbook_weapwest", 5 ], - [ "textbook_weapeast", 5 ], - [ "textbook_armwest", 5 ], - [ "textbook_armeast", 5 ], - [ "textbook_armschina", 5 ], - [ "q_staff", 10 ], - [ "i_staff", 5 ], - [ "sword_bayonet", 10 ], - [ "bagh_nakha", 5 ], - [ "kris", 5 ], - [ "cheese_hard", 1 ], - [ "tinderbox", 4 ], - [ "flint_steel", 7 ], - [ "canteen_wood", 5 ], - [ "apron_leather", 1 ], - [ "pot_copper", 3 ], - { "group": "tinware", "prob": 10 } - ] - }, - { - "type": "item_group", - "id": "grenades", - "items": [ - [ "grenade", 30 ], - [ "grenade_inc", 30 ], - [ "flashbang", 30 ], - [ "EMPbomb", 20 ], - [ "grenade_emp", 5 ], - [ "gasbomb", 15 ], - [ "gasbomb_makeshift", 15 ], - [ "smokebomb", 50 ], - [ "dynamite", 50 ], - [ "mininuke", 5 ], - [ "c4", 50 ] - ] - }, - { - "type": "item_group", - "id": "weapons", - "items": [ - [ "chain", 20 ], - [ "knuckle_brass", 20 ], - [ "hammer", 35 ], - [ "wrench", 30 ], - [ "hammer_sledge", 4 ], - [ "hammer_sledge_short", 2 ], - [ "hatchet", 10 ], - [ "ax", 8 ], - [ "knife_combat", 14 ], - [ "kukri", 2 ], - [ "knife_hunting", 4 ], - [ "knife_rambo", 8 ], - [ "knife_rm42", 2 ], - [ "throwing_knife", 7 ], - [ "throwing_axe", 6 ], - [ "punch_dagger", 6 ], - [ "pipe", 20 ], - [ "bat", 60 ], - [ "bullwhip", 10 ], - [ "machete", 5 ], - [ "baton", 8 ], - [ "blackjack", 10 ], - [ "tazer", 3 ], - [ "rapier", 3 ], - [ "cavalry_sabre", 2 ], - [ "bat_metal", 60 ], - [ "e_tool", 2 ], - [ "knife_trench", 7 ], - [ "switchblade", 4 ], - [ "tonfa", 10 ], - [ "tonfa_wood", 10 ], - [ "shocktonfa_off", 5 ], - [ "tanto", 7 ], - [ "wakizashi", 3 ], - [ "nodachi", 1 ], - [ "katana", 2 ], - [ "survnote", 1 ] - ] - }, - { - "type": "item_group", - "id": "spiral", - "items": [ [ "spiral_stone", 20 ], [ "vortex_stone", 2 ] ] - }, { "type": "item_group", "id": "radio", @@ -511,22 +216,6 @@ [ "lsd", 6 ] ] }, - { - "type": "item_group", - "id": "wreckage", - "items": [ - [ "chain", 20 ], - [ "steel_chunk", 30 ], - [ "spring", 50 ], - [ "steel_lump", 30 ], - [ "frame", 20 ], - [ "hdframe", 20 ], - [ "cu_pipe", 25 ], - [ "scrap_copper", 50 ], - [ "rock", 40 ], - [ "survnote", 1 ] - ] - }, { "type": "item_group", "id": "moonshine_brew", @@ -541,235 +230,6 @@ [ "chem_ethanol", 5 ] ] }, - { - "type": "item_group", - "id": "cow", - "items": [ [ "cow_bell", 1 ] ] - }, - { - "type": "item_group", - "id": "dog_cop", - "items": [ [ "kevlar_harness", 1 ] ] - }, - { - "type": "item_group", - "id": "tobacco_products", - "items": [ - [ "cig", 60 ], - [ "tobacco", 20 ], - [ "chaw", 20 ], - [ "cigar", 10 ], - [ "ecig", 10 ], - [ "advanced_ecig", 8 ], - [ "nicotine_liquid", 15 ], - [ "pipe_tobacco", 10 ] - ] - }, - { - "type": "item_group", - "id": "trash_forest", - "items": [ - { "group": "ammo_casings", "prob": 3 }, - [ "rock", 5 ], - [ "ceramic_shard", 5 ], - [ "stick", 5 ], - [ "pine_bough", 2 ], - [ "hickory_root", 2 ], - [ "hickory_nut", 3 ], - [ "acorns", 2 ], - [ "pinecone", 3 ], - [ "flyer", 1 ], - [ "fp_loyalty_card", 1 ], - [ "one_year_old_newspaper", 1 ], - [ "months_old_newspaper", 2 ], - [ "weeks_old_newspaper", 3 ], - [ "newest_newspaper", 4 ], - [ "bag_plastic", 3 ], - [ "bottle_plastic", 2 ], - [ "bottle_plastic_small", 1 ], - [ "bag_canvas", 1 ], - [ "bag_canvas_small", 1 ], - [ "cup_plastic_unsealed", 3 ], - [ "bottle_glass", 1 ], - { "group": "tinware", "prob": 3 }, - [ "can_drink_unsealed", 2 ], - [ "can_food_unsealed", 1 ], - [ "box_small", 5 ], - [ "box_medium", 3 ], - [ "box_large", 1 ], - [ "plastic_sheet", 1 ], - [ "jug_plastic", 1 ], - [ "jar_glass", 2 ], - [ "jar_3l_glass", 1 ], - [ "wrapper", 3 ], - { "item": "withered", "prob": 5, "count-min": 1, "count-max": 10 }, - [ "straw_pile", 5 ], - [ "tinder", 1 ], - { "item": "plant_fibre", "prob": 2, "count-min": 1, "count-max": 10 }, - [ "string_6", 1 ], - [ "cig_butt", 4 ], - [ "string_36", 1 ], - [ "steel_lump", 1 ], - [ "steel_chunk", 1 ], - { "item": "scrap", "prob": 2, "count-min": 1, "count-max": 10 }, - { "item": "glass_shard", "prob": 3, "count-min": 8, "count-max": 84 }, - { "item": "feather", "prob": 5, "count-min": 5, "count-max": 10 }, - [ "wire", 1 ], - [ "wire_barbed", 1 ], - [ "splinter", 3 ], - [ "rag", 2 ], - [ "rag_bloody", 1 ], - [ "bone", 2 ], - [ "syringe", 1 ], - [ "spike", 1 ], - [ "tanbark", 2 ], - [ "thermos", 1 ], - [ "bag_body_bag", 1 ] - ] - }, - { - "type": "item_group", - "id": "antique", - "ammo": 75, - "magazine": 100, - "items": [ - [ "oxylamp", 50 ], - [ "cow_bell", 15 ], - [ "sickle", 2 ], - [ "scythe", 2 ], - [ "hollow_cane", 2 ], - [ "sword_cane", 2 ], - [ "pipe_tobacco", 10 ], - [ "talking_doll", 10 ], - [ "brazier", 12 ], - [ "candle", 10 ], - [ "alarmclock", 10 ], - [ "golf_club", 10 ], - [ "pocketwatch", 8 ], - [ "cane", 12 ], - [ "bat", 8 ], - [ "football", 12 ], - [ "baseball", 12 ], - [ "glass_plate", 15 ], - [ "glass_bowl", 15 ], - [ "glass", 15 ], - [ "ceramic_cup", 15 ], - [ "ceramic_bowl", 15 ], - [ "ceramic_plate", 15 ], - { "group": "tinware", "prob": 25 }, - [ "bowling_ball", 12 ], - [ "spiral_stone", 1 ], - [ "petrified_eye", 1 ], - [ "teapot", 15 ], - [ "briefcase", 10 ], - [ "gold_watch", 5 ], - [ "silver_watch", 10 ], - [ "jade_brooch", 12 ], - [ "silver_locket", 8 ], - [ "gold_locket", 4 ], - [ "ring_signet", 4 ], - [ "ring_engagement", 2 ], - [ "ring_wedding", 1 ], - [ "pistol_flintlock", 4 ], - [ "carbine_flintlock", 4 ], - [ "rifle_flintlock", 4 ], - [ "boxing_gloves", 12 ], - [ "straw_doll", 1 ], - [ "pitchfork", 1 ], - [ "straw_sandals", 1 ], - [ "holy_symbol", 10 ], - [ "magic_8_ball", 1 ], - [ "coin_quarter", 1 ], - [ "bronze_medal", 1 ], - [ "silver_medal", 1 ], - [ "gold_medal", 1 ] - ] - }, - { - "type": "item_group", - "id": "antique_rare", - "items": [ - [ "trex_gun", 4 ], - [ "spiral_stone", 2 ], - [ "cutlass", 2 ], - [ "broadsword", 2 ], - [ "nodachi", 2 ], - [ "zweihander", 2 ], - [ "longsword", 2 ], - [ "katana", 2 ], - [ "kris", 2 ], - [ "rapier", 2 ], - [ "cavalry_sabre", 2 ], - [ "glaive", 2 ], - [ "naginata", 2 ], - [ "naginata_fake", 2 ], - [ "naginata_inferior", 3 ], - [ "estoc", 2 ], - [ "estoc_fake", 6 ], - [ "qiang", 3 ], - [ "halberd", 2 ], - [ "halberd_fake", 7 ], - [ "lucern_hammer", 2 ], - [ "lucern_hammerfake", 7 ], - [ "katana_fake", 4 ], - [ "katana_inferior", 8 ], - [ "zweihander_fake", 4 ], - [ "zweihander_inferior", 8 ], - [ "cutlass_fake", 4 ], - [ "cutlass_inferior", 8 ], - [ "jian", 2 ], - [ "jian_fake", 4 ], - [ "jian_inferior", 8 ], - [ "scimitar", 4 ], - [ "scimitar_fake", 8 ], - [ "arming_sword", 4 ], - [ "arming_sword_fake", 8 ], - [ "broadsword_fake", 4 ], - [ "broadsword_inferior", 8 ], - [ "longsword_fake", 4 ], - [ "longsword_inferior", 8 ], - [ "rapier_fake", 4 ], - [ "cavalry_sabre_fake", 4 ], - [ "wakizashi_fake", 4 ], - [ "wakizashi_inferior", 8 ], - [ "kris_fake", 8 ], - [ "pistol_flintlock", 4 ], - [ "carbine_flintlock", 4 ], - [ "rifle_flintlock", 4 ], - [ "petrified_eye", 2 ], - [ "ji", 1 ], - [ "dao", 3 ], - [ "sword_xiphos", 4 ], - [ "khopesh", 4 ], - [ "spear_dory", 3 ] - ] - }, - { - "type": "item_group", - "subtype": "distribution", - "id": "phones", - "items": [ - { "item": "cell_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, - { "item": "cell_phone", "prob": 1, "charges-min": 150, "charges-max": 150 }, - { "item": "smart_phone", "prob": 9, "charges-min": 0, "charges-max": 15 }, - { "item": "smart_phone", "prob": 1, "charges-min": 130, "charges-max": 130 } - ] - }, - { - "id": "pottery", - "type": "item_group", - "items": [ - [ "bowl_clay", 10 ], - [ "clay_canister", 15 ], - [ "clay_hydria", 10 ], - [ "clay_watercont", 10 ], - [ "jug_clay", 15 ], - [ "ceramic_plate", 15 ], - [ "ceramic_bowl", 15 ], - [ "ceramic_cup", 15 ], - [ "jug_clay", 15 ] - ] - }, { "type": "item_group", "id": "roof_holdout", @@ -854,15 +314,5 @@ [ "golf_ball", 20 ], { "group": "alcohol_bottled_canned", "prob": 343 } ] - }, - { - "type": "item_group", - "id": "maps", - "items": [ { "item": "roadmap", "prob": 33 }, { "item": "touristmap", "prob": 33 }, { "item": "survivormap", "prob": 33 } ] - }, - { - "type": "item_group", - "id": "meth_ingredients", - "items": [ [ "dayquil", 2 ], [ "aspirin", 40 ], [ "adderall", 5 ], [ "energy_drink", 2 ], [ "caffeine", 20 ] ] } ] diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 7a6f43da0627c..5f0d7676bc50d 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -148,5 +148,29 @@ "type": "item_group", "//": "Horse vehicle items", "items": [ [ "horse_tack", 50 ], [ "yoke_harness", 50 ], [ "reins_tackle", 50 ] ] + }, + { + "type": "item_group", + "id": "maps", + "items": [ { "item": "roadmap", "prob": 33 }, { "item": "touristmap", "prob": 33 }, { "item": "survivormap", "prob": 33 } ] + }, + { + "type": "item_group", + "id": "tobacco_products", + "items": [ + [ "cig", 60 ], + [ "tobacco", 20 ], + [ "chaw", 20 ], + [ "cigar", 10 ], + [ "ecig", 10 ], + [ "advanced_ecig", 8 ], + [ "nicotine_liquid", 15 ], + [ "pipe_tobacco", 10 ] + ] + }, + { + "type": "item_group", + "id": "spiral", + "items": [ [ "spiral_stone", 20 ], [ "vortex_stone", 2 ] ] } ] diff --git a/data/json/itemgroups/monster_drops_lairs.json b/data/json/itemgroups/monster_drops_lairs.json index 12e93d8632047..a8716a32a77e9 100644 --- a/data/json/itemgroups/monster_drops_lairs.json +++ b/data/json/itemgroups/monster_drops_lairs.json @@ -267,5 +267,15 @@ [ "can_sealer", 10 ], [ "remotevehcontrol", 8 ] ] + }, + { + "type": "item_group", + "id": "cow", + "items": [ [ "cow_bell", 1 ] ] + }, + { + "type": "item_group", + "id": "dog_cop", + "items": [ [ "kevlar_harness", 1 ] ] } ] diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json new file mode 100644 index 0000000000000..9c216b4cf6f9a --- /dev/null +++ b/data/json/itemgroups/trash_and_debris.json @@ -0,0 +1,174 @@ +[ + { + "type": "item_group", + "id": "wreckage", + "items": [ + [ "chain", 20 ], + [ "steel_chunk", 30 ], + [ "spring", 50 ], + [ "steel_lump", 30 ], + [ "frame", 20 ], + [ "hdframe", 20 ], + [ "cu_pipe", 25 ], + [ "scrap_copper", 50 ], + [ "rock", 40 ], + [ "survnote", 1 ] + ] + }, + { + "type": "item_group", + "id": "trash_forest", + "items": [ + { "group": "ammo_casings", "prob": 3 }, + [ "rock", 5 ], + [ "ceramic_shard", 5 ], + [ "stick", 5 ], + [ "pine_bough", 2 ], + [ "hickory_root", 2 ], + [ "hickory_nut", 3 ], + [ "acorns", 2 ], + [ "pinecone", 3 ], + [ "flyer", 1 ], + [ "fp_loyalty_card", 1 ], + [ "one_year_old_newspaper", 1 ], + [ "months_old_newspaper", 2 ], + [ "weeks_old_newspaper", 3 ], + [ "newest_newspaper", 4 ], + [ "bag_plastic", 3 ], + [ "bottle_plastic", 2 ], + [ "bottle_plastic_small", 1 ], + [ "bag_canvas", 1 ], + [ "bag_canvas_small", 1 ], + [ "cup_plastic_unsealed", 3 ], + [ "bottle_glass", 1 ], + { "group": "tinware", "prob": 3 }, + [ "can_drink_unsealed", 2 ], + [ "can_food_unsealed", 1 ], + [ "box_small", 5 ], + [ "box_medium", 3 ], + [ "box_large", 1 ], + [ "plastic_sheet", 1 ], + [ "jug_plastic", 1 ], + [ "jar_glass", 2 ], + [ "jar_3l_glass", 1 ], + [ "wrapper", 3 ], + { "item": "withered", "prob": 5, "count-min": 1, "count-max": 10 }, + [ "straw_pile", 5 ], + [ "tinder", 1 ], + { "item": "plant_fibre", "prob": 2, "count-min": 1, "count-max": 10 }, + [ "string_6", 1 ], + [ "cig_butt", 4 ], + [ "string_36", 1 ], + [ "steel_lump", 1 ], + [ "steel_chunk", 1 ], + { "item": "scrap", "prob": 2, "count-min": 1, "count-max": 10 }, + { "item": "glass_shard", "prob": 3, "count-min": 8, "count-max": 84 }, + { "item": "feather", "prob": 5, "count-min": 5, "count-max": 10 }, + [ "wire", 1 ], + [ "wire_barbed", 1 ], + [ "splinter", 3 ], + [ "rag", 2 ], + [ "rag_bloody", 1 ], + [ "bone", 2 ], + [ "syringe", 1 ], + [ "spike", 1 ], + [ "tanbark", 2 ], + [ "thermos", 1 ], + [ "bag_body_bag", 1 ] + ] + }, + { + "type": "item_group", + "id": "trash", + "ammo": 20, + "magazine": 50, + "items": [ + [ "plastic_shopping_bag", 35 ], + [ "iodine", 5 ], + [ "prussian_blue", 5 ], + [ "bum_wine", 5 ], + [ "meth", 2 ], + [ "heroin", 1 ], + [ "wrapper", 50 ], + [ "fp_loyalty_card", 5 ], + [ "string_6", 2 ], + [ "chain", 20 ], + [ "glass_sheet", 5 ], + { "item": "glass_shard", "prob": 20, "count": [ 1, 8 ] }, + [ "ceramic_shard", 15 ], + [ "stick", 95 ], + [ "seed_wheat", 5 ], + [ "seed_tomato", 5 ], + [ "seed_weed", 5 ], + [ "seed_flower", 5 ], + [ "seed_tobacco", 1 ], + [ "joint_roach", 5 ], + [ "pipe", 20 ], + [ "bag_plastic", 10 ], + [ "bottle_plastic", 10 ], + [ "bottle_plastic_small", 5 ], + [ "bag_canvas", 5 ], + [ "bag_canvas_small", 5 ], + [ "bottle_glass", 10 ], + [ "can_drink_unsealed", 10 ], + [ "can_food_unsealed", 10 ], + [ "box_small", 10 ], + [ "bubblewrap", 50 ], + [ "cig_butt", 30 ], + { "item": "lighter", "prob": 60, "charges-min": 0, "charges-max": 10 }, + { "item": "matches", "prob": 60, "charges-min": 0, "charges-max": 20 }, + [ "syringe", 8 ], + [ "tinder", 1 ], + [ "rag", 1 ], + [ "hairpin", 1 ], + [ "kevlar_plate", 1 ], + [ "ceramic_armor", 1 ], + [ "leather", 1 ], + [ "software_hacking", 10 ], + [ "news_regional", 8 ], + [ "file", 5 ], + [ "decoy_elfa", 10 ], + [ "recipe_elfa", 1 ], + [ "jug_plastic", 10 ], + [ "spray_can", 50 ], + [ "jar_glass", 10 ], + [ "jar_3l_glass", 8 ], + [ "flyer", 10 ], + [ "scorecard", 10 ], + [ "talking_doll", 60 ], + [ "marble", 65 ], + [ "handflare_dead", 3 ], + [ "creepy_doll", 1 ], + [ "straw_doll", 1 ], + [ "striped_shirt", 1 ], + [ "striped_pants", 1 ], + [ "foodperson_mask", 1 ], + [ "razor_blade", 10 ], + [ "survnote", 5 ], + [ "eclipse_glasses", 1 ], + [ "plastic_sheet", 5 ], + [ "balloon", 5 ], + [ "box_medium", 15 ], + [ "thermos", 30 ], + { "group": "tinware", "prob": 15 } + ] + }, + { + "type": "item_group", + "id": "trash_cart", + "items": [ + [ "bottle_plastic", 5 ], + [ "bottle_plastic_small", 15 ], + [ "bottle_glass", 2 ], + { "group": "tinware", "prob": 2 }, + [ "can_drink_unsealed", 5 ], + [ "plastic_shopping_bag", 13 ], + [ "bag_plastic", 15 ], + [ "wrapper", 30 ], + [ "flyer", 15 ], + [ "scorecard", 10 ], + [ "eclipse_glasses", 1 ], + [ "plastic_sheet", 5 ] + ] + } +] diff --git a/data/json/itemgroups/weapons_misc.json b/data/json/itemgroups/weapons_misc.json new file mode 100644 index 0000000000000..b236ec8da1ecc --- /dev/null +++ b/data/json/itemgroups/weapons_misc.json @@ -0,0 +1,62 @@ +[ + { + "type": "item_group", + "id": "weapons", + "items": [ + [ "chain", 20 ], + [ "knuckle_brass", 20 ], + [ "hammer", 35 ], + [ "wrench", 30 ], + [ "hammer_sledge", 4 ], + [ "hammer_sledge_short", 2 ], + [ "hatchet", 10 ], + [ "ax", 8 ], + [ "knife_combat", 14 ], + [ "kukri", 2 ], + [ "knife_hunting", 4 ], + [ "knife_rambo", 8 ], + [ "knife_rm42", 2 ], + [ "throwing_knife", 7 ], + [ "throwing_axe", 6 ], + [ "punch_dagger", 6 ], + [ "pipe", 20 ], + [ "bat", 60 ], + [ "bullwhip", 10 ], + [ "machete", 5 ], + [ "baton", 8 ], + [ "blackjack", 10 ], + [ "tazer", 3 ], + [ "rapier", 3 ], + [ "cavalry_sabre", 2 ], + [ "bat_metal", 60 ], + [ "e_tool", 2 ], + [ "knife_trench", 7 ], + [ "switchblade", 4 ], + [ "tonfa", 10 ], + [ "tonfa_wood", 10 ], + [ "shocktonfa_off", 5 ], + [ "tanto", 7 ], + [ "wakizashi", 3 ], + [ "nodachi", 1 ], + [ "katana", 2 ], + [ "survnote", 1 ] + ] + }, + { + "type": "item_group", + "id": "grenades", + "items": [ + [ "grenade", 30 ], + [ "grenade_inc", 30 ], + [ "flashbang", 30 ], + [ "EMPbomb", 20 ], + [ "grenade_emp", 5 ], + [ "gasbomb", 15 ], + [ "gasbomb_makeshift", 15 ], + [ "smokebomb", 50 ], + [ "dynamite", 50 ], + [ "mininuke", 5 ], + [ "c4", 50 ] + ] + } +] From 585fbbe03d633d760f117c97f26e9b224dccbfc6 Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Sun, 23 Feb 2020 20:39:59 +0300 Subject: [PATCH 27/56] Make the boat hull crafting time a little more real (#38253) --- data/json/recipes/recipe_vehicle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_vehicle.json b/data/json/recipes/recipe_vehicle.json index 0d9aa568ac043..93e887d6f524a 100644 --- a/data/json/recipes/recipe_vehicle.json +++ b/data/json/recipes/recipe_vehicle.json @@ -370,7 +370,7 @@ "subcategory": "CSC_OTHER_VEHICLE", "skill_used": "fabrication", "difficulty": 3, - "time": "1 m", + "time": "1 h", "reversible": true, "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ], From 4c48fc6377190abe1728ca0910fb59f3cfa82ae7 Mon Sep 17 00:00:00 2001 From: cosmiccoincidence <41941008+cosmiccoincidence@users.noreply.github.com> Date: Sun, 23 Feb 2020 15:24:30 -0500 Subject: [PATCH 28/56] adds newspaper item groups (#38246) * adds newspaper item groups * adds more uses of the new groups * more uses of the new groups * fix * linting * more linting * New group uses in new item group file --- data/json/itemgroups/books.json | 19 ++++++-- .../json/itemgroups/collections_domestic.json | 7 +-- data/json/itemgroups/locations.json | 48 +++++-------------- .../json/itemgroups/locations_commercial.json | 3 +- data/json/itemgroups/mansion.json | 7 +-- .../itemgroups/oa_shared_item_groups.json | 18 +------ data/json/itemgroups/trash_and_debris.json | 6 +-- data/json/mapgen/cemetery_4square.json | 7 +-- data/json/mapgen/cs_market_small.json | 11 +---- 9 files changed, 37 insertions(+), 89 deletions(-) diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 09ce4a409d392..dd2fb7de10c42 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -596,9 +596,7 @@ { "group": "book_mag_surv", "prob": 90 }, [ "mag_porn", 20 ], [ "mag_comic", 20 ], - [ "months_old_newspaper", 1 ], - [ "weeks_old_newspaper", 4 ], - [ "newest_newspaper", 10 ], + { "group": "newspaper_recent", "prob": 15 }, [ "survnote", 1 ] ] }, @@ -656,5 +654,20 @@ "id": "book_mag_surv", "type": "item_group", "items": [ [ "mag_survival", 40 ], [ "mag_traps", 20 ], [ "fun_survival", 10 ], [ "mag_archery", 20 ] ] + }, + { + "id": "newspaper", + "type": "item_group", + "items": [ { "group": "newspaper_recent", "prob": 80 }, { "group": "newspaper_old", "prob": 20 } ] + }, + { + "id": "newspaper_recent", + "type": "item_group", + "items": [ [ "months_old_newspaper", 10 ], [ "weeks_old_newspaper", 15 ], [ "newest_newspaper", 20 ] ] + }, + { + "id": "newspaper_old", + "type": "item_group", + "items": [ [ "many_years_old_newspaper", 5 ], [ "years_old_newspaper", 10 ], [ "one_year_old_newspaper", 20 ] ] } ] diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 3024c09634d6d..484b55de0c7a9 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -216,8 +216,7 @@ "type": "item_group", "items": [ { "group": "magazines", "prob": 515 }, - { "item": "weeks_old_newspaper", "prob": 95, "count-min": 3, "count-max": 5 }, - { "item": "newest_newspaper", "prob": 100, "count-min": 3, "count-max": 5 }, + { "group": "newspaper_recent", "prob": 200, "count-min": 3, "count-max": 5 }, [ "flyer", 80 ], [ "survnote", 3 ], [ "touristmap", 3 ], @@ -288,9 +287,7 @@ [ "mask_guy_fawkes", 5 ], [ "hockey_stick", 10 ], [ "news_regional", 4 ], - [ "many_years_old_newspaper", 2 ], - [ "years_old_newspaper", 2 ], - [ "one_year_old_newspaper", 3 ], + { "group": "newspaper_old", "prob": 5 }, { "group": "kids_books", "prob": 110 }, { "group": "novels", "prob": 16 }, [ "tailor_portfolio", 1 ], diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index adc7246323c0e..07e6fab50967a 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -158,9 +158,7 @@ { "group": "kids_books", "prob": 35 }, [ "recipe_augs", 20 ], [ "decoy_anarch", 50 ], - [ "months_old_newspaper", 20 ], - [ "weeks_old_newspaper", 100 ], - [ "newest_newspaper", 100 ], + { "group": "newspaper_recent", "prob": 200 }, [ "survnote", 1 ] ] }, @@ -223,9 +221,7 @@ [ "stethoscope", 20 ], [ "novel_pulp", 16 ], [ "atomic_light", 1 ], - [ "months_old_newspaper", 4 ], - [ "weeks_old_newspaper", 5 ], - [ "newest_newspaper", 6 ], + { "group": "newspaper_recent", "prob": 15 }, { "group": "book_mag_gen", "prob": 99 }, [ "mag_porn", 5 ], [ "hairpin", 5 ], @@ -595,12 +591,7 @@ [ "box_small", 400 ], [ "box_medium", 400 ], [ "box_large", 200 ], - [ "one_year_old_newspaper", 200 ], - [ "months_old_newspaper", 250 ], - [ "weeks_old_newspaper", 250 ], - [ "one_year_old_newspaper", 200 ], - [ "years_old_newspaper", 200 ], - [ "many_years_old_newspaper", 200 ] + { "group": "newspaper", "prob": 1000 } ] }, { @@ -843,12 +834,7 @@ [ "rock", 40 ], [ "ceramic_shard", 30 ], [ "pipe", 20 ], - [ "many_years_old_newspaper", 1 ], - [ "years_old_newspaper", 2 ], - [ "one_year_old_newspaper", 3 ], - [ "months_old_newspaper", 4 ], - [ "weeks_old_newspaper", 5 ], - [ "newest_newspaper", 10 ], + { "group": "newspaper", "prob": 20 }, [ "file", 30 ], [ "mag_porn", 20 ], [ "bottle_plastic", 10 ], @@ -905,8 +891,7 @@ [ "mag_porn", 20 ], [ "rag", 1 ], [ "hairpin", 1 ], - [ "weeks_old_newspaper", 1 ], - [ "newest_newspaper", 2 ], + { "group": "newspaper_recent", "prob": 5 }, [ "flyer", 10 ], [ "file", 10 ], [ "child_book", 2 ], @@ -1279,9 +1264,7 @@ "items": [ [ "rock", 40 ], [ "sharp_rock", 5 ], - [ "months_old_newspaper", 1 ], - [ "weeks_old_newspaper", 2 ], - [ "newest_newspaper", 3 ], + { "group": "newspaper_recent", "prob": 5 }, { "group": "ammo_casings", "prob": 10 }, { "group": "everyday_corpse", "prob": 1 } ] @@ -1299,9 +1282,7 @@ [ "hickory_root", 3 ], [ "hickory_nut", 5 ], [ "one_year_old_newspaper", 2 ], - [ "months_old_newspaper", 3 ], - [ "weeks_old_newspaper", 4 ], - [ "newest_newspaper", 5 ], + { "group": "newspaper_recent", "prob": 15 }, [ "bottle_plastic", 1 ], [ "bottle_glass", 1 ], [ "syringe", 1 ], @@ -1367,10 +1348,8 @@ [ "55gal_drum", 1 ], [ "flyer", 10 ], [ "one_year_old_newspaper", 2 ], + { "group": "newspaper_recent", "prob": 15 }, [ "foodperson_mask", 1 ], - [ "months_old_newspaper", 3 ], - [ "weeks_old_newspaper", 4 ], - [ "newest_newspaper", 5 ], [ "survnote", 1 ] ] }, @@ -2061,8 +2040,7 @@ [ "umbrella", 50 ], [ "teleumbrella", 20 ], { "group": "magazines", "prob": 120 }, - [ "weeks_old_newspaper", 80 ], - [ "newest_newspaper", 100 ], + { "group": "newspaper_recent", "prob": 100 }, [ "survnote", 1 ], [ "dnd_handbook", 1 ] ] @@ -2210,9 +2188,7 @@ [ "recipe_bows", 4 ], [ "recipe_arrows", 4 ], { "group": "kids_books", "prob": 5 }, - [ "many_years_old_newspaper", 3 ], - [ "years_old_newspaper", 3 ], - [ "one_year_old_newspaper", 3 ], + { "group": "newspaper_old", "prob": 10 }, [ "months_old_newspaper", 4 ], [ "lighter", 60 ], [ "ref_lighter", 5 ], @@ -2454,9 +2430,7 @@ [ "fetus", 5 ], [ "foodperson_mask", 1 ], [ "human_brain_embalmed", 5 ], - [ "many_years_old_newspaper", 2 ], - [ "years_old_newspaper", 2 ], - [ "one_year_old_newspaper", 2 ], + { "group": "newspaper_old", "prob": 8 }, [ "months_old_newspaper", 2 ] ] } diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json index 111f6f81c3ed2..1670306523af0 100644 --- a/data/json/itemgroups/locations_commercial.json +++ b/data/json/itemgroups/locations_commercial.json @@ -43,8 +43,7 @@ [ "nic_gum", 2 ], [ "razor_blade", 3 ], [ "knitting_needles", 1 ], - [ "weeks_old_newspaper", 5 ], - [ "newest_newspaper", 10 ], + { "group": "newspaper_recent", "prob": 15 }, [ "survnote", 2 ], [ "eclipse_glasses", 1 ], [ "thermos", 10 ] diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json index 26f5c48df233a..c1d23dc016022 100644 --- a/data/json/itemgroups/mansion.json +++ b/data/json/itemgroups/mansion.json @@ -1162,19 +1162,14 @@ [ "glass", 20 ], [ "bandana", 10 ], [ "mp3", 10 ], - [ "weeks_old_newspaper", 5 ], - [ "newest_newspaper", 5 ], [ "portable_game", 5 ], [ "cell_phone", 1 ], [ "smart_phone", 5 ], [ "phonebook", 5 ], [ "hairpin", 5 ], { "group": "tinware", "prob": 5 }, - [ "months_old_newspaper", 4 ], - [ "one_year_old_newspaper", 3 ], - [ "years_old_newspaper", 2 ], + { "group": "newspaper", "prob": 15 }, [ "news_regional", 2 ], - [ "many_years_old_newspaper", 1 ], [ "magnifying_glass", 1 ] ] }, diff --git a/data/json/itemgroups/oa_shared_item_groups.json b/data/json/itemgroups/oa_shared_item_groups.json index 57a66adc73c7b..2538679c52a9f 100644 --- a/data/json/itemgroups/oa_shared_item_groups.json +++ b/data/json/itemgroups/oa_shared_item_groups.json @@ -2,16 +2,7 @@ { "type": "item_group", "id": "oa_discarded_news", - "items": [ - [ "many_years_old_newspaper", 20 ], - [ "years_old_newspaper", 20 ], - [ "one_year_old_newspaper", 20 ], - [ "months_old_newspaper", 20 ], - [ "weeks_old_newspaper", 20 ], - [ "newest_newspaper", 20 ], - [ "news_regional", 20 ], - [ "mag_news", 20 ] - ] + "items": [ { "group": "newspaper", "prob": 60 }, [ "news_regional", 20 ], [ "mag_news", 20 ] ] }, { "type": "item_group", @@ -61,12 +52,7 @@ [ "razor_blade", 10 ], [ "survnote", 5 ], [ "eclipse_glasses", 5 ], - [ "many_years_old_newspaper", 15 ], - [ "years_old_newspaper", 15 ], - [ "one_year_old_newspaper", 15 ], - [ "months_old_newspaper", 15 ], - [ "weeks_old_newspaper", 15 ], - [ "newest_newspaper", 15 ], + { "group": "newspaper", "prob": 60 }, [ "news_regional", 15 ], [ "paper", 20 ], [ "rag_bloody", 35 ], diff --git a/data/json/itemgroups/trash_and_debris.json b/data/json/itemgroups/trash_and_debris.json index 9c216b4cf6f9a..8cd71ce118bb1 100644 --- a/data/json/itemgroups/trash_and_debris.json +++ b/data/json/itemgroups/trash_and_debris.json @@ -30,10 +30,7 @@ [ "pinecone", 3 ], [ "flyer", 1 ], [ "fp_loyalty_card", 1 ], - [ "one_year_old_newspaper", 1 ], - [ "months_old_newspaper", 2 ], - [ "weeks_old_newspaper", 3 ], - [ "newest_newspaper", 4 ], + { "group": "newspaper", "prob": 10 }, [ "bag_plastic", 3 ], [ "bottle_plastic", 2 ], [ "bottle_plastic_small", 1 ], @@ -126,6 +123,7 @@ [ "leather", 1 ], [ "software_hacking", 10 ], [ "news_regional", 8 ], + { "group": "newspaper", "prob": 10 }, [ "file", 5 ], [ "decoy_elfa", 10 ], [ "recipe_elfa", 1 ], diff --git a/data/json/mapgen/cemetery_4square.json b/data/json/mapgen/cemetery_4square.json index a621df08c00d8..9dbe7eee03c6a 100644 --- a/data/json/mapgen/cemetery_4square.json +++ b/data/json/mapgen/cemetery_4square.json @@ -32,12 +32,7 @@ [ "teleumbrella", 2 ], [ "thawb", 1 ], [ "umbrella", 10 ], - [ "many_years_old_newspaper", 2 ], - [ "years_old_newspaper", 5 ], - [ "one_year_old_newspaper", 4 ], - [ "months_old_newspaper", 3 ], - [ "weeks_old_newspaper", 3 ], - [ "newest_newspaper", 1 ], + { "group": "newspaper", "prob": 20 }, [ "survnote", 3 ], [ "cig_butt", 5 ], [ "cigar_butt", 10 ] diff --git a/data/json/mapgen/cs_market_small.json b/data/json/mapgen/cs_market_small.json index ed7befa4b3e73..49bc0924cc4d4 100644 --- a/data/json/mapgen/cs_market_small.json +++ b/data/json/mapgen/cs_market_small.json @@ -48,16 +48,7 @@ { "type": "item_group", "id": "m_merch_4", - "items": [ - [ "many_years_old_newspaper", 20 ], - [ "years_old_newspaper", 20 ], - [ "one_year_old_newspaper", 20 ], - [ "months_old_newspaper", 20 ], - [ "weeks_old_newspaper", 20 ], - [ "newest_newspaper", 20 ], - [ "mag_news", 20 ], - [ "hat_newsboy", 20 ] - ] + "items": [ { "group": "newspaper", "prob": 80 }, [ "mag_news", 20 ], [ "hat_newsboy", 20 ] ] }, { "type": "item_group", From 73d7992249eafb85e22816240dec1972b8c51ab8 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sun, 23 Feb 2020 16:22:34 -0500 Subject: [PATCH 29/56] fix laundromat --- .../json/overmap/multitile_city_buildings.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json index b33c1c7ebee45..23a1ca3ab6fb6 100644 --- a/data/json/overmap/multitile_city_buildings.json +++ b/data/json/overmap/multitile_city_buildings.json @@ -3322,5 +3322,23 @@ { "point": [ 0, 0, 1 ], "overmap": "house_crack3_roof_north" }, { "point": [ 0, 0, -1 ], "overmap": "house_crack3_basement_north" } ] + }, + { + "type": "city_building", + "id": "s_laundromat", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "s_laundromat_north" }, + { "point": [ 0, 0, 1 ], "overmap": "s_laundromat_roof_north" } + ] + }, + { + "type": "city_building", + "id": "s_laundromat_1", + "locations": [ "land" ], + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "s_laundromat_1_north" }, + { "point": [ 0, 0, 1 ], "overmap": "s_laundromat_roof_1_north" } + ] } ] From f00a2f806540cc2a3dfd736c0666d22e3e48ffe4 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sun, 23 Feb 2020 14:40:00 -0500 Subject: [PATCH 30/56] Simplify shadowcasting types There are a bunch of types which are just a std::array of pointers to two-dimensional arrays. These are all quite verbose. Introduce a template alias to simplify all those types. --- src/lightmap.cpp | 37 ++++++++++++++++++------------------- src/shadowcasting.h | 9 ++++++--- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/lightmap.cpp b/src/lightmap.cpp index dee86db0ce83d..5656bfb8ce51b 100644 --- a/src/lightmap.cpp +++ b/src/lightmap.cpp @@ -670,9 +670,9 @@ template void cast_zlight_segment( - const std::array &output_caches, - const std::array &input_arrays, - const std::array &floor_caches, + const array_of_grids_of &output_caches, + const array_of_grids_of &input_arrays, + const array_of_grids_of &floor_caches, const tripoint &offset, int offset_distance, T numerator = 1.0f, int row = 1, float start_major = 0.0f, float end_major = 1.0f, @@ -684,9 +684,9 @@ template void cast_zlight_segment( - const std::array &output_caches, - const std::array &input_arrays, - const std::array &floor_caches, + const array_of_grids_of &output_caches, + const array_of_grids_of &input_arrays, + const array_of_grids_of &floor_caches, const tripoint &offset, const int offset_distance, const T numerator, const int row, float start_major, const float end_major, @@ -877,9 +877,9 @@ template void cast_zlight( - const std::array &output_caches, - const std::array &input_arrays, - const std::array &floor_caches, + const array_of_grids_of &output_caches, + const array_of_grids_of &input_arrays, + const array_of_grids_of &floor_caches, const tripoint &origin, const int offset_distance, const T numerator ) { // Down @@ -928,16 +928,15 @@ void cast_zlight( // I can't figure out how to make implicit instantiation work when the parameters of // the template-supplied function pointers are involved, so I'm explicitly instantiating instead. template void cast_zlight( - const std::array &output_caches, - const std::array &input_arrays, - const std::array &floor_caches, + const array_of_grids_of &output_caches, + const array_of_grids_of &input_arrays, + const array_of_grids_of &floor_caches, const tripoint &origin, int offset_distance, float numerator ); template void cast_zlight( - const std::array &output_caches, - const std::array - &input_arrays, - const std::array &floor_caches, + const array_of_grids_of &output_caches, + const array_of_grids_of &input_arrays, + const array_of_grids_of &floor_caches, const tripoint &origin, int offset_distance, fragment_cloud numerator ); template transparency_caches; - std::array seen_caches; - std::array floor_caches; + array_of_grids_of transparency_caches; + array_of_grids_of seen_caches; + array_of_grids_of floor_caches; for( int z = -OVERMAP_DEPTH; z <= OVERMAP_HEIGHT; z++ ) { auto &cur_cache = get_cache( z ); transparency_caches[z + OVERMAP_DEPTH] = &cur_cache.transparency_cache; diff --git a/src/shadowcasting.h b/src/shadowcasting.h index 8b542e95cfcb4..fb7779a423124 100644 --- a/src/shadowcasting.h +++ b/src/shadowcasting.h @@ -110,14 +110,17 @@ void castLightAll( Out( &output_cache )[MAPSIZE_X][MAPSIZE_Y], const point &offset, int offsetDistance = 0, T numerator = 1.0 ); +template +using array_of_grids_of = std::array; + // TODO: Generalize the floor check, allow semi-transparent floors template< typename T, T( *calc )( const T &, const T &, const int & ), bool( *check )( const T &, const T & ), T( *accumulate )( const T &, const T &, const int & ) > void cast_zlight( - const std::array &output_caches, - const std::array &input_arrays, - const std::array &floor_caches, + const array_of_grids_of &output_caches, + const array_of_grids_of &input_arrays, + const array_of_grids_of &floor_caches, const tripoint &origin, int offset_distance, T numerator ); #endif From 4c70a18f8a71e81fef9ac6e9b68a560009ceca92 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sun, 23 Feb 2020 15:18:51 -0500 Subject: [PATCH 31/56] Separate caches for light and vision transparency Crouching affects your ability to see past adjacent obstacles. Previously this was implemented by altering the transparency cache. However, this also stops light passing the tile, and means that crouching by a window can cause a room to fall dark. Fix by separating the transparency cache into two, one for light and one for vision. The latter is a copy of the former, except with tweaks for crouching and with the avatar's tile forced to be transparent. --- src/lightmap.cpp | 38 ++++++++++++++++++++++++++++++++++++-- src/map.cpp | 21 ++++----------------- src/map.h | 2 ++ 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/lightmap.cpp b/src/lightmap.cpp index 5656bfb8ce51b..01b5668cb8b79 100644 --- a/src/lightmap.cpp +++ b/src/lightmap.cpp @@ -143,6 +143,40 @@ bool map::build_transparency_cache( const int zlev ) return true; } +bool map::build_vision_transparency_cache( const int zlev ) +{ + auto &map_cache = get_cache( zlev ); + auto &transparency_cache = map_cache.transparency_cache; + auto &vision_transparency_cache = map_cache.vision_transparency_cache; + + memcpy( &vision_transparency_cache, &transparency_cache, sizeof( transparency_cache ) ); + + const tripoint &p = g->u.pos(); + + if( p.z != zlev ) { + return false; + } + + bool dirty = false; + + bool is_crouching = g->u.movement_mode_is( CMM_CROUCH ); + for( const tripoint &loc : points_in_radius( p, 1 ) ) { + if( loc == p ) { + // The tile player is standing on should always be visible + if( ( has_furn( p ) && !furn( p )->transparent ) || !ter( p )->transparent ) { + vision_transparency_cache[p.x][p.y] = LIGHT_TRANSPARENCY_CLEAR; + } + } else if( is_crouching && coverage( loc ) >= 30 ) { + // If we're crouching behind an obstacle, we can't see past it. + vision_transparency_cache[loc.x][loc.y] = LIGHT_TRANSPARENCY_SOLID; + map_cache.transparency_cache_dirty = true; + dirty = true; + } + } + + return dirty; +} + void map::apply_character_light( player &p ) { if( p.has_effect( effect_onfire ) ) { @@ -1102,7 +1136,7 @@ castLightAll floor_caches; for( int z = -OVERMAP_DEPTH; z <= OVERMAP_HEIGHT; z++ ) { auto &cur_cache = get_cache( z ); - transparency_caches[z + OVERMAP_DEPTH] = &cur_cache.transparency_cache; + transparency_caches[z + OVERMAP_DEPTH] = &cur_cache.vision_transparency_cache; seen_caches[z + OVERMAP_DEPTH] = &cur_cache.seen_cache; floor_caches[z + OVERMAP_DEPTH] = &cur_cache.floor_cache; std::uninitialized_fill_n( diff --git a/src/map.cpp b/src/map.cpp index 290f45f579ea7..6c3bb1e039a5d 100755 --- a/src/map.cpp +++ b/src/map.cpp @@ -7718,33 +7718,19 @@ void map::build_map_cache( const int zlev, bool skip_lightmap ) for( int z = minz; z <= maxz; z++ ) { build_outside_cache( z ); seen_cache_dirty |= build_transparency_cache( z ); + seen_cache_dirty |= build_vision_transparency_cache( zlev ); seen_cache_dirty |= build_floor_cache( z ); do_vehicle_caching( z ); } - const tripoint &p = g->u.pos(); - bool is_crouching = g->u.movement_mode_is( CMM_CROUCH ); - for( const tripoint &loc : points_in_radius( p, 1 ) ) { - if( loc == p ) { - // The tile player is standing on should always be transparent - if( ( has_furn( p ) && !furn( p ).obj().transparent ) || !ter( p ).obj().transparent ) { - get_cache( p.z ).transparency_cache[p.x][p.y] = LIGHT_TRANSPARENCY_CLEAR; - } - } else if( is_crouching && coverage( loc ) >= 30 ) { - // If we're crouching behind an obstacle, we can't see past it. - get_cache( loc.z ).transparency_cache[loc.x][loc.y] = LIGHT_TRANSPARENCY_SOLID; - get_cache( loc.z ).transparency_cache_dirty = true; - seen_cache_dirty = true; - } - } - if( seen_cache_dirty ) { skew_vision_cache.clear(); } // Initial value is illegal player position. + const tripoint &p = g->u.pos(); static tripoint player_prev_pos; if( seen_cache_dirty || player_prev_pos != p ) { - build_seen_cache( g->u.pos(), zlev ); + build_seen_cache( p, zlev ); player_prev_pos = p; } if( !skip_lightmap ) { @@ -8243,6 +8229,7 @@ level_cache::level_cache() std::fill_n( &outside_cache[0][0], map_dimensions, false ); std::fill_n( &floor_cache[0][0], map_dimensions, false ); std::fill_n( &transparency_cache[0][0], map_dimensions, 0.0f ); + std::fill_n( &vision_transparency_cache[0][0], map_dimensions, 0.0f ); std::fill_n( &seen_cache[0][0], map_dimensions, 0.0f ); std::fill_n( &camera_cache[0][0], map_dimensions, 0.0f ); std::fill_n( &visibility_cache[0][0], map_dimensions, LL_DARK ); diff --git a/src/map.h b/src/map.h index eceef058560bc..782e442c66e6c 100644 --- a/src/map.h +++ b/src/map.h @@ -170,6 +170,7 @@ struct level_cache { bool outside_cache[MAPSIZE_X][MAPSIZE_Y]; bool floor_cache[MAPSIZE_X][MAPSIZE_Y]; float transparency_cache[MAPSIZE_X][MAPSIZE_Y]; + float vision_transparency_cache[MAPSIZE_X][MAPSIZE_Y]; float seen_cache[MAPSIZE_X][MAPSIZE_Y]; float camera_cache[MAPSIZE_X][MAPSIZE_Y]; lit_level visibility_cache[MAPSIZE_X][MAPSIZE_Y]; @@ -1559,6 +1560,7 @@ class map // Builds a transparency cache and returns true if the cache was invalidated. // Used to determine if seen cache should be rebuilt. bool build_transparency_cache( int zlev ); + bool build_vision_transparency_cache( int zlev ); void build_sunlight_cache( int zlev ); public: void build_outside_cache( int zlev ); From 9528517bc7bff3b5f55e3ed1bfb2fb4a7453743b Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Sun, 23 Feb 2020 13:51:08 -0500 Subject: [PATCH 32/56] Add a test for crouching vision This tests that the player cannot see past an adjacent obstacle when crouching, but light can still pass it. --- tests/vision_test.cpp | 70 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/tests/vision_test.cpp b/tests/vision_test.cpp index df21a9eee6684..96efebcca0a97 100644 --- a/tests/vision_test.cpp +++ b/tests/vision_test.cpp @@ -22,9 +22,27 @@ #include "game_constants.h" #include "point.h" +enum class vision_test_flags { + none = 0, + no_3d = 1 << 0, + crouching = 1 << 1, +}; + +static vision_test_flags operator&( vision_test_flags l, vision_test_flags r ) +{ + return static_cast( + static_cast( l ) & static_cast( r ) ); +} + +static bool operator!( vision_test_flags f ) +{ + return !static_cast( f ); +} + static void full_map_test( const std::vector &setup, const std::vector &expected_results, - const time_point &time ) + const time_point &time, + const vision_test_flags flags ) { const ter_id t_brick_wall( "t_brick_wall" ); const ter_id t_window_frame( "t_window_frame" ); @@ -40,6 +58,12 @@ static void full_map_test( const std::vector &setup, clear_map(); g->reset_light_level(); + if( !!( flags & vision_test_flags::crouching ) ) { + g->u.set_movement_mode( character_movemode::CMM_CROUCH ); + } else { + g->u.set_movement_mode( character_movemode::CMM_WALK ); + } + REQUIRE( !g->u.is_blind() ); REQUIRE( !g->u.in_sleep_state() ); REQUIRE( !g->u.has_effect( effect_narcosis ) ); @@ -224,7 +248,7 @@ struct vision_test_case { std::vector setup; std::vector expected_results; time_point time; - bool test_3d; + vision_test_flags flags; static void transpose( std::vector &v ) { if( v.empty() ) { @@ -261,7 +285,7 @@ struct vision_test_case { } void test() const { - full_map_test( setup, expected_results, time ); + full_map_test( setup, expected_results, time, flags ); } void test_all_transformations() const { @@ -286,6 +310,7 @@ struct vision_test_case { void test_all() const { // Disabling 3d tests for now since 3d sight casting is actually // different (it sees round corners more). + const bool test_3d = !( flags & vision_test_flags::no_3d ); if( test_3d ) { INFO( "using 3d casting" ); fov_3d = true; @@ -326,7 +351,7 @@ TEST_CASE( "vision_daylight", "[shadowcasting][vision]" ) "444", }, midday, - true + vision_test_flags::none }; t.test_all(); @@ -346,7 +371,7 @@ TEST_CASE( "vision_day_indoors", "[shadowcasting][vision]" ) "111", }, midday, - true + vision_test_flags::none }; t.test_all(); @@ -370,7 +395,8 @@ TEST_CASE( "vision_light_shining_in", "[shadowcasting][vision]" ) "1144444444", }, midday, - false // 3D FOV gives different results here due to it seeing round corners more + // 3D FOV gives different results here due to it seeing round corners more + vision_test_flags::no_3d }; t.test_all(); @@ -388,7 +414,7 @@ TEST_CASE( "vision_no_lights", "[shadowcasting][vision]" ) "111", }, midnight, - true + vision_test_flags::none }; t.test_all(); @@ -408,7 +434,7 @@ TEST_CASE( "vision_utility_light", "[shadowcasting][vision]" ) "444", }, midnight, - true + vision_test_flags::none }; t.test_all(); @@ -428,7 +454,7 @@ TEST_CASE( "vision_wall_obstructs_light", "[shadowcasting][vision]" ) "111", }, midnight, - true + vision_test_flags::none }; t.test_all(); @@ -452,7 +478,29 @@ TEST_CASE( "vision_wall_can_be_lit_by_player", "[shadowcasting][vision]" ) "66", }, midnight, - true + vision_test_flags::none + }; + + t.test_all(); +} + +TEST_CASE( "vision_crouching_blocks_vision_but_not_light", "[shadowcasting][vision]" ) +{ + vision_test_case t { + { + "###", + "#u#", + "#=#", + " ", + }, + { + "444", + "444", + "444", + "666", + }, + midday, + vision_test_flags::crouching }; t.test_all(); @@ -481,7 +529,7 @@ TEST_CASE( "vision_see_wall_in_moonlight", "[shadowcasting][vision]" ) }, // Want a night time full_moon - time_past_midnight( full_moon ), - true + vision_test_flags::none }; t.test_all(); From 95cfdc43381437d5ecc7260e7fea86796c57f1ca Mon Sep 17 00:00:00 2001 From: Sergey Alirzaev Date: Mon, 24 Feb 2020 04:46:57 +0300 Subject: [PATCH 33/56] Increase the fishing quality of the pro fishing rod (#38257) So the player won't mistakenly decide the pro fishing rod is equal to the basic one. --- data/json/items/tool/fishing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/fishing.json b/data/json/items/tool/fishing.json index 87855860e9d0c..563387ebd7c30 100644 --- a/data/json/items/tool/fishing.json +++ b/data/json/items/tool/fishing.json @@ -72,7 +72,7 @@ "symbol": "/", "color": "brown", "use_action": "FISH_ROD", - "qualities": [ [ "FISHING", 1 ] ], + "qualities": [ [ "FISHING", 2 ] ], "flags": [ "FISH_GOOD" ] } ] From 1d6cc0e83fc3f8f1aa04a39ea93eff5e0b379ea9 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:49:13 +0100 Subject: [PATCH 34/56] BIONIC_ITEM name to object (#38273) --- data/json/items/bionics.json | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index 03e01626de36d..56879f73918e5 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -258,7 +258,7 @@ "id": "bio_digestion", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Expanded Digestive System CBM", + "name": { "str": "Expanded Digestive System CBM" }, "looks_like": "bio_int_enhancer", "description": "This module contains three synthetic stomachs and industrial-grade intestines. Not only will these extract much more nutrition from food, but also increase the user's resistance to foodborne illness, and occasionally allow the digestion of rotten food.", "price": 550000, @@ -268,7 +268,7 @@ "id": "bio_ears", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Enhanced Hearing CBM", + "name": { "str": "Enhanced Hearing CBM" }, "looks_like": "bio_int_enhancer", "description": "While this bionic is active, the user's hearing will be drastically improved, allowing them to hear ten times better than the average person. Additionally, high-intensity sounds will be automatically dampened before they can damage their hearing.", "price": 500000, @@ -279,7 +279,7 @@ "id": "bio_emp", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Directional EMP CBM", + "name": { "str": "Directional EMP CBM" }, "looks_like": "bio_int_enhancer", "description": "Small parabolic EMP field generators that are mounted in the palm of the user's right hand. These can be used to instantly fire a wide, but short-ranged blast which will disable electronics and robots.", "price": 720000, @@ -289,7 +289,7 @@ "id": "bio_emp_armgun", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "EMP Projector CBM", + "name": { "str": "EMP Projector CBM" }, "looks_like": "bio_int_enhancer", "description": "A ranged EMP generator system that is implanted in the user's right arm and hand. The system fires precise, single-target pulses that require time to aim. Extremely effective against electronic targets but mostly useless otherwise.", "price": 220000, @@ -299,7 +299,7 @@ "id": "bio_ethanol", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Ethanol Burner CBM", + "name": { "str": "Ethanol Burner CBM" }, "looks_like": "bio_int_enhancer", "description": "A reactor that burns alcohol as fuel in an extremely efficient reaction. It can store up to 500ml and accepts ethanol, methanol and denatured alcohol as fuel.", "price": 120000, @@ -319,7 +319,7 @@ "id": "bio_eye_enhancer", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Diamond Cornea CBM", + "name": { "str": "Diamond Cornea CBM" }, "looks_like": "bio_int_enhancer", "description": "A set of diamond corneas which greatly enhance the user's vision, granting a +2 bonus to perception.", "price": 800000, @@ -341,7 +341,7 @@ "id": "bio_face_mask", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Facial Distortion CBM", + "name": { "str": "Facial Distortion CBM" }, "looks_like": "bio_int_enhancer", "description": "Through controlled application of electrochemical impulses, this bionic 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.", "price": 850000, @@ -352,7 +352,7 @@ "id": "bio_faraday", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Dielectric Capacitance System CBM", + "name": { "str": "Dielectric Capacitance System CBM" }, "looks_like": "bio_int_enhancer", "description": "A network of miniature piezoelectric capacitors, implanted throughout the body to protect from external electrical discharge.", "price": 5000, @@ -363,7 +363,7 @@ "id": "bio_fingerhack", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Fingerhack CBM", + "name": { "str": "Fingerhack CBM" }, "looks_like": "bio_int_enhancer", "description": "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.", "price": 350000, @@ -374,7 +374,7 @@ "id": "bio_flashbang", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Flashbang Generator CBM", + "name": { "str": "Flashbang Generator CBM" }, "looks_like": "bio_int_enhancer", "description": "A combination of LEDs and speakers that create a flash and sound comparable to a flashbang grenade, deafening and blinding nearby enemies.", "price": 720000, @@ -385,7 +385,7 @@ "id": "bio_flashlight", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Cranial Flashlight CBM", + "name": { "str": "Cranial Flashlight CBM" }, "looks_like": "bio_int_enhancer", "description": "A small, but powerful LED flashlight that is mounted between the eyes.", "price": 20000, @@ -492,7 +492,7 @@ "id": "bio_laser", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Finger-Mounted Laser CBM", + "name": { "str": "Finger-Mounted Laser CBM" }, "looks_like": "bio_int_enhancer", "description": "A small, high-powered laser that is embedded in the fingertip. This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.", "price": 720000, @@ -514,7 +514,7 @@ "id": "bio_lighter", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Finger Lighter CBM", + "name": { "str": "Finger Lighter CBM" }, "looks_like": "bio_int_enhancer", "description": "Powerful fire starters which extend from the tip of both hands' index fingers.", "price": 130000, @@ -525,7 +525,7 @@ "id": "bio_lockpick", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Fingerpick CBM", + "name": { "str": "Fingerpick CBM" }, "looks_like": "bio_int_enhancer", "description": "An electronic lockpick that is embedded in a fingertip. This automatic system will quickly unlock all but the most advanced key locks without any skill required on the part of the user.", "price": 350000, @@ -536,7 +536,7 @@ "id": "bio_magnet", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Electromagnetic Unit CBM", + "name": { "str": "Electromagnetic Unit CBM" }, "looks_like": "bio_int_enhancer", "description": "A powerful electromagnet that is implanted into the user's right hand, allowing them to indiscriminately pull all nearby magnetic objects towards them. Unlucky bystanders might be injured or killed by flying objects.", "price": 200000, @@ -558,7 +558,7 @@ "id": "bio_memory", "copy-from": "bionic_general", "type": "BIONIC_ITEM", - "name": "Enhanced Memory Banks CBM", + "name": { "str": "Enhanced Memory Banks CBM" }, "looks_like": "bio_int_enhancer", "description": "A set of highly-advanced quantum storage drives used to enhance memory. While active, they increase the rate that the user learns skills, and give them near-perfect memory of skills and terrain.", "price": 1000000, @@ -732,7 +732,7 @@ "id": "bio_razors", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Fingertip Razors CBM", + "name": { "str": "Fingertip Razors CBM" }, "looks_like": "bio_int_enhancer", "description": "A set of ten double-edged, four centimeter long razor-sharp claws that are implanted underneath the fingernails. These will deal a small amount of unarmed slashing damage whenever the user's fingertips are uncovered.", "price": 450000, @@ -808,7 +808,7 @@ "id": "bio_shock", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Electroshock Unit CBM", + "name": { "str": "Electroshock Unit CBM" }, "looks_like": "bio_int_enhancer", "description": "While fighting unarmed, or with a weapon that conducts electricity, there is 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.", "price": 550000, @@ -1062,7 +1062,7 @@ "id": "bio_dis_shock", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Faulty Electric System", + "name": { "str": "Faulty Electric System" }, "description": "This CBM is a mess of naked wire and burnt resistors.", "weight": "700 g", "difficulty": 5 @@ -1071,7 +1071,7 @@ "id": "bio_drain", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Electrical Drain", + "name": { "str": "Electrical Drain" }, "description": "This CBM was wired incorrectly and would drain power from any system connected to it.", "weight": "900 g", "difficulty": 5 @@ -1150,7 +1150,7 @@ "id": "bio_sleepy", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Endocrine Enervator", + "name": { "str": "Endocrine Enervator" }, "description": "This malfunctioning bionic causes fatigue by altering the unfortunate user's brain chemistry.", "weight": "100 g", "difficulty": 11 From e55bd75067b304227d1186d2e195dfccbfe7e878 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:50:03 +0100 Subject: [PATCH 35/56] Ammo name to object (#38274) --- data/json/items/ammo/38.json | 6 +++--- data/json/items/ammo/380.json | 16 ++++++++-------- data/json/items/ammo/40.json | 12 ++++++------ data/json/items/ammo/410shot.json | 4 ++-- data/json/items/ammo/44.json | 12 ++++++------ data/json/items/ammo/44paper.json | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json index 90b727bc819e2..731e8e002aeb9 100644 --- a/data/json/items/ammo/38.json +++ b/data/json/items/ammo/38.json @@ -3,7 +3,7 @@ "id": "38_fmj", "copy-from": "38_special", "type": "AMMO", - "name": ".38 FMJ", + "name": { "str": ".38 FMJ" }, "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.", "relative": { "damage": -2, "pierce": 4 } }, @@ -33,7 +33,7 @@ "id": "38_super", "copy-from": "38_special", "type": "AMMO", - "name": ".38 Super", + "name": { "str": ".38 Super" }, "description": ".38 Super ammunition with 90gr JHP bullets. Designed in 1929, the .38 super cartridge was designed to penetrate body armor and vehicles.", "price": 240, "price_postapoc": 2700, @@ -63,7 +63,7 @@ "id": "reloaded_38_super", "copy-from": "38_super", "type": "AMMO", - "name": ".38 Super, reloaded", + "name": { "str": ".38 Super, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/380.json b/data/json/items/ammo/380.json index fc75918aba056..b380354056df9 100644 --- a/data/json/items/ammo/380.json +++ b/data/json/items/ammo/380.json @@ -2,7 +2,7 @@ { "id": "380_FMJ", "type": "AMMO", - "name": ".380 ACP FMJ", + "name": { "str": ".380 ACP FMJ" }, "description": ".380 ACP ammunition with a brass jacketed 95gr bullet. Popular in pocket pistols for over a century, it is often considered the weakest caliber to consider carrying. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.", "weight": "6 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "380_JHP", "copy-from": "380_FMJ", "type": "AMMO", - "name": ".380 ACP JHP", + "name": { "str": ".380 ACP JHP" }, "description": ".380 ACP ammunition with a 95gr jacketed hollow point bullet. It is a popular round for small concealable backup pistols, and often the weakest recommended defensive caliber. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.", "relative": { "damage": 2, "pierce": -2 } }, @@ -34,7 +34,7 @@ "id": "380_p", "copy-from": "380_FMJ", "type": "AMMO", - "name": ".380 ACP +P", + "name": { "str": ".380 ACP +P" }, "description": "Overpressure .380 ACP ammunition with a 90gr jacketed hollow point bullet. These defensive loadings are designed to maximize performance and tend to be more accurate than practice ammo. One should be careful not to chamber it in 9x18mm Makarov or 9x19mm firearms.", "price": 190, "price_postapoc": 3800, @@ -46,7 +46,7 @@ "id": "bp_380_FMJ", "copy-from": "380_FMJ", "type": "AMMO", - "name": ".380 ACP FMJ, black powder", + "name": { "str": ".380 ACP FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -55,7 +55,7 @@ "id": "bp_380_JHP", "copy-from": "380_JHP", "type": "AMMO", - "name": ".380 ACP JHP, black powder", + "name": { "str": ".380 ACP JHP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -64,7 +64,7 @@ "id": "reloaded_380_FMJ", "copy-from": "380_FMJ", "type": "AMMO", - "name": ".380 ACP FMJ, reloaded", + "name": { "str": ".380 ACP FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -73,7 +73,7 @@ "id": "reloaded_380_JHP", "copy-from": "380_JHP", "type": "AMMO", - "name": ".380 ACP JHP, reloaded", + "name": { "str": ".380 ACP JHP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -82,7 +82,7 @@ "id": "reloaded_380_p", "copy-from": "380_p", "type": "AMMO", - "name": ".380 ACP +P, reloaded", + "name": { "str": ".380 ACP +P, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json index 7aeba66194014..a8aa42e70b224 100644 --- a/data/json/items/ammo/40.json +++ b/data/json/items/ammo/40.json @@ -3,14 +3,14 @@ "id": "40fmj", "copy-from": "40sw", "type": "AMMO", - "name": ".40 S&W FMJ", + "name": { "str": ".40 S&W FMJ" }, "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.", "relative": { "damage": -3, "pierce": 6 } }, { "id": "40sw", "type": "AMMO", - "name": ".40 S&W JHP", + "name": { "str": ".40 S&W JHP" }, "description": ".40 S&W ammunition with 135gr JHP bullets. The .40 S&W round is a descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil.", "weight": "9 g", "volume": "250 ml", @@ -34,7 +34,7 @@ "id": "bp_40fmj", "copy-from": "40fmj", "type": "AMMO", - "name": ".40 S&W FMJ, black powder", + "name": { "str": ".40 S&W FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -43,7 +43,7 @@ "id": "bp_40sw", "copy-from": "40sw", "type": "AMMO", - "name": ".40 S&W JHP, black powder", + "name": { "str": ".40 S&W JHP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -52,7 +52,7 @@ "id": "reloaded_40fmj", "copy-from": "40fmj", "type": "AMMO", - "name": ".40 S&W FMJ, reloaded", + "name": { "str": ".40 S&W FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -61,7 +61,7 @@ "id": "reloaded_40sw", "copy-from": "40sw", "type": "AMMO", - "name": ".40 S&W JHP, reloaded", + "name": { "str": ".40 S&W JHP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/410shot.json b/data/json/items/ammo/410shot.json index ff8b57f9c4019..5fb3e68f0b482 100644 --- a/data/json/items/ammo/410shot.json +++ b/data/json/items/ammo/410shot.json @@ -2,7 +2,7 @@ { "id": "410shot_000", "type": "AMMO", - "name": ".410 000 shot", + "name": { "str": ".410 000 shot" }, "description": "A .410 shell with 5 000 pellets. Good for a hunting or combat load.", "weight": "16 g", "volume": "250 ml", @@ -25,7 +25,7 @@ "id": "reloaded_410shot_000", "copy-from": "410shot_000", "type": "AMMO", - "name": ".410 000 shot, reloaded", + "name": { "str": ".410 000 shot, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/44.json b/data/json/items/ammo/44.json index 9f4260ea91cd5..42d1405c8ea4e 100644 --- a/data/json/items/ammo/44.json +++ b/data/json/items/ammo/44.json @@ -3,14 +3,14 @@ "id": "44fmj", "copy-from": "44magnum", "type": "AMMO", - "name": ".44 Magnum FMJ", + "name": { "str": ".44 Magnum FMJ" }, "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration slightly at the cost of reduced damage from expansion.", "relative": { "damage": -4, "pierce": 8 } }, { "id": "44magnum", "type": "AMMO", - "name": ".44 Magnum", + "name": { "str": ".44 Magnum" }, "description": ".44 magnum ammunition with 240gr JHP bullets. The .44 magnum round is one of the most powerful handgun cartridges available. It has excellent stopping power but suffers from extremely high recoil for a handgun round.", "weight": "13 g", "volume": "250 ml", @@ -34,7 +34,7 @@ "id": "reloaded_44fmj", "copy-from": "44fmj", "type": "AMMO", - "name": ".44 Magnum FMJ, reloaded", + "name": { "str": ".44 Magnum FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -43,7 +43,7 @@ "id": "reloaded_44magnum", "copy-from": "44magnum", "type": "AMMO", - "name": ".44 Magnum, reloaded", + "name": { "str": ".44 Magnum, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -52,7 +52,7 @@ "id": "bp_44magnum", "copy-from": "44magnum", "type": "AMMO", - "name": ".44 Magnum, black powder", + "name": { "str": ".44 Magnum, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -61,7 +61,7 @@ "id": "bp_44fmj", "copy-from": "44fmj", "type": "AMMO", - "name": ".44 Magnum FMJ, black powder", + "name": { "str": ".44 Magnum FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/44paper.json b/data/json/items/ammo/44paper.json index 868054794585d..4cc8e3d4f184a 100644 --- a/data/json/items/ammo/44paper.json +++ b/data/json/items/ammo/44paper.json @@ -2,7 +2,7 @@ { "id": "44army", "type": "AMMO", - "name": ".44 paper cartridge", + "name": { "str": ".44 paper cartridge" }, "description": "A paper cartridge containing a premeasured amount of black powder and a .44 projectile. Used by the Colt M1860 Army.", "weight": "7 g", "volume": "250 ml", From d850c6e3247549683cc8110821d3e1b48b948490 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:51:10 +0100 Subject: [PATCH 36/56] Magazine name to object (#38278) --- data/json/items/magazine/300.json | 2 +- data/json/items/magazine/357sig.json | 4 ++-- data/json/items/magazine/380.json | 2 +- data/json/items/magazine/40.json | 8 ++++---- data/json/items/magazine/45.json | 8 ++++---- data/json/items/magazine/66mm.json | 2 +- data/json/items/magazine/762x25.json | 4 ++-- data/json/items/magazine/9mm.json | 18 +++++++++--------- data/json/items/magazine/9x18.json | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/data/json/items/magazine/300.json b/data/json/items/magazine/300.json index 23a69b7c75eb8..dda92f3be0568 100644 --- a/data/json/items/magazine/300.json +++ b/data/json/items/magazine/300.json @@ -3,7 +3,7 @@ "id": "m2010mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": "M2010 ESR magazine", + "name": { "str": "M2010 ESR magazine" }, "description": "A 5-round box magazine used by M2010 ESR sniper rifle.", "weight": "78 g", "volume": "250 ml", diff --git a/data/json/items/magazine/357sig.json b/data/json/items/magazine/357sig.json index 6b71472d547d4..9d46cce55d777 100644 --- a/data/json/items/magazine/357sig.json +++ b/data/json/items/magazine/357sig.json @@ -3,7 +3,7 @@ "id": "p226mag_15rd_357sig", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "P226 .357 SIG magazine", + "name": { "str": "P226 .357 SIG magazine" }, "description": "A 15 round double stack box magazine for a SIG P226 chambered for .357 SIG rounds.", "weight": "150 g", "volume": "250 ml", @@ -20,7 +20,7 @@ "id": "p320mag_14rd_357sig", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "P320 .357 SIG magazine", + "name": { "str": "P320 .357 SIG magazine" }, "description": "A 14 round double stack box magazine for the SIG Sauer P320.", "weight": "105 g", "volume": "250 ml", diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json index 6a27a23e7e58a..9f19d12f5fa78 100644 --- a/data/json/items/magazine/380.json +++ b/data/json/items/magazine/380.json @@ -54,7 +54,7 @@ "id": "mac11mag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "MAC-11 magazine", + "name": { "str": "MAC-11 magazine" }, "description": "A cheap 32-round steel box magazine for use with the MAC-11 SMG.", "weight": "200 g", "volume": "737ml", diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json index bb035e62dea4d..117fbfc13fca7 100644 --- a/data/json/items/magazine/40.json +++ b/data/json/items/magazine/40.json @@ -106,7 +106,7 @@ "id": "ppq40mag_10rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ .40 S&W 10-round magazine", + "name": { "str": "PPQ .40 S&W 10-round magazine" }, "description": "A 10 round steel box magazine for the Walther PPQ .40 S&W.", "weight": "80 g", "volume": "200 ml", @@ -123,7 +123,7 @@ "id": "ppq40mag_12rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ .40 S&W 12-round magazine", + "name": { "str": "PPQ .40 S&W 12-round magazine" }, "description": "A 12 round steel box magazine for the Walther PPQ .40 S&W.", "weight": "80 g", "volume": "200 ml", @@ -140,7 +140,7 @@ "id": "ppq40mag_14rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ .40 S&W 14-round magazine", + "name": { "str": "PPQ .40 S&W 14-round magazine" }, "description": "A 14 round steel box magazine for the Walther PPQ .40 S&W.", "weight": "80 g", "volume": "200 ml", @@ -157,7 +157,7 @@ "id": "hptjcpmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Model JCP magazine", + "name": { "str": "Model JCP magazine" }, "description": "A 10-round steel box magazine for use with the Hi-Point Model JCP.", "weight": "110 g", "volume": "312 ml", diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json index eb3a83a920210..6daef3daa1204 100644 --- a/data/json/items/magazine/45.json +++ b/data/json/items/magazine/45.json @@ -37,7 +37,7 @@ "id": "mac10mag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "MAC-10 magazine", + "name": { "str": "MAC-10 magazine" }, "description": "A cheap 30-round steel box magazine for use with the MAC-10 SMG.", "weight": "210 g", "volume": "500 ml", @@ -54,7 +54,7 @@ "id": "smg_45_mag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "MAC-10 makeshift magazine", + "name": { "str": "MAC-10 makeshift magazine" }, "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with MAC-10 SMG.", "weight": "300 g", "volume": "750 ml", @@ -190,7 +190,7 @@ "id": "ppq45mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ .45 ACP magazine", + "name": { "str": "PPQ .45 ACP magazine" }, "description": "A 12 round steel box magazine for the Walther PPQ .45 ACP.", "weight": "80 g", "volume": "240 ml", @@ -207,7 +207,7 @@ "id": "hptjhpmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Model JHP magazine", + "name": { "str": "Model JHP magazine" }, "description": "A 9-round steel box magazine for use with the Hi-Point Model JHP.", "weight": "110 g", "volume": "353 ml", diff --git a/data/json/items/magazine/66mm.json b/data/json/items/magazine/66mm.json index e71dc78e09970..4a39b9755cb7d 100644 --- a/data/json/items/magazine/66mm.json +++ b/data/json/items/magazine/66mm.json @@ -3,7 +3,7 @@ "id": "m74_clip", "looks_like": "belt40mm", "type": "MAGAZINE", - "name": "M74 rocket clip", + "name": { "str": "M74 rocket clip" }, "description": "This is a clip for the M202A1 FLASH that can hold 4 M74 incendiary rockets.", "weight": "200 g", "volume": "500 ml", diff --git a/data/json/items/magazine/762x25.json b/data/json/items/magazine/762x25.json index f51467d0c37ae..b1c9419dee30f 100644 --- a/data/json/items/magazine/762x25.json +++ b/data/json/items/magazine/762x25.json @@ -3,7 +3,7 @@ "id": "ppshdrum", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "PPSh 71-round drum magazine", + "name": { "str": "PPSh 71-round drum magazine" }, "//": "Provisional.", "description": "A high-capacity drum magazine for the PPSh-41.", "weight": "1387 g", @@ -22,7 +22,7 @@ "id": "ppshmag", "looks_like": "mp5mag", "type": "MAGAZINE", - "name": "PPSh 35-round magazine", + "name": { "str": "PPSh 35-round magazine" }, "description": "A 35-round box magazine for the PPSh-41.", "weight": "470 g", "volume": "500 ml", diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index 0608951368aec..917b53d0da860 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -159,7 +159,7 @@ "id": "m9bigmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "M9 extended magazine", + "name": { "str": "M9 extended magazine" }, "description": "A 30-round extended magazine compatible with both the M9 handgun and some modern carbines.", "weight": "270 g", "volume": "500 ml", @@ -177,7 +177,7 @@ "id": "m9mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "M9 magazine", + "name": { "str": "M9 magazine" }, "description": "A military issue 15-round box magazine originally intended for use with the Beretta M9 handgun.", "weight": "135 g", "volume": "250 ml", @@ -194,7 +194,7 @@ "id": "mp5bigmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "MP5 extended magazine", + "name": { "str": "MP5 extended magazine" }, "description": "A drum magazine for use with the H&K MP5 SMG. Much greater capacity but less reliable the factory specification magazine.", "weight": "350 g", "volume": "750 ml", @@ -212,7 +212,7 @@ "id": "mp5mag", "//": "Tileset whitelist for SMG magazines", "type": "MAGAZINE", - "name": "MP5 magazine", + "name": { "str": "MP5 magazine" }, "description": "A standard capacity curved magazine for use with the H&K MP5 SMG.", "weight": "210 g", "volume": "500 ml", @@ -332,7 +332,7 @@ "id": "p320mag_17rd_9x19mm", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "P320 9x19mm magazine", + "name": { "str": "P320 9x19mm magazine" }, "description": "A 17 round double stack box magazine for the SIG Sauer P320.", "weight": "105 g", "volume": "250 ml", @@ -384,7 +384,7 @@ "id": "p38mag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "P38 magazine", + "name": { "str": "P38 magazine" }, "description": "An 8 round steel box magazine for the Walther P38.", "weight": "70 g", "volume": "228 ml", @@ -401,7 +401,7 @@ "id": "ppq9mag_10rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ 9x19mm 10-round magazine", + "name": { "str": "PPQ 9x19mm 10-round magazine" }, "description": "A 10 round steel box magazine for the Walther PPQ 9mm.", "weight": "80 g", "volume": "207 ml", @@ -418,7 +418,7 @@ "id": "ppq9mag_15rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ 9x19mm 15-round magazine", + "name": { "str": "PPQ 9x19mm 15-round magazine" }, "description": "A 15 round steel box magazine for the Walther PPQ 9mm.", "weight": "80 g", "volume": "207 ml", @@ -435,7 +435,7 @@ "id": "ppq9mag_17rd", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "PPQ 9x19mm 17-round magazine", + "name": { "str": "PPQ 9x19mm 17-round magazine" }, "description": "A 17 round steel box magazine for the Walther PPQ 9mm.", "weight": "80 g", "volume": "207 ml", diff --git a/data/json/items/magazine/9x18.json b/data/json/items/magazine/9x18.json index 3394056efa0b9..e898673a36d4b 100644 --- a/data/json/items/magazine/9x18.json +++ b/data/json/items/magazine/9x18.json @@ -3,7 +3,7 @@ "id": "makarovmag", "looks_like": "glock17_17", "type": "MAGAZINE", - "name": "Makarov PM magazine", + "name": { "str": "Makarov PM magazine" }, "description": "The standard magazine for the Pistolet Makarova, holds 8 rounds.", "weight": "60 g", "volume": "250 ml", From abdf29ad909a12122e29989069941ffd4ee67ce4 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:55:04 +0100 Subject: [PATCH 37/56] Generic name to object (#38277) --- data/json/items/generic/ammolink.json | 4 +-- data/json/items/generic/casing.json | 42 +++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json index 5b929b545f9aa..1728e0227a6d8 100644 --- a/data/json/items/generic/ammolink.json +++ b/data/json/items/generic/ammolink.json @@ -17,14 +17,14 @@ "id": "ammolink223", "copy-from": "ammolink", "type": "GENERIC", - "name": ".223 ammo belt linkage", + "name": { "str": ".223 ammo belt linkage" }, "use_action": { "type": "ammobelt", "belt": "belt223" } }, { "id": "ammolink308", "copy-from": "ammolink", "type": "GENERIC", - "name": ".308 ammo belt linkage", + "name": { "str": ".308 ammo belt linkage" }, "use_action": { "type": "ammobelt", "belt": "belt308" } }, { diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index d98503d4c3b81..d6347c0ff95cc 100644 --- a/data/json/items/generic/casing.json +++ b/data/json/items/generic/casing.json @@ -14,7 +14,7 @@ "id": "223_casing", "copy-from": "casing", "type": "GENERIC", - "name": ".223 casing", + "name": { "str": ".223 casing" }, "description": "An empty casing from a .223 round.", "weight": "5 g", "volume": "5ml" @@ -24,7 +24,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".22 LR casing", + "name": { "str": ".22 LR casing" }, "description": "An empty casing from a .22 LR round. These can't be hand-reloaded.", "weight": "2 g", "volume": "3ml" @@ -47,7 +47,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": ".30-06 casing", + "name": { "str": ".30-06 casing" }, "description": "An empty casing from a .30-06 round.", "weight": "7 g", "volume": "10ml" @@ -57,7 +57,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": ".270 Winchester casing", + "name": { "str": ".270 Winchester casing" }, "description": "An empty casing from a .270 Winchester round.", "weight": "7 g", "volume": "10ml" @@ -67,7 +67,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": ".300 Win Mag casing", + "name": { "str": ".300 Win Mag casing" }, "description": "An empty casing from a .300 Winchester Magnum round.", "weight": "7 g", "volume": "10ml" @@ -77,7 +77,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": ".308 casing", + "name": { "str": ".308 casing" }, "description": "An empty casing from a .308 round.", "weight": "6 g", "volume": "9ml" @@ -97,7 +97,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".32 ACP casing", + "name": { "str": ".32 ACP casing" }, "description": "An empty casing from a .32 ACP round.", "weight": "2 g", "volume": "3ml" @@ -107,7 +107,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".38 Special casing", + "name": { "str": ".38 Special casing" }, "description": "An empty casing from a .38 Special round.", "weight": "3 g", "volume": "4ml" @@ -117,7 +117,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".38 Super casing", + "name": { "str": ".38 Super casing" }, "description": "An empty casing from a .38 Super round.", "weight": "3 g", "volume": "4ml" @@ -127,7 +127,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".40 S&W casing", + "name": { "str": ".40 S&W casing" }, "description": "An empty casing from a .40 S&W round.", "weight": "3 g", "volume": "5ml" @@ -207,7 +207,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".44 Magnum casing", + "name": { "str": ".44 Magnum casing" }, "description": "An empty casing from a .44 Magnum round.", "weight": "4 g", "volume": "6ml" @@ -217,7 +217,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".454 Casull casing", + "name": { "str": ".454 Casull casing" }, "description": "An empty casing from a .454 Casull round.", "weight": "7 g", "volume": "10ml" @@ -227,7 +227,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".45 ACP casing", + "name": { "str": ".45 ACP casing" }, "description": "An empty casing from a .45 ACP round.", "weight": "4 g", "volume": "6ml" @@ -237,7 +237,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".45 Colt casing", + "name": { "str": ".45 Colt casing" }, "description": "An empty casing from a .45 Colt round.", "weight": "4 g", "volume": "6ml" @@ -247,7 +247,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".45-70 casing", + "name": { "str": ".45-70 casing" }, "description": "An empty casing from a .45-70 Government round.", "weight": "4 g", "volume": "10ml" @@ -267,7 +267,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".460 Rowland casing", + "name": { "str": ".460 Rowland casing" }, "description": "An empty casing from a .460 Rowland round. It looks deceptively like a .45ACP casing.", "weight": "4 g", "volume": "6ml" @@ -378,7 +378,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".357 SIG casing", + "name": { "str": ".357 SIG casing" }, "description": "An empty casing from a .357 SIG round.", "weight": "3 g", "volume": "5ml" @@ -388,7 +388,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".357 magnum casing", + "name": { "str": ".357 magnum casing" }, "description": "An empty casing from a .357 magnum round.", "weight": "3 g", "volume": "5ml" @@ -408,7 +408,7 @@ "copy-from": "casing", "looks_like": "9mm_casing", "type": "GENERIC", - "name": ".380 ACP casing", + "name": { "str": ".380 ACP casing" }, "description": "An empty casing from a .380 ACP round.", "weight": "3 g", "volume": "5ml" @@ -442,7 +442,7 @@ "id": "410shot_hull", "type": "GENERIC", "category": "spare_parts", - "name": ".410 hull", + "name": { "str": ".410 hull" }, "description": "An empty hull from a .410 shotgun shell.", "weight": "8 g", "volume": "12ml", @@ -458,7 +458,7 @@ "copy-from": "casing", "looks_like": "223_casing", "type": "GENERIC", - "name": ".300BLK casing", + "name": { "str": ".300BLK casing" }, "description": "An empty casing from a .300 AAC Blackout round.", "weight": "6 g", "volume": "9ml" From 92b0b2c36bb327017529b8d275f3f9477e1eb680 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:56:49 +0100 Subject: [PATCH 38/56] Bionic name to object (#38279) --- data/json/bionics.json | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index b6762f961b267..f3ef8ed2dda75 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -222,7 +222,7 @@ { "id": "bio_climate", "type": "bionic", - "name": "Internal Climate Control", + "name": { "str": "Internal Climate Control" }, "description": "Throughout your body lies a network of thermal piping, which eases the effects of high and low ambient temperatures when activated.", "occupied_bodyparts": [ [ "TORSO", 8 ], @@ -423,7 +423,7 @@ { "id": "bio_face_mask", "type": "bionic", - "name": "Facial Distortion", + "name": { "str": "Facial Distortion" }, "description": "Through controlled application of electrochemical impulses, you are capable of altering your facial structure so as to subtly affect the reactions of others. This grants a bonus to all social interactions.", "occupied_bodyparts": [ [ "HEAD", 3 ], [ "MOUTH", 1 ] ] }, @@ -452,14 +452,14 @@ { "id": "bio_fingerhack", "type": "bionic", - "name": "Fingerhack", + "name": { "str": "Fingerhack" }, "description": "One of your fingers has an electrohack surgically embedded in it; an all-purpose hacking unit used to override control panels and the like (but not computers). Skill in computers is important, and a failed use may damage your circuits.", "occupied_bodyparts": [ [ "HAND_R", 2 ] ] }, { "id": "bio_flashbang", "type": "bionic", - "name": "Flashbang Generator", + "name": { "str": "Flashbang Generator" }, "description": "Light emitting diodes surgically integrated into your skin can release a flash comparable to a flashbang grenade, blinding nearby enemies. Speakers integrated into your body mimic the loud sound, deafening those nearby.", "occupied_bodyparts": [ [ "TORSO", 20 ], [ "ARM_L", 2 ], [ "ARM_R", 2 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ], "act_cost": "10 kJ" @@ -488,14 +488,14 @@ { "id": "bio_glowy", "type": "bionic", - "name": "Glowy Thing", + "name": { "str": "Glowy Thing" }, "description": "You don't think that capacitor is *meant* to glow, but it does, and usually at bad times. A malfunctioning bionic randomly turns on and off, causing you to glow and making you visible in the dark without improving how much you can see in the slightest.", "flags": [ "BIONIC_FAULTY" ] }, { "id": "bio_geiger", "type": "bionic", - "name": "Integrated Dosimeter", + "name": { "str": "Integrated Dosimeter" }, "description": "Small radiation sensors have been surgically implanted throughout your body, allowing you to analyze your level of absorbed radiation. They will also alert you whenever exposed to environmental radiation.", "occupied_bodyparts": [ [ "TORSO", 2 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 1 ], [ "LEG_R", 1 ] ], "act_cost": "100 J" @@ -522,7 +522,7 @@ { "id": "bio_heat_absorb", "type": "bionic", - "name": "Heat Drain", + "name": { "str": "Heat Drain" }, "description": "While fighting unarmed against a warm-blooded opponent, there is a chance that a successful hit will drain body heat, inflicting a small amount of extra damage, and increasing your power reserves slightly.", "occupied_bodyparts": [ [ "TORSO", 12 ], @@ -563,7 +563,7 @@ { "id": "bio_hydraulics", "type": "bionic", - "name": "Hydraulic Muscles", + "name": { "str": "Hydraulic Muscles" }, "description": "While activated, your muscles will be greatly enhanced, increasing your strength by 20.", "occupied_bodyparts": [ [ "TORSO", 4 ], [ "ARM_L", 8 ], [ "ARM_R", 8 ], [ "LEG_L", 14 ], [ "LEG_R", 14 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], @@ -574,7 +574,7 @@ { "id": "bio_infrared", "type": "bionic", - "name": "Infrared Vision", + "name": { "str": "Infrared Vision" }, "description": "Your range of vision extends into the infrared, allowing you to see warm-blooded creatures in the dark or through smoke.", "occupied_bodyparts": [ [ "EYES", 1 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -594,7 +594,7 @@ { "id": "bio_itchy", "type": "bionic", - "name": "Itchy Metal Thing", + "name": { "str": "Itchy Metal Thing" }, "description": "A bionic of some sort, so badly installed that you cannot even tell what it was originally supposed to be. Sometimes it itches horribly.", "occupied_bodyparts": [ [ "TORSO", 3 ], [ "HEAD", 2 ], [ "HAND_L", 1 ], [ "HAND_R", 1 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -602,7 +602,7 @@ { "id": "bio_laser", "type": "bionic", - "name": "Finger-Mounted Laser", + "name": { "str": "Finger-Mounted Laser" }, "description": "One of your fingers has a small high-powered laser surgically embedded in it. This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.", "occupied_bodyparts": [ [ "HAND_R", 1 ] ], "act_cost": "30 kJ", @@ -631,7 +631,7 @@ { "id": "bio_lighter", "type": "bionic", - "name": "Finger Lighter", + "name": { "str": "Finger Lighter" }, "description": "The index fingers of both hands have powerful fire starters which extend from the tip.", "occupied_bodyparts": [ [ "HAND_L", 1 ], [ "HAND_R", 1 ] ], "fake_item": "fake_firestarter", @@ -640,7 +640,7 @@ { "id": "bio_lockpick", "type": "bionic", - "name": "Fingerpick", + "name": { "str": "Fingerpick" }, "description": "One of your fingers has an electronic lockpick surgically embedded in it. This automatic system will quickly unlock all but the most advanced key locks without any skill required on the part of the user.", "occupied_bodyparts": [ [ "HAND_R", 2 ] ], "act_cost": "50 J" @@ -716,7 +716,7 @@ { "id": "bio_night_vision", "type": "bionic", - "name": "Implanted Night Vision", + "name": { "str": "Implanted Night Vision" }, "description": "When active, this bionic will amplify existing light, allowing you to see in the dark.", "occupied_bodyparts": [ [ "EYES", 1 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -856,7 +856,7 @@ { "id": "bio_razors", "type": "bionic", - "name": "Fingertip Razors", + "name": { "str": "Fingertip Razors" }, "description": "You possess razor-sharp claws underneath your fingernails that do a small amount of unarmed slashing damage whenever your fingertips are uncovered.", "occupied_bodyparts": [ [ "HAND_L", 2 ], [ "HAND_R", 2 ] ], "fake_item": "fake_razor", @@ -1070,7 +1070,7 @@ { "id": "bio_tools", "type": "bionic", - "name": "Integrated Toolset", + "name": { "str": "Integrated Toolset" }, "description": "Surgically implanted in your hands and fingers is a set of tools - screwdriver, hammer, wrench, hacksaw, drill, welder, and heating elements. You can use this in place of many tools when crafting.", "occupied_bodyparts": [ [ "HAND_L", 3 ], [ "HAND_R", 3 ] ], "fake_item": "toolset", @@ -1080,7 +1080,7 @@ { "id": "bio_tools_extend", "type": "bionic", - "name": "Extended Toolset", + "name": { "str": "Extended Toolset" }, "description": "Extend or withdraw your integrated toolset to cut metal, pry things, or other stuff. This takes up your hands.", "fake_item": "toolset_extended", "included": true, @@ -1089,7 +1089,7 @@ { "id": "bio_torsionratchet", "type": "bionic", - "name": "Joint Torsion Ratchet", + "name": { "str": "Joint Torsion Ratchet" }, "description": "Your joints have been surgically equipped with torsion ratchets that slowly generate power when you move. Whilst this is toggled, moving will require more effort, though more power will be generated.", "occupied_bodyparts": [ [ "ARM_L", 8 ], [ "ARM_R", 8 ], [ "LEG_L", 12 ], [ "LEG_R", 12 ] ], "fuel_options": [ "muscle" ], @@ -1100,7 +1100,7 @@ { "id": "bio_jointservo", "type": "bionic", - "name": "Joint Servo", + "name": { "str": "Joint Servo" }, "description": "Your leg joints have been equipped with servomotors that provide power-assisted movement. They are optimized for running, but walking also 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.", "occupied_bodyparts": [ [ "LEG_L", 12 ], [ "LEG_R", 12 ] ], "flags": [ "BIONIC_TOGGLED" ] @@ -1127,7 +1127,7 @@ { "id": "bio_ups", "type": "bionic", - "name": "Internal Unified Power System", + "name": { "str": "Internal Unified Power System" }, "description": "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.", "occupied_bodyparts": [ [ "TORSO", 5 ] ], "flags": [ "BIONIC_TOGGLED" ] @@ -1143,7 +1143,7 @@ { "id": "bio_watch", "type": "bionic", - "name": "Internal Chronometer", + "name": { "str": "Internal Chronometer" }, "description": "You have been equipped with an internal atomic clock, ensuring that you will always know the current time. Additionally, it includes a silent alarm clock function.", "occupied_bodyparts": [ [ "HEAD", 1 ] ] }, @@ -1158,7 +1158,7 @@ { "id": "bio_fuel_cell_gasoline", "type": "bionic", - "name": "Gasoline Fuel Cell CBM", + "name": { "str": "Gasoline Fuel Cell CBM" }, "description": "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.", "occupied_bodyparts": [ [ "TORSO", 8 ] ], "encumbrance": [ [ "TORSO", 5 ] ], @@ -1172,7 +1172,7 @@ { "id": "bio_syringe", "type": "bionic", - "name": "Intravenous Needletip", + "name": { "str": "Intravenous Needletip" }, "description": "The flesh of the inside of your middle finger has been replaced with a tube leading into your arteries, with a retractable needle extending out of the tip of the finger when clenched. This lets you pump intravenous drugs like morphine directly into your bloodstream without needing to carry a syringe.", "occupied_bodyparts": [ [ "HAND_L", 1 ] ] }, @@ -1188,7 +1188,7 @@ { "id": "bio_shock_absorber", "type": "bionic", - "name": "Kinetic Shock Absorbers", + "name": { "str": "Kinetic Shock Absorbers" }, "description": "Most of the flesh in your arms, legs, and upper torso has been replaced with industrial-strength springs and protective padding. Clenching your fist allows you to fold and unfold this padding; while active, the hydraulic absorbers will prevent damage to your body from severe impacts, at the cost of impaired movement.", "occupied_bodyparts": [ [ "TORSO", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 1 ], [ "LEG_R", 1 ] ], "flags": [ "BIONIC_TOGGLED" ] From f29c9d2d6afc96988da0647e9224b8ed109beb88 Mon Sep 17 00:00:00 2001 From: Damien Wilson Date: Sun, 23 Feb 2020 19:50:26 -0800 Subject: [PATCH 39/56] Include JSON formatter binary in release. --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 57bf265f32de9..32aa5d037337a 100644 --- a/Makefile +++ b/Makefile @@ -165,6 +165,13 @@ ifdef MSYSTEM MSYS2 = 1 endif +# Determine JSON formatter binary name +ifeq ($(MSYS2), 1) + JSON_FORMATTER_BIN=tools/format/json_formatter.exe +else + JSON_FORMATTER_BIN=tools/format/json_formatter.cgi +endif + # Enable backtrace by default ifndef BACKTRACE # ...except not on native Windows builds, because the relevant headers are @@ -362,7 +369,7 @@ endif CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP TOOL_CXXFLAGS = -DCATA_IN_TOOL -BINDIST_EXTRAS += README.md data doc LICENSE.txt LICENSE-OFL-Terminus-Font.txt VERSION.txt +BINDIST_EXTRAS += README.md data doc LICENSE.txt LICENSE-OFL-Terminus-Font.txt VERSION.txt $(JSON_FORMATTER_BIN) BINDIST = $(BUILD_PREFIX)cataclysmdda-$(VERSION).tar.gz W32BINDIST = $(BUILD_PREFIX)cataclysmdda-$(VERSION).zip BINDIST_CMD = tar --transform=s@^$(BINDIST_DIR)@cataclysmdda-$(VERSION)@ -czvf $(BINDIST) $(BINDIST_DIR) @@ -1067,11 +1074,6 @@ endif JSON_FILES = $(shell find data -name "*.json" | sed "s|^\./||") JSON_WHITELIST = $(filter-out $(shell cat json_blacklist), $(JSON_FILES)) -ifeq ($(MSYS2), 1) - JSON_FORMATTER_BIN=tools/format/json_formatter.exe -else - JSON_FORMATTER_BIN=tools/format/json_formatter.cgi -endif style-json: $(JSON_WHITELIST) From 1c29e3d2df8cbf81b52c9638808a87e3a1375c3f Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Mon, 24 Feb 2020 06:39:04 +0000 Subject: [PATCH 40/56] Even more gcc warning options (#38222) * Add -Wlogical-op -Wrestrict These don't trigger anything in our code, but are useful gcc warnings to have enabled. * Remove redundant declarations * Remove unused macros * Fix format signedness * NULL -> nullptr * Guard dbg declaration in sounds.cpp * Enable a few more gcc warning options * Add -Wnon-virtual-dtor and virtual destructors This warning detects classes with virtual functions but a non-virtual destructor. Deleting instances through pointers whose type is such a class is undefined behaviour. I'm not certain whether any of the classes I've added the virtual destructors to here actually needed it, but there should be negligible performance impact, and it's a good warning to have enabled. * Remove -Wrestrict Turns out it's not actually supported by gcc 5.3. --- CMakeLists.txt | 8 +++++++- Makefile | 6 ++++++ src/behavior_strategy.h | 1 + src/crafting.cpp | 1 + src/crafting.h | 2 -- src/game.cpp | 2 ++ src/iexamine.cpp | 2 -- src/inventory_ui.h | 3 ++- src/item_stack.h | 1 + src/json.cpp | 2 -- src/main_menu.cpp | 2 -- src/mapgen_functions.cpp | 3 --- src/mission_companion.h | 1 - src/ncurses_def.cpp | 2 +- src/npctalk_funcs.cpp | 2 -- src/options.cpp | 2 -- src/overmap.cpp | 2 -- src/savegame_json.cpp | 2 -- src/sounds.cpp | 4 ++-- src/worldfactory.cpp | 2 -- tests/stomach_contents_test.cpp | 4 ++-- tools/format/getpost.h | 8 ++++---- 22 files changed, 29 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21089148f6b38..fc90e4be2b0a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,12 +221,18 @@ IF(MSVC) ELSE() SET(CATA_WARNINGS "-Werror -Wall -Wextra \ + -Wformat-signedness \ + -Wlogical-op \ -Wmissing-declarations \ -Wmissing-noreturn \ + -Wnon-virtual-dtor \ -Wold-style-cast \ -Woverloaded-virtual \ - -Wsuggest-override \ -Wpedantic \ + -Wredundant-decls \ + -Wsuggest-override \ + -Wunused-macros \ + -Wzero-as-null-pointer-constant \ -Wno-unknown-warning-option") # Compact the whitespace in the warning string string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}") diff --git a/Makefile b/Makefile index 57bf265f32de9..41ce984111283 100644 --- a/Makefile +++ b/Makefile @@ -89,12 +89,18 @@ RELEASE_FLAGS = WARNINGS = \ -Werror -Wall -Wextra \ + -Wformat-signedness \ + -Wlogical-op \ -Wmissing-declarations \ -Wmissing-noreturn \ + -Wnon-virtual-dtor \ -Wold-style-cast \ -Woverloaded-virtual \ -Wpedantic \ + -Wredundant-decls \ -Wsuggest-override \ + -Wunused-macros \ + -Wzero-as-null-pointer-constant \ -Wno-unknown-warning-option # Uncomment below to disable warnings #WARNINGS = -w diff --git a/src/behavior_strategy.h b/src/behavior_strategy.h index b5a374d67d76d..587367dddb7b8 100644 --- a/src/behavior_strategy.h +++ b/src/behavior_strategy.h @@ -18,6 +18,7 @@ struct behavior_return; class strategy_t { public: + virtual ~strategy_t() = default; virtual behavior_return evaluate( const oracle_t *subject, std::vector children ) const = 0; }; diff --git a/src/crafting.cpp b/src/crafting.cpp index e7401b9b379d5..78774615b05ea 100644 --- a/src/crafting.cpp +++ b/src/crafting.cpp @@ -17,6 +17,7 @@ #include "bionics.h" #include "calendar.h" #include "craft_command.h" +#include "crafting_gui.h" #include "debug.h" #include "flag.h" #include "game.h" diff --git a/src/crafting.h b/src/crafting.h index 18a00750e5fa0..1659a378d40a9 100644 --- a/src/crafting.h +++ b/src/crafting.h @@ -24,6 +24,4 @@ void remove_ammo( item &dis_item, player &p ); // same as above but for each item in the list void remove_ammo( std::list &dis_items, player &p ); -const recipe *select_crafting_recipe( int &batch_size ); - #endif diff --git a/src/game.cpp b/src/game.cpp index 63b6e08a4bacc..4c21e2a3249c1 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -6839,7 +6839,9 @@ static void centerlistview( const tripoint &active_item_position, int ui_width ) } +#if defined(TILES) #define MAXIMUM_ZOOM_LEVEL 4 +#endif void game::zoom_out() { #if defined(TILES) diff --git a/src/iexamine.cpp b/src/iexamine.cpp index f86cb3b4a1484..0bb3e725445f2 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -2512,8 +2512,6 @@ void iexamine::arcfurnace_full( player &, const tripoint &examp ) } //arc furnace end -void iexamine::fireplace( player &p, const tripoint &examp ); - void iexamine::autoclave_empty( player &p, const tripoint &examp ) { furn_id cur_autoclave_type = g->m.furn( examp ); diff --git a/src/inventory_ui.h b/src/inventory_ui.h index f1afe1ad7245e..331f4e2d21a2f 100644 --- a/src/inventory_ui.h +++ b/src/inventory_ui.h @@ -129,6 +129,7 @@ class inventory_selector_preset { public: inventory_selector_preset(); + virtual ~inventory_selector_preset() = default; /** Does this entry satisfy the basic preset conditions? */ virtual bool is_shown( const item_location & ) const { @@ -424,7 +425,7 @@ class inventory_selector { public: inventory_selector( player &u, const inventory_selector_preset &preset = default_preset ); - ~inventory_selector(); + virtual ~inventory_selector(); /** These functions add items from map / vehicles. */ void add_character_items( Character &character ); void add_map_items( const tripoint &target ); diff --git a/src/item_stack.h b/src/item_stack.h index 6df19649b0c6c..58da76cbf0c60 100644 --- a/src/item_stack.h +++ b/src/item_stack.h @@ -28,6 +28,7 @@ class item_stack using const_reverse_iterator = cata::colony::const_reverse_iterator; item_stack( cata::colony *items ) : items( items ) { } + virtual ~item_stack() = default; size_t size() const; bool empty() const; diff --git a/src/json.cpp b/src/json.cpp index c0d3bdee424d9..f7e4df07a6bf7 100644 --- a/src/json.cpp +++ b/src/json.cpp @@ -24,8 +24,6 @@ extern bool test_mode; // JSON parsing and serialization tools for Cataclysm-DDA. // For documentation, see the included header, json.h. -#define dbg(x) DebugLog((x), D_MAIN) << __FILE__ << ":" << __LINE__ << ": " - static bool is_whitespace( char ch ) { // These are all the valid whitespace characters allowed by RFC 4627. diff --git a/src/main_menu.cpp b/src/main_menu.cpp index c1244e251f07f..bca8cea985b9e 100644 --- a/src/main_menu.cpp +++ b/src/main_menu.cpp @@ -39,8 +39,6 @@ #include "pldata.h" #include "string_formatter.h" -#define dbg(x) DebugLog((DebugLevel)(x),D_GAME) << __FILE__ << ":" << __LINE__ << ": " - static const holiday current_holiday = holiday::none; void main_menu::on_move() const diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp index 901576ad030ef..1d57959794a89 100644 --- a/src/mapgen_functions.cpp +++ b/src/mapgen_functions.cpp @@ -173,9 +173,6 @@ void mapgen_rotate( map *m, oter_id terrain_type, bool north_is_down ) m->rotate( static_cast( north_is_down ? om_direction::opposite( dir ) : dir ) ); } -#define autorotate(x) mapgen_rotate(m, terrain_type, x) -#define autorotate_down() mapgen_rotate(m, terrain_type, true) - ///////////////////////////////////////////////////////////////////////////////////////////////// ///// builtin terrain-specific mapgen functions. big multi-overmap-tile terrains are located in ///// mapgen_functions_big.cpp diff --git a/src/mission_companion.h b/src/mission_companion.h index 70e70a40c5c49..f6992b01b13fb 100644 --- a/src/mission_companion.h +++ b/src/mission_companion.h @@ -71,7 +71,6 @@ namespace talk_function //Identifies which mission set the NPC draws from void companion_mission( npc &p ); -void basecamp_mission( npc &p ); // Display the available missions and let the player choose one bool display_and_choose_opts( mission_data &mission_key, const tripoint &omt_pos, diff --git a/src/ncurses_def.cpp b/src/ncurses_def.cpp index b4177e80f6046..8550acb7b7ffd 100644 --- a/src/ncurses_def.cpp +++ b/src/ncurses_def.cpp @@ -218,7 +218,7 @@ void catacurses::init_interface() } #if !defined(__CYGWIN__) // ncurses mouse registration - mousemask( BUTTON1_CLICKED | BUTTON3_CLICKED | REPORT_MOUSE_POSITION, NULL ); + mousemask( BUTTON1_CLICKED | BUTTON3_CLICKED | REPORT_MOUSE_POSITION, nullptr ); #endif // our curses wrapper does not support changing this behavior, ncurses must // behave exactly like the wrapper, therefor: diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp index a9d0e4cb3de61..0f896eb819ad3 100644 --- a/src/npctalk_funcs.cpp +++ b/src/npctalk_funcs.cpp @@ -52,8 +52,6 @@ struct itype; -#define dbg(x) DebugLog((DebugLevel)(x), D_NPC) << __FILE__ << ":" << __LINE__ << ": " - void spawn_animal( npc &p, const mtype_id &mon ); void talk_function::nothing( npc & ) diff --git a/src/options.cpp b/src/options.cpp index 7cce5d0437778..8e83461b55b59 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -41,8 +41,6 @@ #include #include -#define dbg(x) DebugLog((x), D_MAIN) << __FILE__ << ":" << __LINE__ << ": " - bool trigdist; bool use_tiles; bool log_from_top; diff --git a/src/overmap.cpp b/src/overmap.cpp index ef73b1407bad4..4c04f0e550080 100644 --- a/src/overmap.cpp +++ b/src/overmap.cpp @@ -60,8 +60,6 @@ class map_extra; #define MAX_ANT_SIZE 20 #define MIN_GOO_SIZE 1 #define MAX_GOO_SIZE 2 -#define MIN_RIFT_SIZE 6 -#define MAX_RIFT_SIZE 16 using oter_type_id = int_id; using oter_type_str_id = string_id; diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp index f9004820d816b..ddf5ea8e94a11 100644 --- a/src/savegame_json.cpp +++ b/src/savegame_json.cpp @@ -98,8 +98,6 @@ struct oter_type_t; struct mutation_branch; -#define dbg(x) DebugLog((DebugLevel)(x),D_GAME) << __FILE__ << ":" << __LINE__ << ": " - static const std::array obj_type_name = { { "OBJECT_NONE", "OBJECT_ITEM", "OBJECT_ACTOR", "OBJECT_PLAYER", "OBJECT_NPC", "OBJECT_MONSTER", "OBJECT_VEHICLE", "OBJECT_TRAP", "OBJECT_FIELD", "OBJECT_TERRAIN", "OBJECT_FURNITURE" diff --git a/src/sounds.cpp b/src/sounds.cpp index 1bce93d3eaf07..d7e79149576d4 100644 --- a/src/sounds.cpp +++ b/src/sounds.cpp @@ -56,9 +56,9 @@ # if defined(_WIN32) && !defined(_MSC_VER) # include "mingw.thread.h" # endif -#endif -#define dbg(x) DebugLog((x),D_SDL) << __FILE__ << ":" << __LINE__ << ": " +# define dbg(x) DebugLog((x),D_SDL) << __FILE__ << ":" << __LINE__ << ": " +#endif weather_type previous_weather; int prev_hostiles = 0; diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp index 3957f879c42ea..9c7e34fec03d2 100644 --- a/src/worldfactory.cpp +++ b/src/worldfactory.cpp @@ -34,8 +34,6 @@ using namespace std::placeholders; -#define dbg(x) DebugLog((x), D_MAIN) << __FILE__ << ":" << __LINE__ << ": " - // single instance of world generator std::unique_ptr world_generator; diff --git a/tests/stomach_contents_test.cpp b/tests/stomach_contents_test.cpp index 6b14e9993eee3..c7c14d2e625be 100644 --- a/tests/stomach_contents_test.cpp +++ b/tests/stomach_contents_test.cpp @@ -133,7 +133,7 @@ TEST_CASE( "starve_test_hunger3" ) unsigned int day = 0; do { if( print_tests ) { - printf( "day %d: %d\n", day, dummy.get_stored_kcal() ); + printf( "day %u: %d\n", day, dummy.get_stored_kcal() ); } pass_time( dummy, 1_days ); dummy.set_thirst( 0 ); @@ -163,7 +163,7 @@ TEST_CASE( "all_nutrition_starve_test" ) for( unsigned int day = 0; day <= 20; day++ ) { if( print_tests ) { - printf( "day %d: %d\n", day, dummy.get_stored_kcal() ); + printf( "day %u: %d\n", day, dummy.get_stored_kcal() ); } pass_time( dummy, 1_days ); dummy.set_thirst( 0 ); diff --git a/tools/format/getpost.h b/tools/format/getpost.h index 407449bbe19d1..1502fcb8415e0 100644 --- a/tools/format/getpost.h +++ b/tools/format/getpost.h @@ -44,7 +44,7 @@ inline std::string urlDecode( std::string str ) tmp[2] = str[i + 1]; tmp[3] = str[i + 2]; tmp[4] = '\0'; - tmpchar = static_cast( strtol( tmp, NULL, 0 ) ); + tmpchar = static_cast( strtol( tmp, nullptr, 0 ) ); temp += tmpchar; i += 2; continue; @@ -65,7 +65,7 @@ inline void initializeGet( std::map &Get ) std::string tmpkey, tmpvalue; std::string *tmpstr = &tmpkey; char *raw_get = getenv( "QUERY_STRING" ); - if( raw_get == NULL ) { + if( raw_get == nullptr ) { Get.clear(); return; } @@ -98,9 +98,9 @@ inline void initializePost( std::map &Post ) std::string *tmpstr = &tmpkey; int content_length; char *ibuffer; - char *buffer = NULL; + char *buffer = nullptr; char *strlength = getenv( "CONTENT_LENGTH" ); - if( strlength == NULL ) { + if( strlength == nullptr ) { Post.clear(); return; } From 875d138ffcf99e86349792d5addc7110edaa39db Mon Sep 17 00:00:00 2001 From: Tim Pollard Date: Mon, 24 Feb 2020 16:43:34 +1000 Subject: [PATCH 41/56] Decreasing how many Zombie brides and priests there are. (#38291) * Decreasing how many Zombie brides and priests there are. * Running JSON lint for the zombie brides JSON changes. --- data/json/monsterdrops/zombie_default.json | 26 ++++++++-------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/data/json/monsterdrops/zombie_default.json b/data/json/monsterdrops/zombie_default.json index a9fc595d367fd..70164ef5c6df1 100644 --- a/data/json/monsterdrops/zombie_default.json +++ b/data/json/monsterdrops/zombie_default.json @@ -31,9 +31,9 @@ }, { "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 ] } + { "item": "thawb", "prob": 1, "damage": [ 1, 4 ] }, + { "item": "cassock", "prob": 1, "damage": [ 1, 4 ] }, + { "item": "haori", "prob": 1, "damage": [ 1, 4 ] } ] }, { "group": "neckties", "prob": 15, "damage": [ 1, 4 ] }, @@ -70,7 +70,11 @@ "distribution": [ { "item": "gown", "prob": 10, "damage": [ 1, 4 ] }, { "item": "dress", "prob": 70, "damage": [ 1, 4 ] }, - { "item": "sundress", "prob": 50, "damage": [ 1, 4 ] } + { "item": "sundress", "prob": 45, "damage": [ 1, 4 ] }, + { + "collection": [ { "item": "dress_wedding", "damage": [ 1, 4 ] }, { "item": "veil_wedding", "damage": [ 1, 4 ] } ], + "prob": 5 + } ] }, { "group": "dress_shoes", "prob": 30, "damage": [ 1, 4 ] }, @@ -79,19 +83,7 @@ }, { "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 + "prob": 30 } ] } From 879356784f33f024890bc4c658f6466f92dcecc1 Mon Sep 17 00:00:00 2001 From: Fris0uman <41293484+Fris0uman@users.noreply.github.com> Date: Mon, 24 Feb 2020 07:52:58 +0100 Subject: [PATCH 42/56] Fix dark craftable PR (#38243) --- src/construction.cpp | 31 +++++++++++++++++++++---------- src/construction.h | 1 + 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/construction.cpp b/src/construction.cpp index 6926ba65ad141..1472f5712ee19 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -690,10 +690,15 @@ construction_id construction_menu( const bool blueprint ) } if( !blueprint ) { if( player_can_build( g->u, total_inv, constructs[select] ) ) { - place_construction( constructs[select] ); - uistate.last_construction = constructs[select]; + if( !player_can_see_to_build( g->u, constructs[select] ) ) { + add_msg( m_info, _( "It is too dark to construct right now." ) ); + } else { + place_construction( constructs[select] ); + uistate.last_construction = constructs[select]; + } exit = true; } else { + popup( _( "You can't build that!" ) ); draw_grid( w_con, w_list_width + w_list_x0 ); update_info = true; } @@ -733,7 +738,6 @@ bool player_can_build( player &p, const inventory &inv, const std::string &desc bool player_can_build( player &p, const inventory &inv, const construction &con ) { - if( p.has_trait( trait_DEBUG_HS ) ) { return true; } @@ -742,14 +746,21 @@ bool player_can_build( player &p, const inventory &inv, const construction &con return false; } - const bool can_build = con.requirements->can_make_with_inventory( inv, is_crafting_component ); - if( !can_build ) { - popup( _( "You can't build that!" ) ); - } else if( g->u.fine_detail_vision_mod() > 4 && !con.dark_craftable ) { - popup( _( "It is too dark to construct right now." ) ); - return false; + return con.requirements->can_make_with_inventory( inv, is_crafting_component ); +} + +bool player_can_see_to_build( player &p, const std::string &desc ) +{ + if( p.fine_detail_vision_mod() < 4 || p.has_trait( trait_DEBUG_HS ) ) { + return true; + } + std::vector cons = constructions_by_desc( desc ); + for( construction *&con : cons ) { + if( con->dark_craftable ) { + return true; + } } - return can_build; + return false; } bool can_construct( const std::string &desc ) diff --git a/src/construction.h b/src/construction.h index 49bab027cd766..5cf96cfce0e8f 100644 --- a/src/construction.h +++ b/src/construction.h @@ -120,6 +120,7 @@ construction_id construction_menu( bool blueprint ); void complete_construction( player *p ); bool can_construct( const construction &con, const tripoint &p ); bool player_can_build( player &p, const inventory &inv, const construction &con ); +bool player_can_see_to_build( player &p, const std::string &desc ); void check_constructions(); void finalize_constructions(); From d10f828baa4ae6b3539db22cd67b2b2066de1450 Mon Sep 17 00:00:00 2001 From: cosmiccoincidence <41941008+cosmiccoincidence@users.noreply.github.com> Date: Mon, 24 Feb 2020 01:54:28 -0500 Subject: [PATCH 43/56] add random town name string (#38242) --- src/output.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/output.cpp b/src/output.cpp index b441a8ca4252b..be21fc3f60cf7 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -1610,6 +1610,10 @@ void replace_name_tags( std::string &input ) replace_substring( input, "", Name::get( nameIsGivenName ), false ); } + while( input.find( "" ) != std::string::npos ) { + replace_substring( input, "", Name::get( nameIsTownName ), + false ); + } } void replace_city_tag( std::string &input, const std::string &name ) From f8c79aa4725b1883e8393d87c3f896b16bec5e6a Mon Sep 17 00:00:00 2001 From: Fris0uman <41293484+Fris0uman@users.noreply.github.com> Date: Mon, 24 Feb 2020 07:55:24 +0100 Subject: [PATCH 44/56] Move some description function to Character (#38236) --- src/character.cpp | 104 +++++++++++++++++++++++++++++++++++----------- src/character.h | 12 +++--- src/player.cpp | 87 -------------------------------------- src/player.h | 4 -- 4 files changed, 86 insertions(+), 121 deletions(-) diff --git a/src/character.cpp b/src/character.cpp index bd9844298ed85..fb1c6eb1d2377 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -3502,34 +3502,67 @@ std::pair Character::get_thirst_description() const std::pair Character::get_hunger_description() const { - int hunger = get_hunger(); + const bool calorie_deficit = get_bmi() < character_weight_category::normal; + const units::volume contains = stomach.contains(); + const units::volume cap = stomach.capacity( *this ); std::string hunger_string; nc_color hunger_color = c_white; - if( hunger >= 300 && get_starvation() > 2500 ) { - hunger_color = c_red; - hunger_string = _( "Starving!" ); - } else if( hunger >= 300 && get_starvation() > 1100 ) { - hunger_color = c_light_red; - hunger_string = _( "Near starving" ); - } else if( hunger > 250 ) { - hunger_color = c_light_red; - hunger_string = _( "Famished" ); - } else if( hunger > 100 ) { - hunger_color = c_yellow; - hunger_string = _( "Very hungry" ); - } else if( hunger > 40 ) { - hunger_color = c_yellow; - hunger_string = _( "Hungry" ); - } else if( hunger < -60 ) { - hunger_color = c_yellow; - hunger_string = _( "Engorged" ); - } else if( hunger < -20 ) { - hunger_color = c_green; - hunger_string = _( "Sated" ); - } else if( hunger < 0 ) { - hunger_color = c_green; - hunger_string = _( "Full" ); + // i ate just now! + const bool just_ate = stomach.time_since_ate() < 15_minutes; + // i ate a meal recently enough that i shouldn't need another meal + const bool recently_ate = stomach.time_since_ate() < 3_hours; + if( calorie_deficit ) { + if( contains >= cap ) { + hunger_string = _( "Engorged" ); + hunger_color = c_green; + } else if( contains > cap * 3 / 4 ) { + hunger_string = _( "Sated" ); + hunger_color = c_green; + } else if( just_ate && contains > cap / 2 ) { + hunger_string = _( "Full" ); + hunger_color = c_green; + } else if( just_ate ) { + hunger_string = _( "Hungry" ); + hunger_color = c_yellow; + } else if( recently_ate ) { + hunger_string = _( "Very Hungry" ); + hunger_color = c_yellow; + } else if( get_bmi() < character_weight_category::emaciated ) { + hunger_string = _( "Starving!" ); + hunger_color = c_red; + } else if( get_bmi() < character_weight_category::underweight ) { + hunger_string = _( "Near starving" ); + hunger_color = c_red; + } else { + hunger_string = _( "Famished" ); + hunger_color = c_light_red; + } + } else { + if( contains >= cap * 5 / 6 ) { + hunger_string = _( "Engorged" ); + hunger_color = c_green; + } else if( contains > cap * 11 / 20 ) { + hunger_string = _( "Sated" ); + hunger_color = c_green; + } else if( recently_ate && contains >= cap * 3 / 8 ) { + hunger_string = _( "Full" ); + hunger_color = c_green; + } else if( ( stomach.time_since_ate() > 90_minutes && contains < cap / 8 && recently_ate ) || + ( just_ate && contains > 0_ml && contains < cap * 3 / 8 ) ) { + hunger_string = _( "Peckish" ); + hunger_color = c_dark_gray; + } else if( !just_ate && ( recently_ate || contains > 0_ml ) ) { + hunger_string.clear(); + } else { + if( get_bmi() > character_weight_category::overweight ) { + hunger_string = _( "Hungry" ); + } else { + hunger_string = _( "Very Hungry" ); + } + hunger_color = c_yellow; + } } + return std::make_pair( hunger_string, hunger_color ); } @@ -3602,6 +3635,27 @@ int Character::get_sleep_deprivation() const return sleep_deprivation; } +std::pair Character::get_pain_description() const +{ + const std::pair pain = Creature::get_pain_description(); + nc_color pain_color = pain.second; + std::string pain_string; + // get pain color + if( get_perceived_pain() >= 60 ) { + pain_color = c_red; + } else if( get_perceived_pain() >= 40 ) { + pain_color = c_light_red; + } + // get pain string + if( ( has_trait( trait_SELFAWARE ) || has_effect( effect_got_checked ) ) && + get_perceived_pain() > 0 ) { + pain_string = string_format( "%s %d", _( "Pain " ), get_perceived_pain() ); + } else if( get_perceived_pain() > 0 ) { + pain_string = pain.first; + } + return std::make_pair( pain_string, pain_color ); +} + bool Character::is_deaf() const { return get_effect_int( effect_deaf ) > 2 || worn_with_flag( flag_DEAF ) || diff --git a/src/character.h b/src/character.h index ee37495b04842..75e8e37f4bc52 100644 --- a/src/character.h +++ b/src/character.h @@ -352,11 +352,13 @@ class Character : public Creature, public visitable virtual int get_thirst() const; /** Gets character's minimum hunger and thirst */ int stomach_capacity() const; - virtual std::pair get_thirst_description() const; - virtual std::pair get_hunger_description() const; - virtual std::pair get_fatigue_description() const; - virtual int get_fatigue() const; - virtual int get_sleep_deprivation() const; + std::pair get_thirst_description() const; + std::pair get_hunger_description() const; + std::pair get_fatigue_description() const; + int get_fatigue() const; + int get_sleep_deprivation() const; + + std::pair get_pain_description() const override; /** Modifiers for need values exclusive to characters */ virtual void mod_stored_kcal( int nkcal ); diff --git a/src/player.cpp b/src/player.cpp index ba6546e38462f..1baa50b7b0c7f 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -5683,90 +5683,3 @@ std::set player::get_path_avoid() const return ret; } - -std::pair 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( *this ); - std::string hunger_string; - nc_color hunger_color = c_white; - // i ate just now! - const bool just_ate = stomach.time_since_ate() < 15_minutes; - // i ate a meal recently enough that i shouldn't need another meal - const bool recently_ate = stomach.time_since_ate() < 3_hours; - if( calorie_deficit ) { - if( contains >= cap ) { - hunger_string = _( "Engorged" ); - hunger_color = c_green; - } else if( contains > cap * 3 / 4 ) { - hunger_string = _( "Sated" ); - hunger_color = c_green; - } else if( just_ate && contains > cap / 2 ) { - hunger_string = _( "Full" ); - hunger_color = c_green; - } else if( just_ate ) { - hunger_string = _( "Hungry" ); - hunger_color = c_yellow; - } else if( recently_ate ) { - hunger_string = _( "Very Hungry" ); - hunger_color = c_yellow; - } else if( get_bmi() < character_weight_category::emaciated ) { - hunger_string = _( "Starving!" ); - hunger_color = c_red; - } else if( get_bmi() < character_weight_category::underweight ) { - hunger_string = _( "Near starving" ); - hunger_color = c_red; - } else { - hunger_string = _( "Famished" ); - hunger_color = c_light_red; - } - } else { - if( contains >= cap * 5 / 6 ) { - hunger_string = _( "Engorged" ); - hunger_color = c_green; - } else if( contains > cap * 11 / 20 ) { - hunger_string = _( "Sated" ); - hunger_color = c_green; - } else if( recently_ate && contains >= cap * 3 / 8 ) { - hunger_string = _( "Full" ); - hunger_color = c_green; - } else if( ( stomach.time_since_ate() > 90_minutes && contains < cap / 8 && recently_ate ) || - ( just_ate && contains > 0_ml && contains < cap * 3 / 8 ) ) { - hunger_string = _( "Peckish" ); - hunger_color = c_dark_gray; - } else if( !just_ate && ( recently_ate || contains > 0_ml ) ) { - hunger_string.clear(); - } else { - if( get_bmi() > character_weight_category::overweight ) { - hunger_string = _( "Hungry" ); - } else { - hunger_string = _( "Very Hungry" ); - } - hunger_color = c_yellow; - } - } - - return std::make_pair( hunger_string, hunger_color ); -} - -std::pair player::get_pain_description() const -{ - auto pain = Creature::get_pain_description(); - nc_color pain_color = pain.second; - std::string pain_string; - // get pain color - if( get_perceived_pain() >= 60 ) { - pain_color = c_red; - } else if( get_perceived_pain() >= 40 ) { - pain_color = c_light_red; - } - // get pain string - if( ( has_trait( trait_SELFAWARE ) || has_effect( effect_got_checked ) ) && - get_perceived_pain() > 0 ) { - pain_string = string_format( "%s %d", _( "Pain " ), get_perceived_pain() ); - } else if( get_perceived_pain() > 0 ) { - pain_string = pain.first; - } - return std::make_pair( pain_string, pain_color ); -} diff --git a/src/player.h b/src/player.h index 27f86ebb3c03c..99be20fa30579 100644 --- a/src/player.h +++ b/src/player.h @@ -509,10 +509,6 @@ class player : public Character /** Handles the enjoyability value for a book. **/ int book_fun_for( const item &book, const player &p ) const; - std::pair get_hunger_description() const override; - - std::pair get_pain_description() const override; - int get_lift_assist() const; bool list_ammo( const item &base, std::vector &ammo_list, From 6cc80b3efc6355477e46203b9fc183cce3e5ab84 Mon Sep 17 00:00:00 2001 From: jkraybill Date: Mon, 24 Feb 2020 18:01:14 +1100 Subject: [PATCH 45/56] Translated fertilizer name for "ran out of fertilizer" message (#38261) --- src/activity_handlers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index 05c4a082744b2..d2a84768dd97d 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -4103,7 +4103,7 @@ void activity_handlers::fertilize_plot_do_turn( player_activity *act, player *p if( have_fertilizer() ) { iexamine::fertilize_plant( p, tile, fertilizer ); if( !have_fertilizer() ) { - add_msg( m_info, _( "You have run out of %s" ), fertilizer ); + add_msg( m_info, _( "You have run out of %s." ), item::nname( fertilizer ) ); } } }; From dc64c6e3101073d1d809ef061b57f101f8648222 Mon Sep 17 00:00:00 2001 From: eilaattwood Date: Mon, 24 Feb 2020 09:04:41 +0200 Subject: [PATCH 46/56] Converting multi-cooker to another item when it is filled with a dish. (#37794) * Converting multi-cooker to another item when filled with dish. To prevent other crafting processes to touch it when it is cooking. --- data/json/items/tool/cooking.json | 8 ++++++++ src/iuse.cpp | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index d7a380538424b..ca96a48d84859 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -660,6 +660,14 @@ ], "magazine_well": 2 }, + { + "id": "multi_cooker_filled", + "type": "TOOL", + "copy-from": "multi_cooker", + "name": { "str": "multi cooker - cooking" }, + "description": "A professional-grade multi-cooker, with a battery slot for camping trips or tailgating. There is a dish in it.", + "delete": { "qualities": [ [ "CONTAIN", 1 ] ] } + }, { "id": "oil_cooker", "type": "TOOL", diff --git a/src/iuse.cpp b/src/iuse.cpp index 46496ded0d2c9..2ef6f265bf322 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -8537,7 +8537,7 @@ int iuse::multicooker( player *p, item *it, bool t, const tripoint &pos ) it->contents.erase( dish_it ); it->erase_var( "RECIPE" ); - + it->convert( "multi_cooker" ); if( is_delicious ) { p->add_msg_if_player( m_good, _( "You got the dish from the multi-cooker. The %s smells delicious." ), @@ -8619,7 +8619,7 @@ int iuse::multicooker( player *p, item *it, bool t, const tripoint &pos ) p->add_msg_if_player( m_good, _( "The screen flashes blue symbols and scales as the multi-cooker begins to shake." ) ); - it->active = true; + it->convert( "multi_cooker_filled" ).active = true; it->ammo_consume( charges_to_start, pos ); p->practice( skill_cooking, meal->difficulty * 3 ); //little bonus From a31826a9c85a8034b5742ab7d324142b375d5536 Mon Sep 17 00:00:00 2001 From: Aloxaf Date: Mon, 24 Feb 2020 20:54:48 +0800 Subject: [PATCH 47/56] Fix translation of vehicle owner --- src/vehicle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index a7eea2a7ddaf5..0fb9e0c5902ea 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -4217,9 +4217,9 @@ std::string vehicle::get_owner_name() const { if( !g->faction_manager_ptr->get( owner ) ) { debugmsg( "vehicle::get_owner_name() vehicle %s has no valid nor null faction id ", disp_name() ); - return "no owner"; + return _( "no owner" ); } - return g->faction_manager_ptr->get( owner )->name; + return _( g->faction_manager_ptr->get( owner )->name ); } void vehicle::set_owner( const Character &c ) From dbe55a1f0b3cd6611e98908b4b79017c6fabf3da Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 16:10:42 +0100 Subject: [PATCH 48/56] container name to object, volume to string (#38281) * container name to object, volume to string * Update data/json/items/containers.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Update data/json/items/tool/container.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> * Update data/json/items/containers.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/items/containers.json | 46 ++++++++++++++--------------- data/json/items/tool/container.json | 4 +-- data/json/items/tool/med.json | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/json/items/containers.json b/data/json/items/containers.json index fb0200d9ddbe0..5dfccfbe251b9 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -3,7 +3,7 @@ "id": "2lcanteen", "type": "CONTAINER", "category": "container", - "name": "2.5L canteen", + "name": { "str": "2.5L canteen" }, "description": "A large plastic water canteen, with a 2.5 liter capacity and carrying strap.", "weight": "155 g", "volume": "2500 ml", @@ -23,7 +23,7 @@ "id": "30gal_barrel", "type": "CONTAINER", "category": "container", - "name": "30 gallon barrel", + "name": { "str": "30 gallon barrel" }, "description": "A huge plastic barrel with a resealable lid.", "weight": "6800 g", "volume": "112500 ml", @@ -80,7 +80,7 @@ "id": "bag_canvas", "type": "CONTAINER", "category": "container", - "name": "canvas sack", + "name": { "str": "canvas sack" }, "description": "A large and sturdy canvas sack. Smells faintly of earth and hard work.", "weight": "415 g", "volume": "1 L", @@ -97,7 +97,7 @@ "id": "bag_canvas_small", "type": "CONTAINER", "category": "container", - "name": "canvas bag", + "name": { "str": "canvas bag" }, "description": "Small bag made of canvas. Looks fine to store dried herbs in.", "weight": "5 g", "volume": "250 ml", @@ -149,7 +149,7 @@ "id": "bag_body_bag", "type": "CONTAINER", "category": "container", - "name": "body bag", + "name": { "str": "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.", "weight": "500 g", @@ -167,11 +167,11 @@ "id": "bag_iv", "type": "CONTAINER", "category": "container", - "name": "IV bag", + "name": { "str": "IV bag" }, "description": "A small, sealed plastic bag for liquids used in intravenous therapy.", "looks_like": "bag_plastic", "weight": "10 g", - "volume": 0, + "volume": "50 ml", "price": 0, "to_hit": -1, "rigid": false, @@ -187,7 +187,7 @@ "id": "bottle_glass", "type": "CONTAINER", "category": "container", - "name": "glass bottle", + "name": { "str": "glass bottle" }, "description": "A resealable glass bottle, holds 750 ml of liquid.", "weight": "200 g", "volume": "750 ml", @@ -257,7 +257,7 @@ "id": "bowl_clay", "type": "CONTAINER", "category": "container", - "name": "clay bowl", + "name": { "str": "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", "volume": "250 ml", @@ -370,7 +370,7 @@ "id": "can_drink", "type": "CONTAINER", "category": "container", - "name": "aluminum can", + "name": { "str": "aluminum can" }, "description": "An aluminum can, like what soda comes in.", "weight": "13 g", "volume": "250 ml", @@ -541,7 +541,7 @@ "id": "clay_canister", "type": "CONTAINER", "category": "container", - "name": "clay canister", + "name": { "str": "clay canister" }, "description": "A fragile clay vessel. It can be used to make crude impact grenades or to store liquid.", "weight": "268 g", "volume": "250 ml", @@ -559,7 +559,7 @@ "id": "clay_hydria", "type": "CONTAINER", "category": "container", - "name": "clay hydria", + "name": { "str": "clay hydria" }, "description": "A 15-liter clay pot with three handles for carrying and for pouring.", "weight": "1955 g", "volume": "15 L", @@ -624,7 +624,7 @@ "id": "flask_glass", "type": "CONTAINER", "category": "container", - "name": "glass flask", + "name": { "str": "glass flask" }, "description": "A 250 ml laboratory conical flask, with a rubber bung.", "weight": "48 g", "volume": "250 ml", @@ -662,7 +662,7 @@ "id": "beaker", "type": "CONTAINER", "category": "container", - "name": "beaker", + "name": { "str": "beaker" }, "description": "A 250ml laboratory beaker. Basically a cup with delusions of grandeur.", "weight": "150 g", "volume": "250ml", @@ -680,7 +680,7 @@ "id": "gradcylinder", "type": "CONTAINER", "category": "container", - "name": "graduated cylinder", + "name": { "str": "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", "volume": "100ml", @@ -737,7 +737,7 @@ "id": "jar_3l_glass", "type": "CONTAINER", "category": "container", - "name": "3L glass jar", + "name": { "str": "3L glass jar" }, "description": "A three-liter glass jar with a metal screw top lid, used for canning.", "weight": "365 g", "volume": "3 L", @@ -768,7 +768,7 @@ "id": "jar_glass", "type": "CONTAINER", "category": "container", - "name": "glass jar", + "name": { "str": "glass jar" }, "description": "A half-liter glass jar with a metal screw top lid, used for canning.", "weight": "150 g", "volume": "500 ml", @@ -835,7 +835,7 @@ "id": "jug_clay", "type": "CONTAINER", "category": "container", - "name": "clay jug", + "name": { "str": "clay jug" }, "description": "A clay container with a lid, used to hold and pour liquids.", "weight": "400 g", "volume": "1 L", @@ -853,7 +853,7 @@ "id": "jug_plastic", "type": "CONTAINER", "category": "container", - "name": "gallon jug", + "name": { "str": "gallon jug" }, "description": "A standard plastic jug used for milk and household cleaning chemicals.", "weight": "190 g", "volume": "3750 ml", @@ -870,7 +870,7 @@ "id": "keg", "type": "CONTAINER", "category": "container", - "name": "aluminum keg", + "name": { "str": "aluminum keg" }, "description": "A reusable lightweight aluminum keg, used for shipping beer. It has a capacity of 50 liters.", "weight": "5040 g", "volume": "50 L", @@ -1135,10 +1135,10 @@ "id": "condom", "type": "CONTAINER", "category": "container", - "name": "condom", + "name": { "str": "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", - "volume": 0, + "volume": "15 ml", "price": 0, "to_hit": -5, "rigid": false, @@ -1155,7 +1155,7 @@ "type": "CONTAINER", "category": "other", "looks_like": "condom", - "name": "balloon", + "name": { "str": "balloon" }, "description": "A child's balloon. This could be used as a makeshift water container.", "copy-from": "condom" }, diff --git a/data/json/items/tool/container.json b/data/json/items/tool/container.json index f1e16010db225..cae773afeb10b 100644 --- a/data/json/items/tool/container.json +++ b/data/json/items/tool/container.json @@ -22,10 +22,10 @@ "id": "bottle_folding", "type": "CONTAINER", "category": "other", - "name": "foldable plastic bottle", + "name": { "str": "foldable plastic bottle" }, "description": "A non-rigid plastic bottle for easy storage, holds 500 ml of liquid.", "weight": "13 g", - "volume": 0, + "volume": "50 ml", "price": 0, "to_hit": 1, "rigid": false, diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index 8d4f934b86d86..6f97dfe4c2bb6 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -158,7 +158,7 @@ "id": "vacutainer", "type": "CONTAINER", "category": "tools", - "name": "blood draw kit", + "name": { "str": "blood draw kit" }, "description": "This is a kit for drawing blood, including a test tube for holding the sample. Use this tool to draw blood, either from yourself or from a corpse you are standing on.", "weight": "13 g", "volume": "250 ml", From 95e95ebd6c44e2443bb955f83ce3971e294662c2 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 20:32:39 +0100 Subject: [PATCH 49/56] Ammo name to object 3 (#38302) --- data/json/items/ammo/45.json | 16 ++++++++-------- data/json/items/ammo/454.json | 6 +++--- data/json/items/ammo/4570.json | 14 +++++++------- data/json/items/ammo/45colt.json | 4 ++-- data/json/items/ammo/460.json | 12 ++++++------ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/json/items/ammo/45.json b/data/json/items/ammo/45.json index 133789b21955e..4ca17c78a0c02 100644 --- a/data/json/items/ammo/45.json +++ b/data/json/items/ammo/45.json @@ -3,14 +3,14 @@ "id": "45_acp", "copy-from": "45_jhp", "type": "AMMO", - "name": ".45 ACP FMJ", + "name": { "str": ".45 ACP FMJ" }, "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.", "relative": { "damage": -3, "pierce": 6 } }, { "id": "45_jhp", "type": "AMMO", - "name": ".45 ACP JHP", + "name": { "str": ".45 ACP JHP" }, "description": ".45 ACP ammunition with 185gr JHP bullets. The .45 ACP round was developed to replace the .38 Long Colt cartridge in the early 20th century. It has good stopping power but above average recoil.", "weight": "10 g", "volume": "250 ml", @@ -34,7 +34,7 @@ "id": "45_super", "copy-from": "45_jhp", "type": "AMMO", - "name": ".45 ACP +P", + "name": { "str": ".45 ACP +P" }, "description": "Overpressure .45 ACP ammunition with 200gr JHP bullets. This +P ammunition has higher muzzle energy than typical loads leading to greater damage, accuracy and recoil.", "price": 210, "price_postapoc": 2800, @@ -45,7 +45,7 @@ "id": "bp_45_acp", "copy-from": "45_acp", "type": "AMMO", - "name": ".45 ACP FMJ, black powder", + "name": { "str": ".45 ACP FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -54,7 +54,7 @@ "id": "bp_45_jhp", "copy-from": "45_jhp", "type": "AMMO", - "name": ".45 ACP JHP, black powder", + "name": { "str": ".45 ACP JHP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -63,7 +63,7 @@ "id": "reloaded_45_acp", "copy-from": "45_acp", "type": "AMMO", - "name": ".45 FMJ, reloaded", + "name": { "str": ".45 FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -72,7 +72,7 @@ "id": "reloaded_45_jhp", "copy-from": "45_jhp", "type": "AMMO", - "name": ".45 ACP JHP, reloaded", + "name": { "str": ".45 ACP JHP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -81,7 +81,7 @@ "id": "reloaded_45_super", "copy-from": "45_super", "type": "AMMO", - "name": ".45 ACP +P, reloaded", + "name": { "str": ".45 ACP +P, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/454.json b/data/json/items/ammo/454.json index d01ac579f5827..b0d4961303e17 100644 --- a/data/json/items/ammo/454.json +++ b/data/json/items/ammo/454.json @@ -2,7 +2,7 @@ { "id": "454_Casull", "type": "AMMO", - "name": ".454 Casull", + "name": { "str": ".454 Casull" }, "description": ".454 Casull ammunition with 300gr jacketed soft point bullets. The .454 Casull round is derived from .45 Long Colt with a stronger, lengthened case. It is an exceptionally powerful cartridge with higher stopping power than many rifle rounds, although it suffers from extreme recoil making it unsuitable for most purposes.", "weight": "16 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "reloaded_454_Casull", "copy-from": "454_Casull", "type": "AMMO", - "name": ".454 Casull, reloaded", + "name": { "str": ".454 Casull, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -35,7 +35,7 @@ "id": "bp_454_Casull", "copy-from": "454_Casull", "type": "AMMO", - "name": ".454 Casull, black powder", + "name": { "str": ".454 Casull, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json index 2449723c81613..4281757d02983 100644 --- a/data/json/items/ammo/4570.json +++ b/data/json/items/ammo/4570.json @@ -2,7 +2,7 @@ { "id": "4570_sp", "type": "AMMO", - "name": ".45-70 SP", + "name": { "str": ".45-70 SP" }, "description": ".45-70 Government ammunition loaded with a 305 grain soft point round. One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.", "weight": "35 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "4570_pen", "copy-from": "4570_sp", "type": "AMMO", - "name": ".45-70 +P penetrator", + "name": { "str": ".45-70 +P penetrator" }, "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile. Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.", "price": 175, "price_postapoc": 5000, @@ -37,7 +37,7 @@ "id": "4570_low", "copy-from": "4570_sp", "type": "AMMO", - "name": ".45-70 LFN cowboy", + "name": { "str": ".45-70 LFN cowboy" }, "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms. Quite a bit less powerful than modern ammo, but still packs a punch.", "price": 250, "price_postapoc": 3500, @@ -47,7 +47,7 @@ "id": "reloaded_4570_sp", "copy-from": "4570_sp", "type": "AMMO", - "name": ".45-70 SP, reloaded", + "name": { "str": ".45-70 SP, reloaded" }, "description": ".45-70 Government ammunition loaded with a 305 grain soft point round. One 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.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -57,7 +57,7 @@ "id": "reloaded_4570_pen", "copy-from": "4570_pen", "type": "AMMO", - "name": ".45-70 +P penetrator, reloaded", + "name": { "str": ".45-70 +P penetrator, reloaded" }, "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile. Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics. This one has been hand-loaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -67,7 +67,7 @@ "id": "reloaded_4570_low", "copy-from": "4570_low", "type": "AMMO", - "name": ".45-70 LFN cowboy, reloaded", + "name": { "str": ".45-70 LFN cowboy, reloaded" }, "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms. Quite a bit less powerful than modern ammo, but still packs a punch. This one has been hand-loaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -78,7 +78,7 @@ "//": "***Add blackpowder effects once #30944 gets merged***", "copy-from": "4570_low", "type": "AMMO", - "name": ".45-70, black powder", + "name": { "str": ".45-70, black powder" }, "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications. Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch. This one has been hand-loaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.3 }, "extend": { "effects": [ "RECYCLED" ] }, diff --git a/data/json/items/ammo/45colt.json b/data/json/items/ammo/45colt.json index 4573c9dd03781..08ff0ce79828e 100644 --- a/data/json/items/ammo/45colt.json +++ b/data/json/items/ammo/45colt.json @@ -2,7 +2,7 @@ { "id": "45colt_jhp", "type": "AMMO", - "name": ".45 Colt JHP", + "name": { "str": ".45 Colt JHP" }, "description": ".45 Colt ammunition with 250gr jacketed hollow point bullets. Originally designed for the Colt Single Action Army, and still used for modern reproduction revolvers. Originally a black powder cartridge, modern loads can make this round competitive in the new era.", "weight": "12 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "reloaded_45colt_jhp", "copy-from": "45colt_jhp", "type": "AMMO", - "name": ".45 Colt JHP, reloaded", + "name": { "str": ".45 Colt JHP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/460.json b/data/json/items/ammo/460.json index af0dc1426c277..41709ca81f883 100644 --- a/data/json/items/ammo/460.json +++ b/data/json/items/ammo/460.json @@ -3,7 +3,7 @@ "id": "460_fmj", "copy-from": "460_rowland", "type": "AMMO", - "name": ".460 Rowland HCFN", + "name": { "str": ".460 Rowland HCFN" }, "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", "relative": { "damage": -4, "pierce": 8 } }, @@ -11,7 +11,7 @@ "id": "460_rowland", "copy-from": "44magnum", "type": "AMMO", - "name": ".460 Rowland", + "name": { "str": ".460 Rowland" }, "description": ".460 Rowland ammunition with 185gr JHP bullets. The .460 Rowland round is designed to emulate hard-hitting .44 magnum in common autoloading pistols. Like the .44, .460 Rowland has exceptional power - and recoil. It is almost dimensionally identical to .45ACP, save for having a longer case and deeper seated bullets to prevent ammunition mix-ups.", "ammo_type": "460", "casing": "460_casing", @@ -21,7 +21,7 @@ "id": "bp_460_fmj", "copy-from": "460_fmj", "type": "AMMO", - "name": ".460 Rowland FMJ, black powder", + "name": { "str": ".460 Rowland FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -30,7 +30,7 @@ "id": "bp_460_rowland", "copy-from": "460_rowland", "type": "AMMO", - "name": ".460 Rowland, black powder", + "name": { "str": ".460 Rowland, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -39,7 +39,7 @@ "id": "reloaded_460_fmj", "copy-from": "460_fmj", "type": "AMMO", - "name": ".460 Rowland FMJ, reloaded", + "name": { "str": ".460 Rowland FMJ, reloaded" }, "description": "A brass-jacketed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -49,7 +49,7 @@ "id": "reloaded_460_rowland", "copy-from": "460_rowland", "type": "AMMO", - "name": ".460 Rowland, reloaded", + "name": { "str": ".460 Rowland, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } From 58d1d9facf8d568930a87737fb16eb5837f196c7 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 20:33:19 +0100 Subject: [PATCH 50/56] bionic name to object (#38305) --- data/json/bionics.json | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/data/json/bionics.json b/data/json/bionics.json index f3ef8ed2dda75..be5a02dd5236d 100644 --- a/data/json/bionics.json +++ b/data/json/bionics.json @@ -50,7 +50,7 @@ { "id": "bio_armor_eyes", "type": "bionic", - "name": "Protective Lenses", + "name": { "str": "Protective Lenses" }, "description": "Your eye sockets have been surgically sealed with highly protective mirrored lenses and your tear ducts have been re-routed to your mouth. When you cry, you must spit out or swallow your tears.", "occupied_bodyparts": [ [ "EYES", 1 ] ], "env_protec": [ [ "EYES", 7 ] ], @@ -103,7 +103,7 @@ { "id": "bio_blade", "type": "bionic", - "name": "Monomolecular Blade", + "name": { "str": "Monomolecular Blade" }, "description": "A deadly foot-long blade made of advanced material now resides inside your forearm, capable of being extended through the back of your wrist at the cost of a small amount of power. Though exceptionally sharp, it will prevent you from holding anything else while extended.", "occupied_bodyparts": [ [ "ARM_R", 5 ], [ "HAND_R", 2 ] ], "act_cost": "50 J", @@ -124,7 +124,7 @@ { "id": "bio_blindfold", "type": "bionic", - "name": "Optical Dampers", + "name": { "str": "Optical Dampers" }, "description": "The lenses surgically installed over your eyes can be tinted to block out incoming light.", "included": true, "flags": [ "BIONIC_TOGGLED" ] @@ -478,7 +478,7 @@ { "id": "bio_tattoo_led", "type": "bionic", - "name": "LED Tattoo", + "name": { "str": "LED Tattoo" }, "description": "A small LED display just beneath your dermal layer can be illuminated on command to show patterns of your choice at dim or bright luminosity. It doesn't provide enough light to comfortably read or craft, but it can suffice if you have nothing else.", "act_cost": "1 J", "react_cost": "1 J", @@ -612,7 +612,7 @@ { "id": "bio_leaky", "type": "bionic", - "name": "Leaky Bionic", + "name": { "str": "Leaky Bionic" }, "description": "This botched piece of bionic hardware slowly leaks electrolytic compounds, piezoelectric nanomaterials, and other high-tech contaminants into your bloodstream. Needless to say, this is not good for your health.", "occupied_bodyparts": [ [ "TORSO", 5 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -620,7 +620,7 @@ { "id": "bio_leukocyte", "type": "bionic", - "name": "Leukocyte Breeder System", + "name": { "str": "Leukocyte Breeder System" }, "description": "You are equipped with bionic stimulators which augment your haematopoiesis system, allowing you to accelerate white blood cell production using bionic power. It is supposed to run continuously and may cause unpleasant side effects when turned off.", "occupied_bodyparts": [ [ "TORSO", 10 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ], @@ -656,7 +656,7 @@ { "id": "bio_membrane", "type": "bionic", - "name": "Nictating Membrane", + "name": { "str": "Nictating Membrane" }, "description": "Your eyes have a thin membrane that closes over your eyes while underwater, negating any vision penalties.", "occupied_bodyparts": [ [ "EYES", 1 ] ], "flags": [ "BIONIC_NPC_USABLE" ] @@ -675,7 +675,7 @@ { "id": "bio_metabolics", "type": "bionic", - "name": "Metabolic Interchange", + "name": { "str": "Metabolic Interchange" }, "description": "Your digestive system and power supply are interconnected; bionic energy is replenished by burning calories. Can be toggled on and off at will.", "occupied_bodyparts": [ [ "TORSO", 25 ] ], "fuel_options": [ "metabolism" ], @@ -694,7 +694,7 @@ { "id": "bio_nanobots", "type": "bionic", - "name": "Repair Nanobots", + "name": { "str": "Repair Nanobots" }, "description": "Inside your body is a fleet of tiny dormant robots. While activated they will flit about your body, repairing damage at 1 HP per minute and stopping bleeding at the cost of extra power and stored calories.", "occupied_bodyparts": [ [ "TORSO", 10 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], @@ -727,7 +727,7 @@ { "id": "bio_noise", "type": "bionic", - "name": "Noisemaker", + "name": { "str": "Noisemaker" }, "description": "A malfunctioning bionic. It will occasionally emit a loud burst of noise.", "occupied_bodyparts": [ [ "TORSO", 4 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 1 ], [ "LEG_R", 1 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -744,7 +744,7 @@ { "id": "bio_ods", "type": "bionic", - "name": "Offensive Defense System", + "name": { "str": "Offensive Defense System" }, "description": "A thin forcefield surrounds your body, continually draining power. This field does not deflect attacks, but rather delivers a strong shock, damaging unarmed attackers and those with a conductive weapon.", "occupied_bodyparts": [ [ "TORSO", 10 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ], "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ], @@ -772,7 +772,7 @@ { "id": "bio_power_armor_interface", "type": "bionic", - "name": "Power Armor Interface", + "name": { "str": "Power Armor Interface" }, "description": "Interfaces your power system with the internal charging port on suits of power armor, allowing them to draw from your bionic power banks.", "occupied_bodyparts": [ [ "TORSO", 4 ], [ "HEAD", 1 ] ], "flags": [ "BIONIC_ARMOR_INTERFACE", "BIONIC_TOGGLED" ], @@ -782,7 +782,7 @@ { "id": "bio_power_armor_interface_mkII", "type": "bionic", - "name": "Power Armor Interface Mk. II", + "name": { "str": "Power Armor Interface Mk. II" }, "description": "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.", "occupied_bodyparts": [ [ "TORSO", 3 ], [ "HEAD", 2 ] ], "flags": [ "BIONIC_ARMOR_INTERFACE", "BIONIC_TOGGLED" ], @@ -792,7 +792,7 @@ { "id": "bio_power_storage", "type": "bionic", - "name": "Power Storage", + "name": { "str": "Power Storage" }, "capacity": "100 kJ", "description": "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.", "flags": [ "BIONIC_NPC_USABLE" ] @@ -800,7 +800,7 @@ { "id": "bio_power_storage_mkII", "type": "bionic", - "name": "Power Storage Mk. II", + "name": { "str": "Power Storage Mk. II" }, "capacity": "250 kJ", "description": "A Compact Bionics Module that increases your power capacity by 250 kJ.", "flags": [ "BIONIC_NPC_USABLE" ] @@ -808,7 +808,7 @@ { "id": "bio_power_weakness", "type": "bionic", - "name": "Power Overload", + "name": { "str": "Power Overload" }, "description": "Damaged power circuits cause short-circuiting inside your muscles when your batteries are above 75% capacity, causing greatly reduced strength. This has no effect if you have no internal batteries.", "occupied_bodyparts": [ [ "TORSO", 3 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -816,7 +816,7 @@ { "id": "bio_probability_travel", "type": "bionic", - "name": "Probability Travel", + "name": { "str": "Probability Travel" }, "description": "Increases your body's wavelength, allowing you to quantum tunnel through walls, reappearing on the other side. Power drain in standby is minimal, but each tile tunneled through costs 250 bionic power.", "occupied_bodyparts": [ [ "TORSO", 20 ], [ "ARM_L", 2 ], [ "ARM_R", 2 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ], [ "FOOT_L", 1 ], [ "FOOT_R", 1 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -836,7 +836,7 @@ { "id": "bio_radscrubber", "type": "bionic", - "name": "Radiation Scrubber System", + "name": { "str": "Radiation Scrubber System" }, "description": "A system of advanced piezomechanical blood filters have been surgically implanted throughout your body, allowing you to purge yourself of absorbed radiation at the cost of some bionic power.", "occupied_bodyparts": [ [ "TORSO", 5 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 2 ], [ "LEG_R", 2 ] ], "flags": [ "BIONIC_NPC_USABLE" ], @@ -845,7 +845,7 @@ { "id": "bio_railgun", "type": "bionic", - "name": "Railgun", + "name": { "str": "Railgun" }, "description": "EM field generators in your arms double the range and damage of thrown iron and steel objects at a cost of 1 power per throw, causing them to leave a trail of electricity that can cause additional damage.", "occupied_bodyparts": [ [ "ARM_L", 5 ], [ "ARM_R", 5 ], [ "HAND_L", 1 ], [ "HAND_R", 1 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -865,7 +865,7 @@ { "id": "bio_recycler", "type": "bionic", - "name": "Recycler Unit", + "name": { "str": "Recycler Unit" }, "description": "Your digestive system has been outfitted with a series of filters and processors, allowing you to reclaim waste liquid and, to a lesser degree, nutrients. The net effect is a greatly reduced need to eat and drink.", "occupied_bodyparts": [ [ "TORSO", 15 ] ], "flags": [ "BIONIC_NPC_USABLE" ] @@ -873,7 +873,7 @@ { "id": "bio_remote", "type": "bionic", - "name": "Remote Controller", + "name": { "str": "Remote Controller" }, "description": "A small module connected to your brain allows you to interface with nearby devices with wireless capabilities.", "occupied_bodyparts": [ [ "HEAD", 2 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -891,7 +891,7 @@ { "id": "bio_scent_mask", "type": "bionic", - "name": "Olfactory Mask", + "name": { "str": "Olfactory Mask" }, "description": "While this system is powered, your body will produce very little odor, making it nearly impossible for creatures to track you by scent.", "occupied_bodyparts": [ [ "TORSO", 3 ], [ "HEAD", 1 ], [ "ARM_L", 1 ], [ "ARM_R", 1 ], [ "LEG_L", 1 ], [ "LEG_R", 1 ] ], "flags": [ "BIONIC_TOGGLED" ], @@ -956,7 +956,7 @@ { "id": "bio_spasm", "type": "bionic", - "name": "Motor Control Overstimulator", + "name": { "str": "Motor Control Overstimulator" }, "description": "One piezoelectric solenoid surgically installed backwards, two crossed wires, and four burned-out capacitors later you started falling on your face and writhing around at the least convenient times. This incorrectly-configured bionic periodically stuns you for a short duration.", "occupied_bodyparts": [ [ "HEAD", 3 ] ], "flags": [ "BIONIC_FAULTY" ] @@ -999,7 +999,7 @@ { "id": "bio_str_enhancer", "type": "bionic", - "name": "Muscle Augmentation", + "name": { "str": "Muscle Augmentation" }, "description": "Your muscular system has been surgically enhanced with myomer fibers, giving you a +2 bonus to strength.", "occupied_bodyparts": [ [ "TORSO", 6 ], [ "ARM_L", 4 ], [ "ARM_R", 4 ], [ "LEG_L", 8 ], [ "LEG_R", 8 ] ], "stat_bonus": [ [ "STR", 2 ] ], From 66e62f90e9d4299965b823d0ba48f35d969e441d Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 20:34:17 +0100 Subject: [PATCH 51/56] gun name to object (#38306) --- data/json/items/gun/3006.json | 2 +- data/json/items/gun/308.json | 2 +- data/json/items/gun/38.json | 4 ++-- data/json/items/gun/40.json | 2 +- data/json/items/gun/45colt.json | 4 ++-- data/json/items/gun/50.json | 2 +- data/json/items/gun/545x39.json | 4 ++-- data/json/items/gun/762.json | 2 +- data/json/items/gun/9mm.json | 6 +++--- data/json/items/gun/bio.json | 2 +- data/json/items/gun/shot.json | 12 ++++++------ data/json/items/gun/ups.json | 4 ++-- data/json/items/ranged/energy.json | 2 +- data/json/items/ranged/pneumatic.json | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 8e4984359e596..283ac134e4e62 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -119,7 +119,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Browning Automatic Rifle", + "name": { "str": "Browning Automatic Rifle" }, "description": "Designed near the end of World War I, the BAR provided fire support for the US Army from World War II all the way to the Vietnam War. Too much firepower to serve as a battle rifle, but not enough to be an ideal light machine gun, it still found a niche on the battlefield.", "weight": "8820 g", "volume": "2500 ml", diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 809918b20bc60..376f8abf3a70d 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -378,7 +378,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": "AR-10", + "name": { "str": "AR-10" }, "description": "Somewhat similar to the later AR-15, the AR-10 is a gas operated, rotating bolt rifle chambered for 7.62x51mm rounds.", "weight": "3290 g", "volume": "2 L", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index e9c57907d2d8a..29d0be12b4af2 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "2 Shot Special", + "name": { "str": "2 Shot Special" }, "//": "It's hard to say just how big this is, although it's (very large) pistol sized. But it is a handmade weapon.", "description": "A crudely made double barrel pistol firing 38 special ammo. Unfortunately, the name is less about the double barrels and more about the number of shots you'll get before it breaks down on you.", "weight": "750 g", @@ -39,7 +39,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "COP .357 Derringer", + "name": { "str": "COP .357 Derringer" }, "description": "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.", "weight": "800 g", "volume": "399 ml", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 90afa0ad6de7f..25b472c55bf6b 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -226,7 +226,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Browning Hi-Power .40 S&W", + "name": { "str": "Browning Hi-Power .40 S&W" }, "description": "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.", "weight": "900 g", "volume": "418 ml", diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index b0b0e8674a03f..6f7be1f0f1a40 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "Bond Arms Derringer", + "name": { "str": "Bond Arms Derringer" }, "description": "The Bond Arms Derringer is a series of multi-barrel compact pistols. Most commonly chambered for .45 Colt, with chambers long enough to accept .410 shotgun shells.", "weight": "595 g", "volume": "132 ml", @@ -38,7 +38,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Colt Lightning .45 Carbine", + "name": { "str": "Colt Lightning .45 Carbine" }, "description": "A modern reproduction of a Colt pump-action rifle. Originally chambered in .44-40, modern versions most commonly use .45 Colt, complementing the Single Action Army as a Cowboy Action Shooting firearm.", "weight": "2722 g", "volume": "1601 ml", diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index ec9a23ecce7ed..c05a9b6b3637c 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -91,7 +91,7 @@ "copy-from": "rifle_base", "looks_like": "ar15", "type": "GUN", - "name": "AI AS50", + "name": { "str": "AI AS50" }, "description": ".50 caliber anti-materiel rifle made by Accuracy International. With high accuracy for long range target and high fire rate, this weapon is still being used by Greek national guard.", "weight": "13330 g", "volume": "3500 ml", diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json index ccaf059c6259b..bae21510b1079 100644 --- a/data/json/items/gun/545x39.json +++ b/data/json/items/gun/545x39.json @@ -4,7 +4,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "AK-74M", + "name": { "str": "AK-74M" }, "//": "AKs likewise aren't commercially traded in the US, plus this is newer.", "description": "The successor to the well-known AK-47 rifle. It combines the reliability of the AK series with the high-velocity, lightweight 5.45x39mm cartridge.", "weight": "3400 g", @@ -43,7 +43,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "AN-94", + "name": { "str": "AN-94" }, "description": "Intended to replace the AK-74, this rifle uses a sophisticated mechanism to delay felt recoil, along with a very fast two-round burst mode. While its increased complexity prevented it from being adopted by the Russian military, it has seen service among their special forces.", "weight": "3850 g", "volume": "1750 ml", diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 6577a5ae2fea3..5dd9c538856c1 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -4,7 +4,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "AKM", + "name": { "str": "AKM" }, "description": "One of the most recognizable assault rifles ever made, the AKM is renowned for its durability even under the worst conditions.", "weight": "3300 g", "volume": "1750 ml", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 38156a7e2fd0c..251fd4c665cb3 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -343,7 +343,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Beretta M9A1", + "name": { "str": "Beretta M9A1" }, "description": "An iconic 9x19mm pistol, the M9 was the standard issue sidearm of US armed force from 1985 only until recently. It was formerly popular amongst law enforcement before the advent of commercially available polymer-framed handguns and the FBI's adoption of .40S&W.", "weight": "961 g", "volume": "528 ml", @@ -652,7 +652,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Browning Hi-Power 9x19mm", + "name": { "str": "Browning Hi-Power 9x19mm" }, "description": "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.", "weight": "900 g", "volume": "418 ml", @@ -731,7 +731,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "CZ-75", + "name": { "str": "CZ-75" }, "description": "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 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 pistol remains wildly popular among competition shooters.", "weight": "1000 g", "volume": "526 ml", diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json index e0a3bdf63d5ec..ce5ee399bfd83 100644 --- a/data/json/items/gun/bio.json +++ b/data/json/items/gun/bio.json @@ -70,7 +70,7 @@ { "id": "bio_lightning", "type": "GUN", - "name": "Chain Lightning", + "name": { "str": "Chain Lightning" }, "description": "this a pseudo item", "volume": "3 L", "price": 0, diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 61350d2cb8697..6b3a28d2e7fd0 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -4,7 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "12 gauge pistol", + "name": { "str": "12 gauge pistol" }, "description": "A single shot pistol that loads 12 gauge shotgun shells, handcrafted from scrap.", "weight": "828 g", "volume": "500 ml", @@ -37,7 +37,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": "12-gauge gatling gun", + "name": { "str": "12-gauge gatling gun" }, "description": "An electrically driven six barrel gatling shotgun, fed from handmade cloth belts. Even properly mounted, this seems like an unwieldy beast, and the six separate barrels make for difficult zeroing. The externally driven action means this is much less likely to jam.", "weight": "4980 g", "volume": "4500 ml", @@ -58,7 +58,7 @@ "id": "browning_a5", "copy-from": "shotgun_base", "type": "GUN", - "name": "Browning Auto 5", + "name": { "str": "Browning Auto 5" }, "description": "This humble looking shotgun was the earliest successful semi-automatic shotgun, and the second most successful in U.S. history, with over 2.7 million made between 1902 and 1998. The recoil tuning mechanism under the handguard and long dwell time of the action make for pleasant shooting.", "weight": "4100 g", "volume": "3525 ml", @@ -493,7 +493,7 @@ "id": "streetsweeper", "copy-from": "shotgun_base", "type": "GUN", - "name": "Cobray Streetsweeper", + "name": { "str": "Cobray Streetsweeper" }, "description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a destructive device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch.", "weight": "419 g", "volume": "3193 ml", @@ -509,7 +509,7 @@ "barrel_length": "36 ml", "default_mods": [ "grip" ], "built_in_mods": [ "wire_stock" ], - "modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "3-round", 3 ] ], + "modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "3 rd.", 3 ] ], "valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], @@ -626,7 +626,7 @@ "id": "winchester_1887", "copy-from": "shotgun_base", "type": "GUN", - "name": "1887 bootleg shotgun", + "name": { "str": "1887 bootleg shotgun" }, "description": "One of the first commercially successful repeating shotguns, the Winchester 1887 was specifically made lever-action at Winchester's request. Though later overshadowed in success by pump designs, the 1887 remains popular today. This one has a very short barrel, no stock, and would pair nicely with a motorcycle jacket and a Harley Davidson.", "weight": "2994 g", "volume": "1127 ml", diff --git a/data/json/items/gun/ups.json b/data/json/items/gun/ups.json index 24958928ae1d8..0891e900ce498 100644 --- a/data/json/items/gun/ups.json +++ b/data/json/items/gun/ups.json @@ -42,7 +42,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 20, - "name": "CMES laser cannon", + "name": { "str": "CMES laser cannon" }, "description": "This is the integral weapon system for the CMES exoskeleton mech-suit, a rotating-barrel active-cooled rapid-fire laser system, can spray death downrange with ease.", "weight": "39500 g", "volume": "11 L", @@ -153,7 +153,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "A7 laser rifle", + "name": { "str": "A7 laser rifle" }, "description": "A state-of-the-art laser rifle developed by the R&D outfit \"Aerial Labs\". Initial performance rivaled Rivtech's finest, with rumors flying about corporate skulduggery. Though the Cataclysm put that on the ash heap of history, this weapon can still do the same to your foes.", "weight": "2950 g", "volume": "3 L", diff --git a/data/json/items/ranged/energy.json b/data/json/items/ranged/energy.json index d3c377ca2d9be..fcc4f4fd1bb6f 100644 --- a/data/json/items/ranged/energy.json +++ b/data/json/items/ranged/energy.json @@ -44,7 +44,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "light_blue", - "name": "Boeing XM-P plasma rifle", + "name": { "str": "Boeing XM-P plasma rifle" }, "description": "Boeing developed the focused plasma weaponry together with DARPA. It heats solid hydrogen to create plasma and envelops it with polymers to reduce blooming. While powerful, it suffers from short range. Powered by UPS.", "price": 1750000, "material": "steel", diff --git a/data/json/items/ranged/pneumatic.json b/data/json/items/ranged/pneumatic.json index af66b2282dfea..0d71278396011 100644 --- a/data/json/items/ranged/pneumatic.json +++ b/data/json/items/ranged/pneumatic.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "brown", - "name": "BB gun", + "name": { "str": "BB gun" }, "description": "Popular among children. It's fairly accurate, but BBs deal nearly no damage.", "price": 8000, "//": "You could get a Red Ryder at walmart for $32, but you'd shoot your eye out x_-", From 06b484f66cf15fda4b008ada1a5d504c5980a6b5 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 20:36:30 +0100 Subject: [PATCH 52/56] Tool name to object (#38307) --- data/json/items/tool/explosives.json | 44 +++++++++++++------------- data/json/items/tool/firefighting.json | 2 +- data/json/items/tool/lighting.json | 4 +-- data/json/items/tool/med.json | 2 +- data/json/items/tool/misc.json | 4 +-- data/json/items/tool/radio_tools.json | 4 +-- data/json/items/tool/science.json | 2 +- data/json/items/tool/workshop.json | 2 +- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 151da4befae5b..9d14ea60f34ba 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -3,7 +3,7 @@ "id": "acidbomb", "type": "TOOL", "category": "weapons", - "name": "acid bomb", + "name": { "str": "acid bomb" }, "description": "This is a fragile container filled with acid. Throw it to spill out a pool of potent acid.", "weight": "650 g", "volume": "500 ml", @@ -47,7 +47,7 @@ "id": "can_bomb_act", "copy-from": "can_bomb", "type": "TOOL", - "name": "active can bomb", + "name": { "str": "active can bomb" }, "description": "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.", "price": 0, "initial_charges": 5, @@ -66,7 +66,7 @@ "id": "c4", "type": "TOOL", "category": "weapons", - "name": "C-4 explosive", + "name": { "str": "C-4 explosive" }, "description": "This is military grade RDX composition explosive. A label reads: \"Highly explosive, use with extreme caution!\" It comes with a small timer.", "weight": "1570 g", "volume": "1 L", @@ -214,7 +214,7 @@ "id": "EMPbomb", "type": "TOOL", "category": "weapons", - "name": "EMP bomb", + "name": { "str": "EMP bomb" }, "description": "This substantial device is a bomb that generates an electromagnetic pulse. When activated, the plutonium fuel cell is drained into a flux compression generator, the detonation of which creates a strong magnetic field. When this magnetic field is fed into the antenna, it creates a strong electro-magnetic pulse.", "weight": "4543 g", "volume": "15500 ml", @@ -240,7 +240,7 @@ "id": "EMPbomb_act", "type": "TOOL", "category": "weapons", - "name": "active EMP bomb", + "name": { "str": "active EMP bomb" }, "description": "This EMP bomb is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy, as well as a sizeable explosion. You may not want to be holding it much longer.", "weight": "19515 g", "volume": "16 L", @@ -415,7 +415,7 @@ "id": "flashbang_act", "type": "TOOL", "category": "weapons", - "name": "active flashbang", + "name": { "str": "active flashbang" }, "description": "This flashbang is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby. It may be a good idea to throw it!", "weight": "236 g", "volume": "250 ml", @@ -468,7 +468,7 @@ "id": "fragment_bomb_act", "copy-from": "fragment_bomb", "type": "TOOL", - "name": "active fragment bomb", + "name": { "str": "active fragment bomb" }, "description": "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.", "price": 0, "initial_charges": 5, @@ -555,7 +555,7 @@ "id": "gasbomb_makeshift_act", "type": "TOOL", "category": "weapons", - "name": "active makeshift gas grenade", + "name": { "str": "active makeshift gas grenade" }, "description": "This homemade canister of poison gas has been unsealed, and is (or will shortly be) expelling highly toxic gas. You should consider getting rid of it soon.", "weight": "1264 g", "volume": "250 ml", @@ -609,7 +609,7 @@ "id": "grenade_act", "type": "TOOL", "category": "weapons", - "name": "active grenade", + "name": { "str": "active grenade" }, "description": "This is an active grenade, and will explode any second now. Better throw it!", "weight": "397 g", "volume": "250 ml", @@ -635,7 +635,7 @@ "id": "grenade_emp", "type": "TOOL", "category": "weapons", - "name": "EMP grenade", + "name": { "str": "EMP grenade" }, "description": "This is a grenade that generates an electromagnetic pulse with a low-inductance capacitor bank discharged into a single-loop antenna. Use this item to pull the pin and light the fuse, turning it into an active EMP grenade. You will then have three turns before it detonates, creating an EMP field that damages robots and drains bionic energy.", "weight": "400 g", "volume": "250 ml", @@ -662,7 +662,7 @@ "id": "grenade_emp_act", "type": "TOOL", "category": "weapons", - "name": "active EMP grenade", + "name": { "str": "active EMP grenade" }, "description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy. You may not want to be holding it much longer.", "weight": "400 g", "volume": "250 ml", @@ -714,7 +714,7 @@ "id": "grenade_inc_act", "type": "TOOL", "category": "weapons", - "name": "active incendiary grenade", + "name": { "str": "active incendiary grenade" }, "description": "This is an active incendiary grenade, likely to burst into an inferno any second now. Better throw it!", "weight": "180 g", "volume": "250 ml", @@ -858,7 +858,7 @@ "id": "makeshift_grenade_act", "copy-from": "makeshift_grenade", "type": "TOOL", - "name": "active makeshift grenade", + "name": { "str": "active makeshift grenade" }, "description": "This is an active grenade, and will explode any second now. Better throw it!", "price": 0, "rand_charges": [ 2, 7 ], @@ -924,7 +924,7 @@ "id": "molotov", "type": "TOOL", "category": "weapons", - "name": "Molotov cocktail", + "name": { "str": "Molotov cocktail" }, "description": "A bottle of flammable liquid with a rag inserted. Use this item to light the rag. You will, of course, need a lighter or matches in your inventory to do this. After lighting it, throw it to cause fires.", "weight": "742 g", "volume": "750 ml", @@ -999,7 +999,7 @@ "id": "nail_bomb_act", "copy-from": "nail_bomb", "type": "TOOL", - "name": "active nail bomb", + "name": { "str": "active nail bomb" }, "description": "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.", "price": 0, "initial_charges": 5, @@ -1044,7 +1044,7 @@ "id": "pipebomb_act", "type": "TOOL", "category": "weapons", - "name": "active pipe bomb", + "name": { "str": "active pipe bomb" }, "description": "This pipe bomb's fuse is lit, and it will explode any second now. Throw it immediately!", "weight": "1298 g", "volume": "500 ml", @@ -1096,7 +1096,7 @@ "id": "scrambler_act", "type": "TOOL", "category": "weapons", - "name": "active scrambler grenade", + "name": { "str": "active scrambler grenade" }, "description": "This scrambler grenade is active, and will soon detonate, releasing a control wave that temporarily converts robots to your side.", "weight": "500 g", "volume": "250 ml", @@ -1145,7 +1145,7 @@ "id": "tool_anfo_charge", "type": "TOOL", "category": "weapons", - "name": "ANFO charge", + "name": { "str": "ANFO charge" }, "description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. Use this item to light the fuse. You will then have twenty turns before it explodes and creates a large fireball.", "weight": "77800 g", "volume": "50 L", @@ -1176,7 +1176,7 @@ "id": "tool_anfo_charge_act", "type": "TOOL", "category": "weapons", - "name": "active ANFO charge", + "name": { "str": "active ANFO charge" }, "description": "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!", "weight": "77800 g", "volume": "50 L", @@ -1233,7 +1233,7 @@ "id": "tool_black_powder_charge_act", "type": "TOOL", "category": "weapons", - "name": "active black gunpowder charge", + "name": { "str": "active black gunpowder charge" }, "description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, whose fuse has been lit, its final countdown starting.", "weight": "6500 g", "volume": "4 L", @@ -1260,7 +1260,7 @@ "id": "tool_rdx_charge", "type": "TOOL", "category": "weapons", - "name": "RDX charge", + "name": { "str": "RDX charge" }, "description": "This is a metal keg, filled with 50 liters worth of RDX and scrap metal. Contains a core of primary explosive to ensure that the charge detonates completely and delivers its entire destructive power to everything in sight.", "weight": "106600 g", "volume": "50 L", @@ -1290,7 +1290,7 @@ "id": "tool_rdx_charge_act", "type": "TOOL", "category": "weapons", - "name": "active RDX charge", + "name": { "str": "active RDX charge" }, "description": "This is a metal keg, filled with 50 liters worth of RDX and scrap metal. 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.", "weight": "106600 g", "volume": "50 L", diff --git a/data/json/items/tool/firefighting.json b/data/json/items/tool/firefighting.json index f8c85953d8e65..80f9203ae973f 100644 --- a/data/json/items/tool/firefighting.json +++ b/data/json/items/tool/firefighting.json @@ -60,7 +60,7 @@ { "id": "halligan", "type": "TOOL", - "name": "Halligan bar", + "name": { "str": "Halligan bar" }, "description": "This is a heavy multiple-use tool commonly carried by firefighters, law enforcement, and military rescue units. Use it to open locked doors without destroying them or to lift manhole covers. You could also wield it to bash some heads in.", "weight": "3600 g", "volume": "1250 ml", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 8c4b407329b3a..b0c326ed05e09 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -307,7 +307,7 @@ { "id": "glowstick_lit", "type": "TOOL", - "name": "active glowstick", + "name": { "str": "active glowstick" }, "description": "This is an active glowstick and is producing light. It will last for a few hours before burning out.", "weight": "29 g", "volume": "250 ml", @@ -347,7 +347,7 @@ "id": "handflare_lit", "copy-from": "handflare", "type": "TOOL", - "name": "active flare", + "name": { "str": "active flare" }, "description": "This burning magnesium flare is producing light. It will last for about a half hour before burning out.", "color": "white", "turns_per_charge": 6, diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index 6f97dfe4c2bb6..ee7e1997581b8 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -59,7 +59,7 @@ { "id": "rx12_injector", "type": "TOOL", - "name": "RX12 jet injector", + "name": { "str": "RX12 jet injector" }, "description": "The Rivtech RX12 jet injector is a small pistol-shaped device used to inject advanced fast-healing chemicals through the skin without using a needle. A label on the side warns against using more than two doses per hour.", "weight": "316 g", "volume": "500 ml", diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 136f647ed331f..4d91a6e328bcf 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -240,7 +240,7 @@ "id": "kevlar_plate", "type": "TOOL", "category": "spare_parts", - "name": "Kevlar plate", + "name": { "str": "Kevlar plate" }, "description": "This is a plate of reinforced Kevlar. It could be used to repair items made of Kevlar.", "weight": "300 g", "volume": "250 ml", @@ -577,7 +577,7 @@ "id": "tear_gas_payload_act", "type": "TOOL", "category": "weapons", - "name": "active tear gas payload", + "name": { "str": "active tear gas payload" }, "description": "This is a dummy item used by tear gas hacks that just so happens to be counting down. You should never see it outside of debug.", "symbol": "*", "color": "dark_gray", diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json index 3fe8073bbbf3c..4ba4bb81255de 100644 --- a/data/json/items/tool/radio_tools.json +++ b/data/json/items/tool/radio_tools.json @@ -17,7 +17,7 @@ "id": "radiocontrol", "copy-from": "radio_car_box", "type": "TOOL", - "name": "RC control", + "name": { "str": "RC control" }, "description": "A remote control for RC cars, with joystick to steer the car and colorful buttons that don't seem to do anything. Perhaps they were for the deluxe model?", "symbol": "#", "color": "yellow", @@ -46,7 +46,7 @@ "id": "radio_car", "copy-from": "radio_car_box", "type": "TOOL", - "name": "RC car", + "name": { "str": "RC car" }, "description": "A remote-controlled car. Fun for young and old alike.", "symbol": "#", "ammo": "battery", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index c485ccbc46a87..05e62962724e6 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -236,7 +236,7 @@ "id": "weather_reader", "type": "TOOL", "category": "tools", - "name": "Doppler Radar Turbo 2000", + "name": { "str": "Doppler Radar Turbo 2000" }, "description": "A briefcase with built-in laptop that looks like it's from the 80s. Its vintage monochrome monitor displays a plethora of meteorological data. No sign of the FLDSMDFR, however.", "weight": "10 g", "volume": "2500 ml", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index a55c358189ae3..11f267cac77c4 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -42,7 +42,7 @@ { "id": "acetylene_machine", "type": "TOOL", - "name": "acetylene-gas machine", + "name": { "str": "acetylene-gas machine" }, "symbol": "&", "color": "light_gray", "description": "This bulky device takes water and calcium carbide and yields unpressurised acetylene.", From b03e1f5dae069a71f8155f3966462f33113373b7 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 20:36:54 +0100 Subject: [PATCH 53/56] Vitamins name to object (#38308) --- data/json/vitamin.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/vitamin.json b/data/json/vitamin.json index c60267600955e..369b4d945b566 100644 --- a/data/json/vitamin.json +++ b/data/json/vitamin.json @@ -3,7 +3,7 @@ "id": "calcium", "type": "vitamin", "vit_type": "vitamin", - "name": "Calcium", + "name": { "str": "Calcium" }, "deficiency": "hypocalcemia", "min": -12000, "rate": "15 m", @@ -13,7 +13,7 @@ "id": "iron", "type": "vitamin", "vit_type": "vitamin", - "name": "Iron", + "name": { "str": "Iron" }, "excess": "hypervitaminosis", "deficiency": "anemia", "min": -12000, @@ -25,7 +25,7 @@ "id": "vitA", "type": "vitamin", "vit_type": "vitamin", - "name": "Vitamin A", + "name": { "str": "Vitamin A" }, "excess": "hypervitaminosis", "deficiency": "hypovitA", "min": -8400, @@ -37,7 +37,7 @@ "id": "vitB", "type": "vitamin", "vit_type": "vitamin", - "name": "Vitamin B12", + "name": { "str": "Vitamin B12" }, "deficiency": "hypovitB", "min": -5600, "rate": "15 m", @@ -47,7 +47,7 @@ "id": "vitC", "type": "vitamin", "vit_type": "vitamin", - "name": "Vitamin C", + "name": { "str": "Vitamin C" }, "deficiency": "scurvy", "min": -5600, "rate": "15 m", @@ -57,7 +57,7 @@ "id": "mutant_toxin", "type": "vitamin", "vit_type": "toxin", - "name": "Toxins", + "name": { "str": "Toxins" }, "excess": "toxin_buildup", "min": 0, "max": 1800, @@ -68,7 +68,7 @@ "id": "bad_food", "type": "vitamin", "vit_type": "counter", - "name": "Disgusting Diet", + "name": { "str": "Disgusting Diet" }, "excess": "bad_food_ennui", "min": 0, "max": 40, From 01b7e6f6b03fbda8a53bcfb64ac33992b6c43ad1 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:21:33 +0100 Subject: [PATCH 54/56] Gun name to object --- data/json/items/gun/12mm.json | 2 +- data/json/items/gun/22.json | 2 +- data/json/items/gun/223.json | 10 +++++----- data/json/items/gun/3006.json | 2 +- data/json/items/gun/300BLK.json | 2 +- data/json/items/gun/308.json | 6 +++--- data/json/items/gun/32.json | 2 +- data/json/items/gun/380.json | 4 ++-- data/json/items/gun/40.json | 2 +- data/json/items/gun/44paper.json | 2 +- data/json/items/gun/45.json | 4 ++-- data/json/items/gun/46.json | 2 +- data/json/items/gun/57.json | 4 ++-- data/json/items/gun/700nx.json | 2 +- data/json/items/gun/9mm.json | 8 ++++---- data/json/items/gun/shot.json | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/data/json/items/gun/12mm.json b/data/json/items/gun/12mm.json index a4c5fda578565..5eb22ee2807ad 100644 --- a/data/json/items/gun/12mm.json +++ b/data/json/items/gun/12mm.json @@ -4,7 +4,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "H&K G80 railgun", + "name": { "str": "H&K G80 railgun" }, "description": "Developed by Heckler & Koch, this railgun magnetically propels a ferromagnetic projectile using an alternating current. Powered by UPS.", "weight": "3914 g", "volume": "2750 ml", diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index e49bf8f71a347..5b9d48917c4a4 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -304,7 +304,7 @@ "copy-from": "pistol_backup", "looks_like": "glock_17", "type": "GUN", - "name": "Jennings J-22", + "name": { "str": "Jennings J-22" }, "description": "One of the quintessential 'saturday night specials', the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame. Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.", "weight": "370 g", "volume": "123ml", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 6ea7cccf13784..ac03fcaa9ccb4 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -50,7 +50,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "HK416 A5", + "name": { "str": "HK416 A5" }, "//": "*Current* milspec gear is now ridiculously overpriced, as seen with the M2010 IRL.", "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable.", "weight": "3490 g", @@ -74,7 +74,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "H&K G36", + "name": { "str": "H&K G36" }, "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.", "weight": "3630 g", "volume": "2500 ml", @@ -96,7 +96,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "L2037 Backup", + "name": { "str": "L2037 Backup" }, "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.", "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.", "weight": "2370 g", @@ -124,7 +124,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "L523 platform", + "name": { "str": "L523 platform" }, "//": "Current milspec, so Expensive.", "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 base mechanism could--theoretically--be used on its own, but such use is inadvisable and will void your warranty. There's no real place to incorporate aftermarket modifications on this barren proto-weapon.", "weight": "2500 g", @@ -405,7 +405,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "FN SCAR-L", + "name": { "str": "FN SCAR-L" }, "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight .223 round.", "weight": "3300 g", "volume": "2250 ml", diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 283ac134e4e62..7ae956ca07a51 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -44,7 +44,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "M1 Garand", + "name": { "str": "M1 Garand" }, "description": "A semi-automatic .30-06 battle rifle, developed to replace the M1903 Springfield. It didn't completely supplant the older bolt-action until after World War II.", "weight": "4280 g", "volume": "2500 ml", diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index 71ee6500f52f0..220f6efca54ce 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -29,7 +29,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": "IWI Tavor X95 .300BLK", + "name": { "str": "IWI Tavor X95 .300BLK" }, "description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries. This is the civilian version chambered for .300 AAC Blackout.", "weight": "3610 g", "volume": "1500 ml", diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 376f8abf3a70d..02712684ef547 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -51,7 +51,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "M134D-H Minigun", + "name": { "str": "M134D-H Minigun" }, "description": "The M134D-H Minigun is a (relatively) lightweight heavy rotary machine gun. Its six barrels are rotated by an electric motor, powered by UPS or vehicle. If you could find enough ammo for it, it would become a devastating weapon. It must be mounted on a vehicle before use.", "weight": "19770 g", "volume": "6 L", @@ -331,7 +331,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "HK417 A2", + "name": { "str": "HK417 A2" }, "description": "A German battle rifle with a 13\" barrel and telescopic stock. It is a gas operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36.", "weight": "4220 g", "volume": "1750 ml", @@ -355,7 +355,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": "M110A1", + "name": { "str": "M110A1" }, "description": "A derivative of H&K's G28 with an aluminum upper receiver to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.", "weight": "4330 g", "volume": "2 L", diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 81e4bca732ee9..947c51f80db2b 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -118,7 +118,7 @@ "looks_like": "glock_17", "copy-from": "pistol_backup", "type": "GUN", - "name": "Kel-Tec P32", + "name": { "str": "Kel-Tec P32" }, "description": "One of Kel-tec's oldest designs, the P32 is a popular option for deep concealment and backup usage. Despite its extreme light weight and small size, its .32 ACP chambering makes for good handling and recoil control.", "weight": "186 g", "volume": "186ml", diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index e952d844bdb98..84b32c3d780eb 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -33,7 +33,7 @@ "copy-from": "pistol_backup", "looks_like": "glock_17", "type": "GUN", - "name": "FN 1910 .380", + "name": { "str": "FN 1910 .380" }, "description": "Made infamous in Sarajevo in 1914, the FN1910 was a popular pocket pistol, albeit in .32 ACP. Collectors value the .380 model for its notoriety and more modern terminal performance. If such a humble firearm could start a world war, could it perhaps protect you from the undead?", "weight": "590 g", "volume": "186ml", @@ -73,7 +73,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Hi-Point CF-380", + "name": { "str": "Hi-Point CF-380" }, "description": "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 with a zinc pot-metal which is relatively fragile compared to steel slides.", "weight": "820 g", "volume": "539 ml", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 25b472c55bf6b..0e50e23997253 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -265,7 +265,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Hi-Point Model JCP", + "name": { "str": "Hi-Point Model JCP" }, "description": "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.", "weight": "990 g", "volume": "703 ml", diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index 73f3f34eb0bb4..70cb7739bbe36 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -23,7 +23,7 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": "LeMat revolver", + "name": { "str": "LeMat revolver" }, "description": "A Pietta reproduction of the civil war era LeMat revolver, a rare and unusual cap & ball .44-caliber revolver. While its original non-standard .42 or .35 caliber curbed its usefulness for the CSA army, this reproduction is offered in more prevalent .44 caliber. Despite modern quality materials, the design is still rather delicate.", "weight": "1410 g", "volume": "851 ml", diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index 27cbf7e6e6f86..5ceb7e432bfda 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -43,7 +43,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "H&K UMP45", + "name": { "str": "H&K UMP45" }, "description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.", "weight": "2300 g", "volume": "1250 ml", @@ -341,7 +341,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Hi-Point Model JHP", + "name": { "str": "Hi-Point Model JHP" }, "description": "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.", "weight": "990 g", "volume": "720 ml", diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json index 2a09b016e5382..e47ec44c9fc29 100644 --- a/data/json/items/gun/46.json +++ b/data/json/items/gun/46.json @@ -4,7 +4,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "H&K MP7A2", + "name": { "str": "H&K MP7A2" }, "description": "Designed as a personal defense weapon, the MP7 fires the high-powered 4.6x30mm round while being lightweight, compact in size, and practically recoil free.", "weight": "1800 g", "volume": "2034 ml", diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index 48156a80cc4ea..178f008db45e0 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "FN Five-Seven", + "name": { "str": "FN Five-Seven" }, "description": "Designed to work with FN's proprietary 5.7x28mm round, the Five-Seven is a lightweight pistol with a very high capacity, best used against armored opponents.", "weight": "600 g", "volume": "551 ml", @@ -41,7 +41,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "FN P90", + "name": { "str": "FN P90" }, "description": "The first in a new genre of guns, termed \"personal defense weapons.\" FN designed the P90 to use their proprietary 5.7x28mm ammunition. It is made for firing bursts manageably.", "weight": "2640 g", "volume": "3817 ml", diff --git a/data/json/items/gun/700nx.json b/data/json/items/gun/700nx.json index b577db9f35a4d..8553a17909434 100644 --- a/data/json/items/gun/700nx.json +++ b/data/json/items/gun/700nx.json @@ -4,7 +4,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Elephant gun", + "name": { "str": "Elephant gun" }, "description": "A custom-made single shot rifle specially designed for the hunting of huge game. You could obviously kill everything with this, EVERYTHING. If you ever find enough ammo of course.", "weight": "8082 g", "volume": "3 L", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 251fd4c665cb3..0901a84db0bcb 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -45,7 +45,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Cx4 Storm", + "name": { "str": "Cx4 Storm" }, "description": "A small pistol caliber carbine designed for police use and civilian self-defense, the Cx4 Storm uses magazines that are interchangeable with other Beretta 9x19mm handguns.", "weight": "2580 g", "volume": "1500 ml", @@ -86,7 +86,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Glock 19", + "name": { "str": "Glock 19" }, "description": "Possibly the most popular pistol in existence. The Glock 19 is often derided for its plastic construction, but it is easy to shoot.", "weight": "600 g", "volume": "500 ml", @@ -307,7 +307,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "L39", + "name": { "str": "L39" }, "//": "L39s are based off the Robocop Auto-9, in turn a dolled-up Beretta 93R.", "description": "A semiautomatic 9x19mm handgun introduced by Leadworks LLC's, L39 provides accurate single-shot placement in a very robust frame with built in red dot and laser sights. Several urban legends describe using it in ways that would have destroyed a lesser weapon. Similar to other Leadworks products it doesn't accept third-party modifications.", "weight": "935 g", @@ -711,7 +711,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Hi-Point C-9", + "name": { "str": "Hi-Point C-9" }, "description": "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 with a zinc pot-metal which is relatively fragile compared to steel slides.", "weight": "820 g", "volume": "539 ml", diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 6b3a28d2e7fd0..33664ae49c2df 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -529,7 +529,7 @@ "id": "SPAS_12", "copy-from": "shotgun_base", "type": "GUN", - "name": "Franchi SPAS-12", + "name": { "str": "Franchi SPAS-12" }, "description": "Mean and intimidating looking, the SPAS 12 has the dubious honor of being declared a destructive device and being banned from import by name, adding to its already considerable appeal. It is a combination pump-action and semi-automatic firearm, with an arm stabilizing hook for one handed shooting.", "weight": "4400 g", "volume": "2768 ml", From 700e57991427a8243b5627675c8ffe7c1501e9fb Mon Sep 17 00:00:00 2001 From: Paul Fenwick Date: Sun, 23 Feb 2020 23:56:19 -0800 Subject: [PATCH 55/56] =?UTF-8?q?Lamp=20oil=20now=20has=20an=2080%=20time-?= =?UTF-8?q?saving=20at=204=20units.=20=F0=9F=AA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This matches the savings in other chemical processes which refine liquids. --- data/json/recipes/chem/fuel.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index af07cf82cd877..89b643aea3a45 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -81,6 +81,7 @@ "skill_used": "cooking", "difficulty": 2, "time": "30 m", + "batch_time_factors": [ 80, 4 ], "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], From 7f8d1db4538190dc8467d312a9345ae65246581b Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:50:03 +0100 Subject: [PATCH 56/56] Ammo name to object --- data/json/items/ammo.json | 2 +- data/json/items/ammo/10mm.json | 6 +++--- data/json/items/ammo/50.json | 16 ++++++++-------- data/json/items/ammo/500.json | 6 +++--- data/json/items/ammo/700nx.json | 4 ++-- data/json/items/ammo/atgm.json | 2 +- data/json/items/ammo/shot.json | 10 +++++----- data/json/items/ammo/shotpaper.json | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 3a256a3d8dc01..cc8207bee1041 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -436,7 +436,7 @@ "type": "AMMO", "id": "120mm_HEAT", "price": 999999, - "name": "120mm HEAT", + "name": { "str": "120mm HEAT" }, "symbol": "=", "color": "dark_gray", "description": "A 120mm high-explosive anti-tank round. It could ruin anyone's whole day.", diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json index 4cbddb568dcfe..6d8fbaf747cb2 100644 --- a/data/json/items/ammo/10mm.json +++ b/data/json/items/ammo/10mm.json @@ -2,7 +2,7 @@ { "id": "10mm_fmj", "type": "AMMO", - "name": "10mm Auto FMJ", + "name": { "str": "10mm Auto FMJ" }, "description": "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.", "weight": "9 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "bp_10mm_fmj", "copy-from": "10mm_fmj", "type": "AMMO", - "name": "10mm Auto FMJ, black powder", + "name": { "str": "10mm Auto FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -35,7 +35,7 @@ "id": "reloaded_10mm_fmj", "copy-from": "10mm_fmj", "type": "AMMO", - "name": "10mm Auto FMJ, reloaded", + "name": { "str": "10mm Auto FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json index 724628539399b..8dfb307b79028 100644 --- a/data/json/items/ammo/50.json +++ b/data/json/items/ammo/50.json @@ -3,7 +3,7 @@ "id": "50_incendiary", "copy-from": "50bmg", "type": "AMMO", - "name": ".50 BMG M17 tracer", + "name": { "str": ".50 BMG M17 tracer" }, "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.", "count": 10, "effects": [ "INCENDIARY" ], @@ -12,7 +12,7 @@ { "id": "50bmg", "type": "AMMO", - "name": ".50 BMG M33 Ball", + "name": { "str": ".50 BMG M33 Ball" }, "description": ".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.", "weight": "114 g", "volume": "250 ml", @@ -36,7 +36,7 @@ "id": "50match", "copy-from": "50bmg", "type": "AMMO", - "name": ".50 BMG Match", + "name": { "str": ".50 BMG Match" }, "description": ".50 BMG FMJ lead core ammunition manufactured with tighter tolerances for long-range competition shooting or other precision rifle use.", "count": 10, "relative": { "damage": 2, "pierce": -4 }, @@ -46,7 +46,7 @@ "id": "50ss", "copy-from": "50bmg", "type": "AMMO", - "name": ".50 BMG M2 AP", + "name": { "str": ".50 BMG M2 AP" }, "description": "Variant of the .50 BMG round that uses a core of very dense, hardened tungsten steel. Penetration is increased, but damage is reduced.", "count": 10, "relative": { "damage": -10, "pierce": 20 }, @@ -56,7 +56,7 @@ "id": "50_mk211", "copy-from": "50bmg", "type": "AMMO", - "name": ".50 BMG Raufoss Mk 211", + "name": { "str": ".50 BMG Raufoss Mk 211" }, "price": 60000, "price_postapoc": 120000, "description": "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.", @@ -69,7 +69,7 @@ "id": "reloaded_50_incendiary", "copy-from": "50_incendiary", "type": "AMMO", - "name": ".50 BMG tracer, reloaded", + "name": { "str": ".50 BMG tracer, reloaded" }, "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances. This one has been hand-reloaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -79,7 +79,7 @@ "id": "reloaded_50bmg", "copy-from": "50match", "type": "AMMO", - "name": ".50 BMG Match, reloaded", + "name": { "str": ".50 BMG Match, reloaded" }, "description": ".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.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -89,7 +89,7 @@ "id": "reloaded_50ss", "copy-from": "50ss", "type": "AMMO", - "name": ".50 BMG AP, reloaded", + "name": { "str": ".50 BMG AP, reloaded" }, "description": "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.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, diff --git a/data/json/items/ammo/500.json b/data/json/items/ammo/500.json index 30f3197bf2f9d..2ac6cbc49724c 100644 --- a/data/json/items/ammo/500.json +++ b/data/json/items/ammo/500.json @@ -2,7 +2,7 @@ { "id": "500_Magnum", "type": "AMMO", - "name": ".500 S&W Magnum", + "name": { "str": ".500 S&W Magnum" }, "description": ".500 S&W Magnum ammunition with 500gr bullets. The .500 S&W Magnum round is a colossally powerful handgun cartridge capable of killing almost any target with one hit. It has extremely high damage and recoil to match.", "weight": "15 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "bp_500_Magnum", "copy-from": "500_Magnum", "type": "AMMO", - "name": ".500 S&W Magnum, black powder", + "name": { "str": ".500 S&W Magnum, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -35,7 +35,7 @@ "id": "reloaded_500_Magnum", "copy-from": "500_Magnum", "type": "AMMO", - "name": ".500 S&W Magnum, reloaded", + "name": { "str": ".500 S&W Magnum, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json index b465b76f6d0c9..29ecd2716818c 100644 --- a/data/json/items/ammo/700nx.json +++ b/data/json/items/ammo/700nx.json @@ -2,7 +2,7 @@ { "id": "700nx", "type": "AMMO", - "name": ".700 NX", + "name": { "str": ".700 NX" }, "description": "The .700 Nitro Express 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.", "weight": "80 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "reloaded_700nx", "copy-from": "700nx", "type": "AMMO", - "name": ".700 NX, reloaded", + "name": { "str": ".700 NX, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/atgm.json b/data/json/items/ammo/atgm.json index 5984e6d07e6e5..777842d27a4c2 100644 --- a/data/json/items/ammo/atgm.json +++ b/data/json/items/ammo/atgm.json @@ -3,7 +3,7 @@ "type": "AMMO", "id": "atgm_heat", "price": 70000, - "name": "152mm ATGM HEAT", + "name": { "str": "152mm ATGM HEAT" }, "symbol": "=", "color": "dark_gray", "description": "A tube-launched, optically tracked, wire-guided missile contained in a steel tube. Designed to be highly effective against vehicles and structures.", diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json index 7aab8ca2aef7a..c2cf59b99ca72 100644 --- a/data/json/items/ammo/shot.json +++ b/data/json/items/ammo/shot.json @@ -21,7 +21,7 @@ "id": "reloaded_shot_00", "copy-from": "shot_00", "type": "AMMO", - "name": "00 shot, reloaded", + "name": { "str": "00 shot, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -66,7 +66,7 @@ "id": "bp_shot_00", "copy-from": "shot_00", "type": "AMMO", - "name": "00 shot, black powder", + "name": { "str": "00 shot, black powder" }, "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } }, @@ -91,7 +91,7 @@ { "id": "shot_00", "type": "AMMO", - "name": "00 shot", + "name": { "str": "00 shot" }, "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.", "weight": "32 g", "volume": "250 ml", @@ -173,7 +173,7 @@ "id": "shot_scrap", "copy-from": "shot_00", "type": "AMMO", - "name": "00 shot, scrap loaded", + "name": { "str": "00 shot, scrap loaded" }, "description": "A shotgun shell filled with whatever was lying around. They are more damaging than birdshot, but fairly inaccurate.", "proportional": { "price": 0.4, "damage": 0.6, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED" ] }, @@ -183,7 +183,7 @@ "id": "bp_shot_scrap", "copy-from": "shot_scrap", "type": "AMMO", - "name": "00 shot, black powder, scrap loaded", + "name": { "str": "00 shot, black powder, scrap loaded" }, "proportional": { "price": 0.6, "damage": 0.8 }, "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json index 8ba5ba25a6493..468187ba0dc89 100644 --- a/data/json/items/ammo/shotpaper.json +++ b/data/json/items/ammo/shotpaper.json @@ -36,7 +36,7 @@ "id": "shot_paper_slug", "copy-from": "shot_paper_00", "type": "AMMO", - "name": ".62 paper cartridge", + "name": { "str": ".62 paper cartridge" }, "description": "A paper cartridge containing a premeasured amount of black powder and a .605 inch lead ball.", "relative": { "range": 12, "pierce": 4 }, "delete": { "effects": [ "SHOT" ] },