Merge branch 'master' into patch-3

README.md

@@ -17,8 +17,9 @@ Your goal is to produce shapes by cutting, rotating, merging and painting parts
 -   Run `git lfs pull` to download sound assets
 -   Make sure `ffmpeg` is on your path
 -   Install Node.js and Yarn
--   Run `yarn` in the root folder, then run `yarn` in the `gulp/` folder
--   Cd into `gulp` and run `yarn gulp` - it should now open in your browser
+-   Run `yarn` in the root folder
+-   Cd into `gulp` folder
+-   Run `yarn` and then `yarn gulp` - it should now open in your browser
 
 **Notice**: This will produce a debug build with several debugging flags enabled. If you want to disable them, modify `config.js`.
 

res_built/atlas/atlas0_10.json

@@ -1383,6 +1383,6 @@
 	"format": "RGBA8888",
 	"size": {"w":690,"h":127},
 	"scale": "0.1",
-	"smartupdate": "$TexturePacker:SmartUpdate:402faa0126e6dcd814be979d8e838c46:68488838c03e95969cf7c09daf42f69a:f159918d23e5952766c6d23ab52278c6$"
+	"smartupdate": "$TexturePacker:SmartUpdate:4e5fb3bd7f1e5423e4fcea2215debe11:0c5d091d0b928944c68553dcc592c801:f159918d23e5952766c6d23ab52278c6$"
 }
 }

res_raw/atlas.tps

@@ -358,12 +358,16 @@
             <key type="filename">sprites/blueprints/belt_left.png</key>
             <key type="filename">sprites/blueprints/belt_right.png</key>
             <key type="filename">sprites/blueprints/belt_top.png</key>
+            <key type="filename">sprites/blueprints/wire_crossings-merger.png</key>
+            <key type="filename">sprites/blueprints/wire_crossings.png</key>
             <key type="filename">sprites/blueprints/wire_left.png</key>
             <key type="filename">sprites/blueprints/wire_right.png</key>
             <key type="filename">sprites/blueprints/wire_top.png</key>
             <key type="filename">sprites/buildings/belt_left.png</key>
             <key type="filename">sprites/buildings/belt_right.png</key>
             <key type="filename">sprites/buildings/belt_top.png</key>
+            <key type="filename">sprites/buildings/wire_crossings-merger.png</key>
+            <key type="filename">sprites/buildings/wire_crossings.png</key>
             <key type="filename">sprites/buildings/wire_left.png</key>
             <key type="filename">sprites/buildings/wire_right.png</key>
             <key type="filename">sprites/buildings/wire_top.png</key>
@@ -388,6 +392,7 @@
             <key type="filename">sprites/buildings/advanced_processor.png</key>
             <key type="filename">sprites/buildings/energy_generator.png</key>
             <key type="filename">sprites/buildings/painter-double.png</key>
+            <key type="filename">sprites/misc/energy_generator_overlay.png</key>
             <struct type="IndividualSpriteSettings">
                 <key>pivotPoint</key>
                 <point_f>0.5,0.5</point_f>

src/css/ingame_hud/waypoints.scss

@@ -49,16 +49,19 @@
         font-weight: bold;
 
         &:hover {
-            opacity: 1;
+            opacity: 0.8;
         }
 
-        .deleteButton {
+        .editButton {
             @include S(width, 10px);
             @include S(height, 10px);
             @include S(margin-left, 4px);
-            background: uiResource("icons/close.png") center center / 60% no-repeat;
+            background: uiResource("icons/edit_key.png") center center / 70% no-repeat;
             pointer-events: all;
             cursor: pointer;
+            position: relative;
+            @include IncreasedClickArea(2px);
+            transition: transform 0.04s ease-in-out;
 
             &:hover {
                 transform: scale(1.5);

src/js/changelog.js

@@ -13,10 +13,12 @@ export const CHANGELOG = [
             "Zoom towards mouse cursor (by Dimava)",
             "Updated the soundtrack again, it is now 20 minutes in total!",
             "Updated and added new translations (Thanks to all contributors!)",
+            "Allow editing waypoints (by isaisstillalive)",
             "Show confirmation when cutting area which is too expensive to get pasted again (by isaisstillalive)",
             "Show mouse and camera tile on debug overlay (F4) (by dengr)",
             "Fix tunnels entrances connecting to exits sometimes when they shouldn't",
             "The initial belt planner direction is now based on the cursor movement (by MizardX)",
+            "Fix preferred variant not getting saved when clicking on the hud (by Danacus)",
         ],
     },
     {

src/js/core/modal_dialog_elements.js

@@ -365,10 +365,12 @@ export class DialogWithForm extends Dialog {
      * @param {Application} param0.app
      * @param {string} param0.title
      * @param {string} param0.desc
-     * @param {string=} param0.confirmButton
+     * @param {array=} param0.buttons
+     * @param {string=} param0.confirmButtonId
+     * @param {string=} param0.extraButton
      * @param {Array<FormElement>} param0.formElements
      */
-    constructor({ app, title, desc, formElements, confirmButton = "ok:good" }) {
+    constructor({ app, title, desc, formElements, buttons = ["cancel", "ok:good"], confirmButtonId = "ok" }) {
         let html = "";
         html += desc + "<br>";
         for (let i = 0; i < formElements.length; ++i) {
@@ -379,14 +381,14 @@ export class DialogWithForm extends Dialog {
             app,
             title: title,
             contentHTML: html,
-            buttons: ["cancel:bad", confirmButton],
+            buttons: buttons,
             type: "info",
             closeButton: true,
         });
-        this.confirmButtonId = confirmButton.split(":")[0];
+        this.confirmButtonId = confirmButtonId;
         this.formElements = formElements;
 
-        this.enterHandler = "ok";
+        this.enterHandler = confirmButtonId;
     }
 
     internalButtonHandler(id, ...payload) {

src/js/core/utils.js

@@ -413,10 +413,10 @@ function roundSmart(n) {
 /**
  * Formats a big number
  * @param {number} num
- * @param {string=} divider THe divider for numbers like 50,000 (divider=',')
+ * @param {string=} separator The decimal separator for numbers like 50.1 (separator='.')
  * @returns {string}
  */
-export function formatBigNumber(num, divider = ".") {
+export function formatBigNumber(num, separator = T.global.decimalSeparator) {
     const sign = num < 0 ? "-" : "";
     num = Math.abs(num);
 
@@ -445,7 +445,10 @@ export function formatBigNumber(num, divider = ".") {
             }
         }
         const leadingDigitsRounded = round1Digit(leadingDigits);
-        const leadingDigitsNoTrailingDecimal = leadingDigitsRounded.toString().replace(".0", "");
+        const leadingDigitsNoTrailingDecimal = leadingDigitsRounded
+            .toString()
+            .replace(".0", "")
+            .replace(".", separator);
         return sign + leadingDigitsNoTrailingDecimal + suffix;
     }
 }
@@ -453,7 +456,7 @@ export function formatBigNumber(num, divider = ".") {
 /**
  * Formats a big number, but does not add any suffix and instead uses its full representation
  * @param {number} num
- * @param {string=} divider THe divider for numbers like 50,000 (divider=',')
+ * @param {string=} divider The divider for numbers like 50,000 (divider=',')
  * @returns {string}
  */
 export function formatBigNumberFull(num, divider = T.global.thousandsDivider) {
@@ -954,10 +957,13 @@ export function capitalizeFirstLetter(str) {
  * Formats a number like 2.5 to "2.5 items / s"
  * @param {number} speed
  * @param {boolean=} double
+ * @param {string=} separator The decimal separator for numbers like 50.1 (separator='.')
  */
-export function formatItemsPerSecond(speed, double = false) {
+export function formatItemsPerSecond(speed, double = false, separator = T.global.decimalSeparator) {
     return speed === 1.0
         ? T.ingame.buildingPlacement.infoTexts.oneItemPerSecond
-        : T.ingame.buildingPlacement.infoTexts.itemsPerSecond.replace("<x>", "" + round2Digits(speed)) +
-              (double ? "  " + T.ingame.buildingPlacement.infoTexts.itemsPerSecondDouble : "");
+        : T.ingame.buildingPlacement.infoTexts.itemsPerSecond.replace(
+              "<x>",
+              round2Digits(speed).toString().replace(".", separator)
+          ) + (double ? "  " + T.ingame.buildingPlacement.infoTexts.itemsPerSecondDouble : "");
 }

src/js/game/buildings/advanced_processor.js

@@ -94,9 +94,7 @@ export class MetaAdvancedProcessorBuilding extends MetaBuilding {
                     {
                         pos: new Vector(0, 1),
                         directions: [enumDirection.left],
-                        filter: enumItemType.shape,
                     },
-
                     {
                         pos: new Vector(0, 0),
                         directions: [enumDirection.top],

src/js/game/colors.js

@@ -143,7 +143,7 @@ export const enumColorMixingResults = {
 
     [c.black]: {
         // auto
-        [c.white]: c.white,
+        [c.white]: c.uncolored,
         [c.cyan]: c.cyan,
         [c.uncolored]: c.uncolored,
     },
@@ -153,8 +153,10 @@ export const enumColorMixingResults = {
 for (const color in enumColors) {
     enumColorMixingResults[color][color] = color;
 
-    // Anything with white is white again
-    enumColorMixingResults[color][c.white] = c.white;
+    // Anything with white is white again, except for black which creates gray
+    if (color !== enumColors.black) {
+        enumColorMixingResults[color][c.white] = c.white;
+    }
 
     // Anything with uncolored is the same color
     enumColorMixingResults[color][c.uncolored] = color;

src/js/game/hud/parts/building_placer.js

@@ -216,7 +216,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
                 consumeEvents: true,
                 targetOnly: true,
             });
-            detector.click.add(() => this.currentVariant.set(variant));
+            detector.click.add(() => this.setVariant(variant));
         }
     }
 

src/js/game/hud/parts/building_placer_logic.js

@@ -523,12 +523,21 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
             );
             const newIndex = (index + 1) % availableVariants.length;
             const newVariant = availableVariants[newIndex];
-            this.currentVariant.set(newVariant);
-
-            this.preferredVariants[metaBuilding.getId()] = newVariant;
+            this.setVariant(newVariant);
         }
     }
 
+    /**
+     * Sets the current variant to the given variant
+     * @param {string} variant
+     */
+    setVariant(variant) {
+        const metaBuilding = this.currentMetaBuilding.get();
+        this.currentVariant.set(variant);
+
+        this.preferredVariants[metaBuilding.getId()] = variant;
+    }
+
     /**
      * Performs the direction locked placement between two points after
      * releasing the mouse

src/js/game/hud/parts/waypoints.js

@@ -111,7 +111,7 @@ export class HUDWaypoints extends BaseHUDPart {
         this.root.camera.downPreHandler.add(this.onMouseDown, this);
         this.root.keyMapper
             .getBinding(KEYMAPPINGS.navigation.createMarker)
-            .add(this.requestCreateMarker, this);
+            .add(() => this.requestSaveMarker({}));
 
         /**
          * Stores at how much opacity the markers should be rendered on the map.
@@ -168,8 +168,8 @@ export class HUDWaypoints extends BaseHUDPart {
             }
 
             if (this.isWaypointDeletable(waypoint)) {
-                const deleteButton = makeDiv(element, null, ["deleteButton"]);
-                this.trackClicks(deleteButton, () => this.deleteWaypoint(waypoint));
+                const editButton = makeDiv(element, null, ["editButton"]);
+                this.trackClicks(editButton, () => this.requestSaveMarker({ waypoint }));
             }
 
             if (!waypoint.label) {
@@ -220,42 +220,61 @@ export class HUDWaypoints extends BaseHUDPart {
     }
 
     /**
-     * Requests to create a marker at the current camera position. If worldPos is set,
+     * Requests to save a marker at the current camera position. If worldPos is set,
      * uses that position instead.
-     * @param {Vector=} worldPos Override the world pos, otherwise it is the camera position
+     * @param {object} param0
+     * @param {Vector=} param0.worldPos Override the world pos, otherwise it is the camera position
+     * @param {Waypoint=} param0.waypoint Waypoint to be edited. If omitted, create new
      */
-    requestCreateMarker(worldPos = null) {
+    requestSaveMarker({ worldPos = null, waypoint = null }) {
         // Construct dialog with input field
         const markerNameInput = new FormElementInput({
             id: "markerName",
             label: null,
             placeholder: "",
+            defaultValue: waypoint ? waypoint.label : "",
             validator: val =>
                 val.length > 0 && (val.length < MAX_LABEL_LENGTH || ShapeDefinition.isValidShortKey(val)),
         });
         const dialog = new DialogWithForm({
             app: this.root.app,
-            title: T.dialogs.createMarker.title,
+            title: waypoint ? T.dialogs.createMarker.titleEdit : T.dialogs.createMarker.title,
             desc: T.dialogs.createMarker.desc,
             formElements: [markerNameInput],
+            buttons: waypoint ? ["delete:bad", "cancel", "ok:good"] : ["cancel", "ok:good"],
         });
         this.root.hud.parts.dialogs.internalShowDialog(dialog);
 
-        // Compute where to create the marker
-        const center = worldPos || this.root.camera.center;
+        // Edit marker
+        if (waypoint) {
+            dialog.buttonSignals.ok.add(() => {
+                // Actually rename the waypoint
+                this.renameWaypoint(waypoint, markerNameInput.getValue());
+            });
+            dialog.buttonSignals.delete.add(() => {
+                // Actually delete the waypoint
+                this.deleteWaypoint(waypoint);
+            });
+        } else {
+            // Compute where to create the marker
+            const center = worldPos || this.root.camera.center;
 
-        dialog.buttonSignals.ok.add(() => {
-            // Show info that you can have only N markers in the demo,
-            // actually show this *after* entering the name so you want the
-            // standalone even more (I'm evil :P)
-            if (IS_DEMO && this.waypoints.length > 2) {
-                this.root.hud.parts.dialogs.showFeatureRestrictionInfo("", T.dialogs.markerDemoLimit.desc);
-                return;
-            }
+            dialog.buttonSignals.ok.add(() => {
+                // Show info that you can have only N markers in the demo,
+                // actually show this *after* entering the name so you want the
+                // standalone even more (I'm evil :P)
+                if (IS_DEMO && this.waypoints.length > 2) {
+                    this.root.hud.parts.dialogs.showFeatureRestrictionInfo(
+                        "",
+                        T.dialogs.markerDemoLimit.desc
+                    );
+                    return;
+                }
 
-            // Actually create the waypoint
-            this.addWaypoint(markerNameInput.getValue(), center);
-        });
+                // Actually create the waypoint
+                this.addWaypoint(markerNameInput.getValue(), center);
+            });
+        }
     }
 
     /**
@@ -272,18 +291,7 @@ export class HUDWaypoints extends BaseHUDPart {
             zoomLevel: Math.max(this.root.camera.zoomLevel, globalConfig.mapChunkOverviewMinZoom + 0.05),
         });
 
-        // Sort waypoints by name
-        this.waypoints.sort((a, b) => {
-            if (!a.label) {
-                return -1;
-            }
-            if (!b.label) {
-                return 1;
-            }
-            return this.getWaypointLabel(a)
-                .padEnd(MAX_LABEL_LENGTH, "0")
-                .localeCompare(this.getWaypointLabel(b).padEnd(MAX_LABEL_LENGTH, "0"));
-        });
+        this.sortWaypoints();
 
         // Show notification about creation
         this.root.hud.signals.notification.dispatch(
@@ -295,6 +303,26 @@ export class HUDWaypoints extends BaseHUDPart {
         this.rerenderWaypointList();
     }
 
+    /**
+     * Renames a waypoint with the given label
+     * @param {Waypoint} waypoint
+     * @param {string} label
+     */
+    renameWaypoint(waypoint, label) {
+        waypoint.label = label;
+
+        this.sortWaypoints();
+
+        // Show notification about renamed
+        this.root.hud.signals.notification.dispatch(
+            T.ingame.waypoints.creationSuccessNotification,
+            enumNotificationType.success
+        );
+
+        // Re-render the list and thus add it
+        this.rerenderWaypointList();
+    }
+
     /**
      * Called every frame to update stuff
      */
@@ -304,6 +332,23 @@ export class HUDWaypoints extends BaseHUDPart {
         }
     }
 
+    /**
+     * Sort waypoints by name
+     */
+    sortWaypoints() {
+        this.waypoints.sort((a, b) => {
+            if (!a.label) {
+                return -1;
+            }
+            if (!b.label) {
+                return 1;
+            }
+            return this.getWaypointLabel(a)
+                .padEnd(MAX_LABEL_LENGTH, "0")
+                .localeCompare(this.getWaypointLabel(b).padEnd(MAX_LABEL_LENGTH, "0"));
+        });
+    }
+
     /**
      * Returns the label for a given waypoint
      * @param {Waypoint} waypoint
@@ -381,7 +426,7 @@ export class HUDWaypoints extends BaseHUDPart {
             } else if (button === enumMouseButton.right) {
                 if (this.isWaypointDeletable(waypoint)) {
                     this.root.soundProxy.playUiClick();
-                    this.deleteWaypoint(waypoint);
+                    this.requestSaveMarker({ waypoint });
                 } else {
                     this.root.soundProxy.playUiError();
                 }
@@ -393,7 +438,7 @@ export class HUDWaypoints extends BaseHUDPart {
             if (button === enumMouseButton.right) {
                 if (this.root.camera.getIsMapOverlayActive()) {
                     const worldPos = this.root.camera.screenToWorld(pos);
-                    this.requestCreateMarker(worldPos);
+                    this.requestSaveMarker({ worldPos });
                     return STOP_PROPAGATION;
                 }
             }

src/js/game/systems/item_processor.js

@@ -1,13 +1,11 @@
 import { globalConfig } from "../../core/config";
-import { BaseItem } from "../base_item";
-import { enumColorMixingResults } from "../colors";
+import { BaseItem, enumItemType } from "../base_item";
+import { enumColorMixingResults, enumInvertedColors } from "../colors";
 import { enumItemProcessorTypes, ItemProcessorComponent } from "../components/item_processor";
 import { Entity } from "../entity";
 import { GameSystemWithFilter } from "../game_system_with_filter";
 import { ColorItem } from "../items/color_item";
 import { ShapeItem } from "../items/shape_item";
-import { enumLayer } from "../root";
-import { NEGATIVE_ENERGY_ITEM_SINGLETON } from "../items/negative_energy_item";
 
 export class ItemProcessorSystem extends GameSystemWithFilter {
     constructor(root) {
@@ -346,13 +344,29 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
             // ADVANCED PROCESSING
 
             case enumItemProcessorTypes.advancedProcessor: {
-                const shapeItem = /** @type {ShapeItem} */ (items[0].item);
-                const newItem = this.root.shapeDefinitionMgr.shapeActionInvertColors(shapeItem.definition);
+                const item = items[0].item;
+
+                if (item.getItemType() === enumItemType.color) {
+                    const colorItem = /** @type {ColorItem} */ (items[0].item);
+                    const newColor = enumInvertedColors[colorItem.color];
+                    outItems.push({
+                        item: new ColorItem(newColor),
+                        requiredSlot: 0,
+                    });
+                } else if (item.getItemType() === enumItemType.shape) {
+                    const shapeItem = /** @type {ShapeItem} */ (items[0].item);
+                    const newItem = this.root.shapeDefinitionMgr.shapeActionInvertColors(
+                        shapeItem.definition
+                    );
+
+                    outItems.push({
+                        item: new ShapeItem(newItem),
+                        requiredSlot: 0,
+                    });
+                } else {
+                    assertAlways(false, "Bad item type: " + item.getItemType() + " for advanced processor.");
+                }
 
-                outItems.push({
-                    item: new ShapeItem(newItem),
-                    requiredSlot: 0,
-                });
                 break;
             }
 

src/js/game/themes/dark.json

@@ -15,8 +15,8 @@
                 "background": "rgba(74, 237, 134, 0.2)"
             },
             "wires": {
-                "color": "rgb(144, 24, 255)",
-                "background": "rgba(144, 24, 255, 0.2)"
+                "color": "rgb(209, 107, 203)",
+                "background": "rgba(209, 107, 203, 0.2)"
             }
         },
 

src/js/game/themes/light.json

@@ -15,8 +15,8 @@
                 "background": "rgba(74, 237, 134, 0.2)"
             },
             "wires": {
-                "color": "rgb(74, 237, 134)",
-                "background": "rgba(74, 237, 134, 0.5)"
+                "color": "rgb(209, 107, 203)",
+                "background": "rgba(209, 107, 203, 0.2)"
             }
         },
 

src/js/game/tutorial_goals.js

@@ -23,8 +23,6 @@ export const enumHubGoalRewards = {
     reward_painter_quad: "reward_painter_quad",
     reward_storage: "reward_storage",
 
-    reward_wires: "reward_wires",
-
     reward_blueprints: "reward_blueprints",
     reward_freeplay: "reward_freeplay",
 

sync-translations.js

@@ -17,7 +17,7 @@ const originalContents = fs
 
 const original = YAML.parse(originalContents);
 
-const placeholderRegexp = /<([a-zA-Z_0-9]+)>/gi;
+const placeholderRegexp = /[[<]([a-zA-Z_0-9]+)[\]<]/gi;
 
 function match(originalObj, translatedObj, path = "/") {
     for (const key in originalObj) {

translations/README.md

@@ -1,10 +1,9 @@
 # Translations
 
-The base translation is `base-en.yaml`. It will always contain the latest phrases and structure.
+The base language is English and can be found [here](base-en.yaml).
 
 ## Languages
 
--   [English (Base Language, Source of Truth)](base-en.yaml)
 -   [German](base-de.yaml)
 -   [French](base-fr.yaml)
 -   [Korean](base-kor.yaml)
@@ -31,6 +30,7 @@ The base translation is `base-en.yaml`. It will always contain the latest phrase
 -   [Finnish](base-fi.yaml)
 -   [Catalan](base-cat.yaml)
 -   [Slovenian](base-sl.yaml)
+-   [Ukrainian](base-uk.yaml)
 
 (If you want to translate into a new language, see below!)
 
@@ -38,15 +38,39 @@ The base translation is `base-en.yaml`. It will always contain the latest phrase
 
 If you want to edit an existing translation (Fixing typos, Updating it to a newer version, etc), you can just use the github file editor to edit the file.
 
--   Find the file you want to edit (For example, `base-de.yaml` if you want to change the german translation)
--   Click on the file name on, there will be a small "edit" symbol on the top right
--   Do the changes you wish to do (Be sure **not** to translate placeholders!)
+-   Click the language you want to edit from the list above
+-   Click the small "edit" symbol on the top right
+
+<img src="https://i.imgur.com/gZnUQoe.png" alt="edit symbol" width="200">
+
+-   Do the changes you wish to do (Be sure **not** to translate placeholders! For example, `<amount> minutes` should get `<amount> Minuten` and **not** `<anzahl> Minuten`!)
+
 -   Click "Propose Changes"
--   I will review your changes and make comments, and eventually merge them so they will be in the next release!
+
+<img src="https://i.imgur.com/KT9ZFp6.png" alt="propose changes" width="200">
+
+-   Click "Create pull request"
+
+<img src="https://i.imgur.com/oVljvRE.png" alt="create pull request" width="200">
+
+-   I will review your changes and make comments, and eventually merge them so they will be in the next release! Be sure to regulary check the created pull request for comments.
 
 ## Adding a new language
 
-Please DM me on discord (tobspr#5407), so I can add the language template for you. It is not as simple as creating a new file.
+Please DM me on discord (tobspr#5407), so I can add the language template for you.
+
+Please use the following template:
+
+```
+Hey, could you add a new translation?
+
+Language: <Language, e.g. 'German'>
+Short code: <Short code, e.g. 'de', see below>
+Local Name: <Name of your Language, e.g. 'Deutsch'>
+```
+
+You can find the short code [here](https://www.science.co.il/language/Codes.php) (In column `Code 2`).
+
 PS: I'm super busy, but I'll give my best to do it quickly!
 
 ## Updating a language to the latest version

translations/base-ar.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
-            [*] Color blind mode
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Loading
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unknown Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: Continue
     newGame: New Game
     madeBy: Made by <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -270,6 +270,10 @@ dialogs:
             You requested to export your base as a screenshot. Please note that this can
             be quite slow for a big base and even crash your game!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Copy
         clearSelection: Clear Selection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +412,11 @@ ingame:
         cyan: Cyan
         white: White
         uncolored: No color
+        black: Black
     shapeViewer:
         title: Layers
         empty: Empty
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -517,6 +524,27 @@ buildings:
         storage:
             name: Storage
             description: Stores excess items, up to a given capacity. Can be used as an overflow gate.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -729,11 +757,11 @@ settings:
             title: Color Blind Mode
             description: Enables various tools which allow to play the game if you are color blind.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Keybindings
@@ -801,6 +829,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planner: Switch side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: About this Game

translations/base-cat.yaml

@@ -29,41 +29,61 @@ steamPage:
     # - Please keep the markup (Stuff like [b], [list] etc) in the same format
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
-        shapez.io és un joc que té com a objectiu construir i automatitzar fàbriques per tal de produir i combinar figures. Al entregar-les, es progressa en el joc desbloquejant millores per les línies de producció.
 
-        En augmentar la demanda serà necessari redissenyar les línies de producció per tal de saciar les demandes - Sense oblidar-se dels recursos bàsics, serà necessari expandir-se en el [b]mapa infinit[/b]!
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Ja que les figures simples poden ser avorrides serà necessari mesclar colors i pintar-les - Combina roig, verd i blau per produir diferents colors i així pintar les figures per assolir el nivell de demanda adequat.
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        El joc compta amb 18 nivells (Que et mantindran ocupat durant hores!) però estic afegint constantment nou contingut - Tinc moltes coses planejades!
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        [b]Avantatges del joc complet[/b]
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
+
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Balises o marcadors, punts de referència en el mapa
-            [*] Guardar partides de forma il·limitada
-            [*] Mode fosc/nocturn
-            [*] Més opcions
-            [*] Em permet seguir desenvolupant shapez.io ❤️
-            [*] Més característiques en el futur!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Característiques planejades i suggerències de la comunitat[/b]
+        [b]Future Updates[/b]
 
-        Aquest joc és de codi obert - Qualsevol pot contribuir! A més, tinc [b]molt present[/b] a la comunitat! Intento/e llegir tots els suggeriments i proporcionar tot el feedback que m'és possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Cables!
-            [*] Mode història on els edificis tenen un cost en figures
-            [*] Més nivells i edificis (exclusiu de la versió completa)
-            [*] Mapes diferents i potser obstacles dins d'aquest
-            [*] Configurar la generació del mapa (número i mida dels recursos, la seed i més)
-            [*] Més tipus de figures
-            [*] Millorar el rendiment (Tot i que el joc ja funciona molt bé!)
-            [*] I molt més!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Assegurat de revisar el taulell de Trello per veure el full de ruta! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
+
 global:
     loading: Carregant
     error: Error
@@ -71,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +154,6 @@ mainMenu:
     savegameLevel: Nivell <x>
     savegameLevelUnknown: Nivell desconegut
 
-    contests:
-        contest_01_03062020:
-            title: "Concurs #01"
-            desc: Guanya <strong>$25</strong> per la base més impressionant!
-            longDesc: >-
-                Per tal de mantenir el feedback he pensat que molaria fer concursos setmanals!
-                <br><br>
-                <strong>El tema d'aquesta setmana:</strong> Construeix la base més impressionant!
-                <br><br>
-                Aquest és el procés:<br>
-                <ul class="bucketList">
-                    <li>Envia una captura de pantalla de la teva/ua base <strong>contest@shapez.io</strong></li>
-                    <li>Punts extra si ho comparteixes en xarxes socials!</li>
-                    <li>Seleccionaré 5 captures i les proposaré a la comunitat de <strong>discord</strong> per que votin/en.</li>
-                    <li>El premi és <strong>25$</strong> (Paypal, Amazon Gift Card, el que preferisques)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Estic esperant les vostres increïbles creacions!
-        showInfo: Veure
-        contestOver: Aquest concurs ha conclòs- Entra a discord per assabentar-te de nous concursos!
-
 dialogs:
     buttons:
         ok: OK
@@ -254,6 +255,7 @@ dialogs:
 
     createMarker:
         title: Nou Marcador
+        titleEdit: Edit Marker
         desc: >-
             Dona-li un nom significatiu, també pots usar les <strong>claus</strong> de les figures (Pots generarles <a href="https://viewer.shapez.io" target="_blank">aquí</a>)
 
@@ -262,7 +264,10 @@ dialogs:
 
     exportScreenshotWarning:
         title: Export screenshot
-        desc: Has demanat exportar la teva/ua base com una captura de pantalla. Tin en conte que aquest procés pot ser molt lent i inclús crashear el teu joc!
+        desc: Has demanat exportar la teva/teua base com una captura de pantalla. Aquest procés pot ser molt lent i inclús crashear el teu joc!
+    massCutInsufficientConfirm:
+        title: Confirmar tall
+        desc: No pots permetre't enganxar aquesta zona! Estàs segur que vols tallar-ho?
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -298,6 +303,7 @@ ingame:
         cyan: Cian
         white: Blanc
         uncolored: Sense color
+        black: Black
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -535,6 +541,13 @@ buildings:
         default:
             name: &energy_generator Generador d'energia
             description: Genera energia consumint figures. Cada generador requereix una figura diferent.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -613,10 +626,6 @@ storyRewards:
         desc: >-
             Aquest nivell no t'ha donat res, però el següent ho farà! <br><br> PD: És millor que no destrueixes la part de la fàbrica existent - Necessitaràs <strong>totes</strong> aquestes figures més tard per a <strong>desbloquejar millores</strong>!
 
-    reward_wires:
-        title: Cables
-        desc: TODO
-
     no_reward_freeplay:
         title: Següent nivell
         desc: >-
@@ -810,6 +819,7 @@ keybindings:
         placementDisableAutoOrientation: Desactiva l’orientació automàtica
         placeMultiple: Manteniu-vos en mode d'emplaçament.
         placeInverse: Invertir l’orientació automàtica de la cinta
+        menuClose: Tancar
 
 about:
     title: Sobre el joc

translations/base-cz.yaml

@@ -11,42 +11,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io je hra o stavbě továren pro automatizaci výroby a kombinování tvarů. Poskytněte vyžadované, stále složitější tvary, aby jste postoupili ve hře dále, a odemkněte vylepšení pro zrychlení vaší továrny.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Protože poptávka postupně roste, musíte svou továrnu rozšiřovat tak, aby vyhověla potřebám - Nové zdroje, najdete na [b]nekonečné mapě[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Jen tvary by byly nuda, proto máme pigmenty kterými musíte dílky obarvit - zkombinujte červené, zelené a modré barvivo pro vytvoření dalších odstínů a obarvěte s nimi tvary pro uspokojení poptávky.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Hra obsahuje 18 úrovní (což by vás mělo zaměstnat na spoustu hodin!), ale nový obsah je neustále přidáván - je toho hodně naplánováno!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Výhody plné hry[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Označování pozic na mapě
-            [*] Neomezený počet uložených her
-            [*] Tmavý motiv
-            [*] Více nastavení
-            [*] Pomůžete mi dále vyvíjet shapez.io ❤️
-            [*] Více funkcí v budoucnu!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Plánované funkce a komunitní návrhy[/b]
+        [b]Future Updates[/b]
 
-        Tato hra je open source - kdokoli může přispět! Kromě toho [b]hodně[/b] poslouchám komunitu! Snažím se přečíst si všechny návrhy a vzít v úvahu zpětnou vazbu.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Mód s příběhem, kde stavba budov stojí tvary
-            [*] Více úrovní a budov (exkluzivní pro plnou verzi)
-            [*] Různé mapy a zábrany na mapě
-            [*] Konfigurace generátoru map (úprava počtu a velikosti nálezišť, seed map, a další)
-            [*] Více tvarů
-            [*] Další zlepšení výkonu (I když hra již běží docela dobře!)
-            [*] Režim pro barvoslepé
-            [*] A mnohem více!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Nezapomeňte se podívat na moji Trello nástěnku pro úplný plán! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Načítám
@@ -55,6 +72,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -112,28 +132,7 @@ mainMenu:
     savegameLevel: Úroveň <x>
     savegameLevelUnknown: Neznámá úroveň
 
-    contests:
-        contest_01_03062020:
-            title: "Soutěž #01"
-            desc: Vyhraj <strong>$25</strong> za nejvíc cool základnu!
-            longDesc: >-
-                Abych vám poděkoval, myslel jsem, že by bylo skvělé dělat týdenní soutěže!
-                <br><br>
-                <strong>Téma tohoto týdne:</strong> Postavte nejvíc cool základnu!
-                <br><br>
-                Zde je zadání:<br>
-                <ul class="bucketList">
-                    <li>Zašlete screenshot své základny na <strong>contest@shapez.io</strong></li>
-                    <li>Bonusové body za sdílení na sociálních médiích!</li>
-                    <li>Vyberu 5 screenshotů a <strong>Discord</strong> komunita bude hlasovat o vítězi.</li>
-                    <li>Vítěz dostane <strong>$25</strong> (Paypal, Amazon Dárkový Poukaz, co preferujete)</li>
-                    <li>Uzávěrka: 07.06.2020 12:00 CEST</li>
-                </ul>
-                <br>
-                Těším se na vaše úžasné výtvory!
 
-        showInfo: Zobrazit
-        contestOver: Tato soutěž skončila - Připojte se na Discord a získejte informace o nových soutěžích!
     continue: Pokračovat
     newGame: Nová hra
     madeBy: Vytvořil <author-link>
@@ -236,6 +235,7 @@ dialogs:
     createMarker:
         title: Nová značka
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: V ukázce můžete vytvořit pouze dvě značky. Získejte plnou verzi pro neomezený počet značek!
@@ -251,6 +251,10 @@ dialogs:
             Zažádal jsi o exportování své základny jako obrázek. Měj prosím na paměti, že to
             může zejména u větších základen dlouho trvat, nebo dokonce shodit hru!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -273,6 +277,7 @@ ingame:
         copySelection: Kopířovat
         clearSelection: Zrušit výběr
         pipette: Kapátko
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -388,9 +393,11 @@ ingame:
         cyan: Tyrkysová
         white: Bílá
         uncolored: Bez barvy
+        black: Black
     shapeViewer:
         title: Vrstvy
         empty: Prázdné
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -498,6 +505,27 @@ buildings:
         storage:
             name: Sklad
             description: Skladuje věci navíc až do naplnění kapacity. Může být použit na skladování surovin navíc.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -709,11 +737,11 @@ settings:
             title: Režim pro barvoslepé
             description: Zapné různé nástroje, které vám umožní hrát hru i pokud jste barvoslepí.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Klávesové zkratky
@@ -781,6 +809,11 @@ keybindings:
         lockBeltDirection: Zamknout směr pásu
         switchDirectionLockSide: Otočit strany zámku plánovače
         pipette: Kapátko
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: O hře

translations/base-da.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
-            [*] Color blind mode
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Loading
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -135,28 +155,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unknown Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
 
 dialogs:
     buttons:
@@ -260,6 +259,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -267,6 +267,9 @@ dialogs:
     exportScreenshotWarning:
         title: Export screenshot
         desc: You requested to export your base as a screenshot. Please note that this can be quite slow for a big base and even crash your game!
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -302,6 +305,7 @@ ingame:
         cyan: Cyan
         white: White
         uncolored: No color
+        black: Black
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -530,6 +534,21 @@ buildings:
         default:
             name: &energy_generator Energy Generator
             description: Generates energy by consuming shapes. Each energy generator requires a different shapes.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -609,10 +628,6 @@ storyRewards:
         desc: >-
             This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
 
-    reward_wires:
-        title: Wires
-        desc: TODO
-
     no_reward_freeplay:
         title: Next level
         desc: >-
@@ -820,6 +835,9 @@ keybindings:
         placementDisableAutoOrientation: Disable automatic orientation
         placeMultiple: Stay in placement mode
         placeInverse: Invert automatic belt orientation
+        menuClose: Close Menu
+        advanced_processor: Color Inverter
+        wire: Energy Wire
 
 about:
     title: About this Game

translations/base-de.yaml

@@ -23,6 +23,9 @@ steamPage:
     # This is the short text appearing on the steam page
     shortText: In shapez.io nutzt du die vorhandenen Ressourcen, um mit deinen Maschinen durch Kombination immer komplexere Formen zu erschaffen.
 
+    # This is the text shown above the discord link
+    discordLink: Offizieller Discord - Hier kannst du mit mir schreiben!
+
     # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
     # NOTICE:
     # - Do not translate the first line (This is the gif image at the start of the store)
@@ -30,42 +33,57 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        In shapez.io musst du Maschinen geschickt verbinden, damit Formen automatisiert erstellt, bearbeitet und kombiniert werden. Liefere die gewünschten, stetig komplexer werdenden Formen an dein Hauptgebäude, um im Spiel voranzukommen. Schalte mit ihnen außerdem Upgrades frei, die deine Maschinen und somit auch deine Fabriken beschleunigen!
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Da die Nachfrage sowohl in der Komplexität, als auch der Anzahl steigt, wirst du deine Fabriken erweitern müssen. Vergiss nicht, dass du die dafür benötigten Ressourcen beschaffen musst und expandiere auf der [b]unendlichen Karte[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Das reine Zerschneiden und Zusammensetzen von Formen kann natürlich schnell langweilig werden, aber keine Sorge - Du kannst Farben mischen und deine Formen damit bemalen lassen. Staple dann deine fertigen Formen aufeinander und lasse so die wildesten Kreationen entstehen.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Nutze dein gesammeltes Wissen über die Maschinen und lasse deine Fabriken die gewünschten Formen der 18 verschiedenen Level abliefern. Schalte mit jedem Level neue Arbeitsschritte oder Gebäude frei. Das sollte dich schon für Stunden beschäftigt halten! Danach werden im Freispielmodus zufällige Formen generiert, die du ebenfalls abliefern kannst. Ich füge regelmäßig neue Funktionen hinzu und davon sind eine ganze Menge geplant!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
-        [b]Vorteile der Standalone[/b]
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
+
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Wegpunkte
-            [*] Unbegrenzte Anzahl von Spielständen
-            [*] Dark-Mode
-            [*] Weitere Einstellungen
-            [*] Unterstütze die Entwicklung von shapez.io ❤️
-            [*] Neue Funktionen in der Zukunft!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Geplante Funktionen & Community-Vorschläge[/b]
+        [b]Future Updates[/b]
 
-        Diese Spiel ist Open Source - Jeder kann dazu beitragen! Abgesehen davon, höre ich auf das Feedback der Community! Ich versuche alle Vorschläge zu lesen und so viel davon einzubeziehen, wie nur möglich. Hier ein Liste an Features, die momentan geplant sind.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story-Modus mit Gebäudekosten
-            [*] Drähte und Logik
-            [*] Neue Gebäude und Level (nur in der Standalone-Version)
-            [*] Mehrere Karten und vielleicht auch Hindernisse
-            [*] Einstellbare Kartengenerierung (Ändere die Grösse und Anzahl von Ressourcenflecken, den Seed und mehr)
-            [*] Mehr Formentypen
-            [*] Performanceverbesserungen (Auch wenn das Spiel bereits ganz gut läuft)
-            [*] Und vieles mehr!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Schau für die komplette Planung doch mal auf dem Trello-Board vorbei! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
 
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
 global:
     loading: Laden
     error: Fehler
@@ -73,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -129,28 +150,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unbekanntes Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Gewinne <strong>$25</strong> für die beste Basis!
-            longDesc: >-
-                Um euch etwas zurückzugeben dachte ich, dass es eine coole Idee ist, wöchentliche Wettbewerbe durchzuführen!
-                <br><br>
-                <strong>Thema dieser Woche:</strong> Baue die coolste Basis!
-                <br><br>
-                Hier ist der Deal:<br>
-                <ul class="bucketList">
-                    <li>Sende einen Screenshot deiner Basis an <strong>contest@shapez.io</strong></li>
-                    <li>Bonuspunkte, wenn du die Basis auf sozialen Medien teilst!</li>
-                    <li>Ich wähle 5 Screenshots aus und schlage dieser der Community auf <strong>Discord</strong> zur Abstimmung vor.</li>
-                    <li>Der Gewinner bekommt <strong>$25</strong> (PayPal, Amazon Gift Card, was du willst)</li>
-                    <li>Einsendeschluss: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Ich freue mich auf eure tollen Kreationen!
 
-        showInfo: Anschauen
-        contestOver: Dieser Wettbewerb ist vorbei! Tritt dem Discord Server bei, um über neue Wettbewerbe informiert zu werden!
     helpTranslate: Hilf beim Übersetzen!
     continue: Fortsetzen
     newGame: Neues Spiel
@@ -254,6 +254,7 @@ dialogs:
     createMarker:
         title: Neuer Marker
         desc: Gib ihm einen griffigen Namen. Du kannst sogar die <strong>Abkürzung</strong> einer Form eingeben (Diese kann <a href="https://viewer.shapez.io" target="_blank">hier</a> generiert werden).
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Du kannst nur 2 benutzerdefinierte Marker in der Demo benutzen. Hol dir die Standalone, um unendlich viele Marker zu erstellen!
@@ -267,6 +268,10 @@ dialogs:
         desc: >-
             Hier kannst du ein Bildschirmfoto von deiner ganzen Fabrik erstellen. Für extrem große Fabriken kann das jedoch sehr lange dauern und ggf. zum Spielabsturz führen!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -289,6 +294,7 @@ ingame:
         copySelection: Kopieren
         clearSelection: Auswahl aufheben
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -404,9 +410,11 @@ ingame:
         cyan: Cyan
         white: Weiß
         uncolored: Farblos
+        black: Black
     shapeViewer:
         title: Ebenen
         empty: Leer
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -518,6 +526,27 @@ buildings:
         toUnlock: >-
             Für folgende Belohnung:
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -729,11 +758,11 @@ settings:
             title: Modus für Farbenblinde
             description: Aktiviert verschiedene Werkzeuge, die dir das Spielen trotz Farbenblindheit ermöglichen.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation pro Gebäudetyp
+            description: >-
+                Jeder Gebäudetyp merkt sich einzeln, welche Rotation ausgewählt ist.
+                Das fühlt sich möglicherweise besser an, wenn du häufig zwischen verschiedenen
+                Gebäudetypen wechselst.
 
 keybindings:
     title: Tastenbelegung
@@ -801,6 +830,11 @@ keybindings:
         lockBeltDirection: Bandplaner aktivieren
         switchDirectionLockSide: "Planer: Seite wechseln"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Über dieses Spiel

translations/base-el.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
-            [*] Color blind mode
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Loading
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unknown Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: Continue
     newGame: New Game
     madeBy: Made by <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -270,6 +270,10 @@ dialogs:
             You requested to export your base as a screenshot. Please note that this can
             be quite slow for a big base and even crash your game!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Copy
         clearSelection: Clear Selection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +412,11 @@ ingame:
         cyan: Cyan
         white: White
         uncolored: No color
+        black: Black
     shapeViewer:
         title: Layers
         empty: Empty
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -517,6 +524,27 @@ buildings:
         deliver: Deliver
         toUnlock: to unlock
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -730,11 +758,11 @@ settings:
             title: Color Blind Mode
             description: Enables various tools which allow to play the game if you are color blind.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Keybindings
@@ -802,6 +830,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planner: Switch side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: About this Game

translations/base-en.yaml

@@ -34,17 +34,18 @@ steamPage:
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
         shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
-        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
+        Upon delivering the requested shapes you'll progress within the game and unlock upgrades to speed up your factory.
 
-        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        As the demand for shapes increases, you'll have to scale up your factory to meet the demand - Don't forget about resources though, you'll have to expand across the [b]infinite map[/b]!
 
-        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned! 
+        Soon you'll have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with them to satisfy the demand.
 
-        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
+        This game features 18 progressive levels (Which should already keep you busy for hours!) but I'm constantly adding new content - There's a lot planned! 
 
-        [img]{STEAM_APP_IMAGE}/extras/header_standalone_advantages.png[/img]
+        Purchasing the game gives you access to the standalone version which has additional features, and you'll also receive access to newly developed features.
+
+        [b]Standalone Advantages[/b]
 
         [list]
             [*] Dark Mode
@@ -56,9 +57,9 @@ steamPage:
             [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [img]{STEAM_APP_IMAGE}/extras/header_future_updates.png[/img]
+        [b]Future Updates[/b]
 
-        I am updating the game very often and trying to push an update at least every week!
+        I am updating the game often and trying to push an update at least once every week!
 
         [list]
             [*] Different maps and challenges (e.g. maps with obstacles)
@@ -70,12 +71,12 @@ steamPage:
             [*] And much more!
         [/list]
 
-        [img]{STEAM_APP_IMAGE}/extras/header_open_source.png[/img]
+        [b]This game is open source![/b]
 
         Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
         Be sure to check out my trello board for the full roadmap! 
 
-        [img]{STEAM_APP_IMAGE}/extras/header_links.png[/img]
+        [b]Links[/b]
 
         [list]
             [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
@@ -92,6 +93,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -153,29 +157,6 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unknown Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This week's topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and showcase them to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
-
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
-
 dialogs:
     buttons:
         ok: OK
@@ -282,6 +263,7 @@ dialogs:
 
     createMarker:
         title: New Marker
+        titleEdit: Edit Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
 
     markerDemoLimit:
@@ -325,7 +307,7 @@ ingame:
         cyan: Cyan
         white: White
         black: Black
-        uncolored: No color
+        uncolored: Gray
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -467,8 +449,8 @@ buildings:
 
     wire:
         default:
-            name: &wire Wire
-            description: Allows you to transport energy
+            name: &wire Energy Wire
+            description: Allows you to transport energy.
 
     miner: # Internal name for the Extractor
         default:
@@ -511,8 +493,8 @@ buildings:
 
     advanced_processor:
         default:
-            name: &advanced_processor Advanced Processor
-            description: Advanced shape processing
+            name: &advanced_processor Color Inverter
+            description: Accepts a color or shape and inverts it.
 
     rotater:
         default:
@@ -565,16 +547,16 @@ buildings:
 
         default:
             name: &energy_generator Energy Generator
-            description: Generates energy by consuming shapes. Each energy generator requires a different shape.
+            description: Generates energy by consuming shapes.
 
     wire_crossings:
         default:
             name: &wire_crossings Wire Splitter
-            description: Splits a wire into two
+            description: Splits a energy wire into two.
 
         merger:
             name: Wire Merger
-            description: Merges two wires into one
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -654,10 +636,6 @@ storyRewards:
         desc: >-
             This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
 
-    reward_wires:
-        title: Wires
-        desc: TODO
-
     no_reward_freeplay:
         title: Next level
         desc: >-

translations/base-es.yaml

@@ -23,6 +23,9 @@ steamPage:
     # This is the short text appearing on the steam page
     shortText: shapez.io es un juego sobre construir fábricas para automatizar la creación y combinación de figuras cada vez más complejas en un mapa infinito.
 
+    # This is the text shown above the discord link
+    discordLink: Discord oficial - ¡Chatea conmigo!
+    
     # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
     # NOTICE:
     # - Do not translate the first line (This is the gif image at the start of the store)
@@ -30,41 +33,57 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io es un juego sobre construir fábricas para automatizar la creación y combinación de figuras. Entrega las cada vez más complejas figuras requeridas para progresar y desbloquea mejoras para aumentar la velocidad de tu fábrica.
+        shapez.io es un juego basado en la construcción de fábricas para automatizar la creación y combinación de figuras en un mapa que se expande infinitamente. 
+        Entrega las figuras requeridas para progresar y desbloquear mejoras para aumentar la velocidad de tu fábrica.
 
         Al aumentar la demanda, necesitarás escalar tu fábrica para ajustarte a las necesidades - ¡No te olvides de los recursos, necesitarás expandirte en el [b]mapa infinito[/b]!
 
-        Ya que las figuras pueden ser aburridas, necesitarás mezclar colores para pintar las figuras - Combina recursos de colores rojo, verde y azul para producir diferentes colores y pintar figuras para satisfacer la demanda.
+        Después necesitarás mezclar colores para pintar las figuras - Combina recursos de colores rojo, verde y azul para producir diferentes colores y pintar figuras para satisfacer la demanda.
 
         Este juego cuenta con 18 niveles (¡Que te mantendrán ocupado durante horas!) pero estoy constantemente añadiendo nuevo contenido - ¡Hay mucho planeado!
 
+        Comprando el juego tendrás acceso a la versión completa con contenido adicional, además del contenido en desarrollo.
 
         [b]Ventajas del juego completo[/b]
 
         [list]
-            [*] Puntos de referencia en el mapa
+            [*] Modo oscuro
+            [*] Puntos de referencia ilimitados
             [*] Partidas guardadas ilimitadas
-            [*] Modo nocturno
-            [*] Más opciones
-            [*] Permitirme seguir desarrollando shapez.io ❤️
-            [*] Más características en el futuro!
+            [*] Ajustes adicionales
+            [*] Próximamente: ¡Cables y Energía! Aproximadamente para finales de julio de 2020.
+            [*] Próximamente: Más niveles
+            [*] Ayúdame a seguir desarrollando shapez.io ❤️
         [/list]
 
-        [b]Características planeadas y sugerencias de la comunidad[/b]
+        [b]Futuras actualizaciones[/b]
+
+        ¡Estoy actualizando el juego muy a menudo e intentando subir actualizaciones al menos una vez a la semana!
 
-        Este juego es de código abierto - Cualquiera puede contribuir! A parte de eso, escucho [b]mucho[/b] a la comunidad! Intento leer todas las sugerencias e intento tener en cuenta todo el feedback posible.
         [list]
-            [*] Modo historia en el que los edificios cuesten figuras
-            [*] Más niveles y edificios (exclusivos del juego completo)
-            [*] Mapas diferentes y tal vez obstáculos en el mapa
-            [*] Configuración en la creación del mapa (Editar el número y tamaño de los recursos, la semilla, y más)
-            [*] Más tipos de formas
-            [*] Mejoras de rendimiento (Aunque el juego ya funciona muy bien!)
-            [*] Modo para daltónicos
-            [*] Y mucho más!
+            [*] Diferentes mapas y desafíos (por ejemplo: mapas con obstáculos)
+            [*] Puzles (Entrega la forma requerida con una zona o conjunto de edificios restringidos)
+            [*] Modo historia en el que los edificios tengan un coste
+            [*] Generador de mapas configurable (Configurar recursos, forma, tamaño, densidad, semilla y más)
+            [*] Más tipos de figuras
+            [*] Mejoras de rendimiento (¡Aunque el juego ya funciona muy bien!)
+            [*] ¡Y mucho más!
         [/list]
 
-        Además asegúrate de comprobar el tablero de Trello para ver todo lo planificado! https://trello.com/b/ISQncpJP/shapezio
+        [b]¡Este juego es de código abierto![/b]
+
+        Cualquiera puede contribuir, estoy activamente involucrado en la comunidad e intento leer todas las sugerencias y considerar todas las propuestas planteadas.
+        ¡Comprueba mi tablero de Trello para ver todo lo planificado! 
+
+        [b]Enlaces[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Discord oficial[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Hoja de ruta[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Código fuente (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Ayuda a traducir[/url]
+        [/list]
 
 global:
     loading: Cargando
@@ -73,6 +92,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -96,8 +118,8 @@ global:
 
         # Short formats for times, e.g. '5h 23m'
         secondsShort: <seconds>s
-        minutesAndSecondsShort: <minutes>m <seconds>s
-        hoursAndMinutesShort: <hours>h <minutes>m
+        minutesAndSecondsShort: <minutes>min <seconds>s
+        hoursAndMinutesShort: <hours>h <minutes>min
 
         xMinutes: <x> minutos
 
@@ -111,18 +133,19 @@ global:
 
 demoBanners:
     # This is the "advertisement" shown in the main menu and other various places
-    title: Versión de Prueba
+    title: Versión de prueba
     intro: >-
-        ¡Obtén el juego completo para conseguir todas las características!
+        ¡Obtén el juego completo para desbloquear todas las características!
 
 mainMenu:
     play: Jugar
     continue: Continuar
-    newGame: Nuevo Juego
+    newGame: Nuevo juego
     changelog: Historial de cambios
+    subreddit: Reddit
     importSavegame: Importar
     openSourceHint: ¡Este juego es de código abierto!
-    discordLink: Servidor de Discord Oficial
+    discordLink: Servidor de Discord oficial
     helpTranslate: ¡Ayuda a traducirlo!
     madeBy: Desarrollado por <author-link>
 
@@ -133,56 +156,32 @@ mainMenu:
     savegameLevel: Nivel <x>
     savegameLevelUnknown: Nivel desconocido
 
-    contests:
-        contest_01_03062020:
-            title: "Concurso #01"
-            desc: ¡Gana <strong>25$</strong> por la base más impresionante!
-            longDesc: >-
-                ¡Para devolveros algo a vosotros he pensado que molaría hacer consursos semanales!
-                <br><br>
-                <strong>¡El tema de esta semana:</strong> Construye la base más chula!
-                <br><br>
-                Este es el trato:<br>
-                <ul class="bucketList">
-                    <li>Envía una captura de pantalla de tu base a <strong>contest@shapez.io</strong></li>
-                    <li>Puntos extra si lo subes a redes sociales!</li>
-                    <li>Elegiré 5 capturas de pantalla y las propondré a la comunidad de <strong>discord</strong> para que vote.</li>
-                    <li>El ganador obtendrá <strong>25$</strong> (Paypal, tarjeta de regalo de Amazon, lo que prefieras)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Estoy esperando para ver vuestras increíbles creaciones!
-
-        showInfo: Ver
-        contestOver: El concurso ha terminado - Únete al discord para enterarte sobre nuevos concursos!
-    subreddit: Reddit
-
 dialogs:
     buttons:
         ok: OK
         delete: Borrar
         cancel: Cancelar
-        later: Más Tarde
-        restart: Volver A Empezar
+        later: Más tarde
+        restart: Volver a empezar
         reset: Reiniciar
-        getStandalone: Obtener Juego Completo
-        deleteGame: Sé Lo Que Hago
-        viewUpdate: Ver Actualización
-        showUpgrades: Ver Mejoras
-        showKeybindings: Ver Atajos De teclado
+        getStandalone: Obtener juego completo
+        deleteGame: Sé lo que hago
+        viewUpdate: Ver actualización
+        showUpgrades: Ver mejoras
+        showKeybindings: Ver atajos de teclado
 
     importSavegameError:
-        title: Error de Importación
+        title: Error de importación
         text: >-
             Fallo al importar tu partida guardada:
 
     importSavegameSuccess:
-        title: Partida Guardada Importada
+        title: Partida guardada importada
         text: >-
             Tu partida guardada ha sido importada con éxito.
 
     gameLoadFailure:
-        title: Error de Carga
+        title: Error de carga
         text: >-
             No se ha podido cargar la partida guardada:
 
@@ -203,32 +202,33 @@ dialogs:
 
     editKeybinding:
         title: Cambiar atajos de teclado
-        desc: Presiona la tecla o botón del ratón que quieras asignar o escape para cancelar.
+        desc: Pulsa la tecla o botón del ratón que quieras asignar, o escape para cancelar.
 
     resetKeybindingsConfirmation:
         title: Reiniciar atajos de teclado
         desc: Esto devolverá todos los atajos de teclado a los valores por defecto. Por favor, confirma.
 
     keybindingsResetOk:
-        title: Reseteo de los atajos de teclado
-        desc: ¡Los atajos de taclado han sito reseteados a los valores por defecto!
+        title: Atajos de teclado reiniciados
+        desc: ¡Los atajos de teclado han sito reiniciados a los valores por defecto!
 
     featureRestriction:
-        title: Versión de Prueba
-        desc: Has intentado acceder a una característica (<feature>) que no está disponible en la demo. ¡Considera obtener el juego completo para la experiencia completa!
+        title: Versión de prueba
+        desc: Has intentado acceder a una característica (<feature>) que no está disponible en la versión de prueba. ¡Considera obtener el juego completo para la experiencia completa!
 
     oneSavegameLimit:
-        title: partidas guardadas limitadas
-        desc: Solo puedes tener una partida guardada a la vez en la versión de prueba. ¡Por favor elimina la ya existente u obtén el juego completo!
+        title: Partidas guardadas limitadas
+        desc: Solo puedes tener una partida guardada a la vez en la versión de prueba. ¡Por favor, elimina la ya existente u obtén el juego completo!
+    
     updateSummary:
         title: ¡Nueva actualización!
         desc: >-
             Estos son los cambios desde la última vez que jugaste:
 
     upgradesIntroduction:
-        title: Desbloquear Mejoras
+        title: Desbloquear mejoras
         desc: >-
-            Todas las figuras pueden ser usadas para desbloquear mejoras - <strong>¡No destruyas tus fábricas anteriores!</strong>
+            Todas las figuras se pueden usar para desbloquear mejoras - <strong>¡No destruyas tus fábricas anteriores!</strong>
             La pestaña de mejoras está en la esquina superior derecha de la pantalla.
 
     massDeleteConfirm:
@@ -239,34 +239,38 @@ dialogs:
     massCutConfirm:
         title: Confirmar corte
         desc: >-
-            ¡Estás cortando muchos edificios (<count> para ser exactos)! ¿Estas seguro de
-            que quieres hacer esto?
+            ¡Estás cortando muchos edificios (<count> para ser exactos)! ¿Estas seguro de             que quieres hacer esto?
+
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: >-
+            ¡No puedes permitirte pegar este área! ¿Estás seguro de que quieres cortarlo?
 
     blueprintsNotUnlocked:
         title: No desbloqueado todavía
         desc: >-
-            ¡Los planos no han sido desbloqueados todavía! Completa más niveles para desbloquearlos.
+            ¡Completa el nivel 12 para desbloquear los Planos!
+
     keybindingsIntroduction:
         title: Atajos de teclado útiles
         desc: >-
             El juego tiene muchos atajos de teclado que facilitan la tarea de construir grandes fábricas.
             ¡Aquí hay algunos, pero asegúrate de <strong>comprobar los atajos de teclado</strong>!<br><br>
-            <code class='keybinding'>CTRL</code> + Arrastrar: Selecciona un área para copiarla / borrarla.<br>
-            <code class='keybinding'>SHIFT</code>: Mánten pulsado para colocar varias veces el mismo edificio.<br>
+            <code class='keybinding'>CTRL</code> + Arrastrar: Selecciona un área.<br>
+            <code class='keybinding'>SHIFT</code>: Mánten pulsado para colocar varias veces un edificio.<br>
             <code class='keybinding'>ALT</code>: Invierte la orientación de las cintas transportadoras colocadas.<br>
 
     createMarker:
         title: Nuevo marcador
-        desc: Dale un nombre significativo, tambien puedes agregarle la <strong>clave</strong> de una forma (La cual puedes generar <a href="https://viewer.shapez.io" target="_blank">aquí</a>)
+        titleEdit: Editar marcador
+        desc: Dale un nombre significativo, también puedes agregarle una <strong>clave</strong> de una forma (La cual puedes generar <a href="https://viewer.shapez.io" target="_blank">aquí</a>)
 
     markerDemoLimit:
-        desc: Sólo puedes crear dos marcadores en la versión de prueba. ¡Obtén el juego completo para marcas ilimitadas!
+        desc: Solo puedes crear dos marcadores en la versión de prueba. ¡Obtén el juego completo para marcadores ilimitados!
 
     exportScreenshotWarning:
         title: Exportar captura de pantalla
-        desc: >-
-            Has pedido una captura de pantalla. Por favor ten en cuenta que
-            puede tardar bastante en las bases grandes ¡He incluso crashear tu juego!
+        desc: Has solicitado una captura de pantalla de tu base. Por favor, ten en cuenta que puede tardar bastante en las bases grandes. ¡E incluso crashear tu juego!
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -274,22 +278,35 @@ ingame:
     keybindingsOverlay:
         moveMap: Mover
         selectBuildings: Seleccionar área
-        stopPlacement: Parar de colocar
+        stopPlacement: Dejar de colocar
         rotateBuilding: Rotar edificio
         placeMultiple: Colocar varios
         reverseOrientation: Invertir la orientación
         disableAutoOrientation: Desactivar la autoorientación
         toggleHud: Habilitar el HUD
         placeBuilding: Colocar edificio
-        createMarker: Crear marca
+        createMarker: Crear marcador
         delete: Destruir
         pasteLastBlueprint: Pegar último plano
         lockBeltDirection: Activar planificador de cintas transportadoras
         plannerSwitchSide: Invertir giro del planificador
         cutSelection: Cortar
         copySelection: Copiar
-        clearSelection: Limpiar Selección
+        clearSelection: Limpiar selección
         pipette: Pipette
+        switchLayers: Cambiar capas
+
+    # Names of the colors, used for the color blind mode
+    colors:
+        red: Rojo
+        green: Verde
+        blue: Azul
+        yellow: Amarillo
+        purple: Púrpura
+        cyan: Cian
+        white: Blanco
+        black: Negro
+        uncolored: Gris
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -318,12 +335,12 @@ ingame:
         levelTitle: Nivel <level>
         completed: Completado
         unlockText: ¡Has desbloqueado <reward>!
-        buttonNextLevel: Siguiente Nivel
+        buttonNextLevel: Siguiente nivel
 
     # Notifications on the lower right
     notifications:
         newUpgrade: ¡Una nueva mejora está disponible!
-        gameSaved: Tu partida ha sido guardada.
+        gameSaved: Se ha guardado la partida.
 
     # The "Upgrades" window
     shop:
@@ -347,14 +364,14 @@ ingame:
                 description: Muestra la cantidad de figuras guardadas en tu edificio central.
             produced:
                 title: Producido
-                description: Muestra todas las figuras que tu fábrica entera produce, incluyendo productos intermedios.
+                description: Muestra todas las figuras que tu fábrica al completo produce, incluyendo productos intermedios.
             delivered:
                 title: Entregados
                 description: Muestra las figuras que son entregadas a tu edificio central.
         noShapesProduced: Todavía no se han producido figuras.
 
-        # Displays the shapes per minute, e.g. '523 / m'
-        shapesPerMinute: <shapes> / m
+        # Displays the shapes per minute, e.g. '523 / min'
+        shapesPerMinute: <shapes> / min
 
     # Settings menu, when you press "ESC"
     settingsMenu:
@@ -366,12 +383,12 @@ ingame:
         buttons:
             continue: Continuar
             settings: Opciones
-            menu: Volver al Menú Principal
+            menu: Volver al menú principal
 
     # Bottom left tutorial hints
     tutorialHints:
         title: ¿Necesitas ayuda?
-        showHint: Mostrar Pista
+        showHint: Mostrar pista
         hideHint: Cerrar
 
     # When placing a blueprint
@@ -385,29 +402,23 @@ ingame:
         description: Click izquierdo sobre un marcador para ir ahí, click derecho para borrarlo. <br><br> Pulsa <keybinding> para crear un marcador de la vista actual o <strong>click derecho</strong> para crear un marcador en la posición seleccionada.
         creationSuccessNotification: El marcador ha sido creado.
 
+    # Shape viewer
+    shapeViewer:
+        title: Capas
+        empty: Vacío
+        copyKey: Copiar
+
     # Interactive tutorial
     interactiveTutorial:
         title: Tutorial
         hints:
             1_1_extractor: ¡Coloca un <strong>extractor</strong> encima de un <strong>círculo</strong> para extraerlo!
             1_2_conveyor: >-
-                ¡Conecta el extractor con una <strong>cinta transportadora</strong> a tu edificio central!<br><br> Pista: <strong>Pulsa y arrastra</strong> la cinta transportadora con el ratón!
+                ¡Conecta el extractor con una <strong>cinta transportadora</strong> a tu edificio central!<br><br> Pista: ¡<strong>Pulsa y arrastra</strong> la cinta transportadora con el ratón!
+
             1_3_expand: >-
                 ¡Esto <strong>NO</strong> es un "juego de esperar"! Construye más extractores y cintas transportadoras para completar el objetivo más rápido.<br><br> Pista: Mantén pulsado <strong>SHIFT</strong> para colocar varios extractores y usa <strong>R</strong> para rotarlos.
 
-    colors:
-        red: Rojo
-        green: Verde
-        blue: Azul
-        yellow: Amarillo
-        purple: Morado
-        cyan: Cian
-        white: Blanco
-        uncolored: Sin color
-    shapeViewer:
-        title: Capas
-        empty: Vacio
-
 # All shop upgrades
 shopUpgrades:
     belt:
@@ -425,10 +436,20 @@ shopUpgrades:
 
 # Buildings and their name / description
 buildings:
+    hub:
+        deliver: Entregar
+        toUnlock: para desbloquear
+        levelShortcut: LVL
+
     belt:
         default:
             name: &belt Cinta Transportadora
-            description: Transporta elementos, mantén pulsado y arrastra para colocar múltiples.
+            description: Transporta elementos, mantén pulsado y arrastra para colocar varios.
+
+    wire:
+        default:
+            name: &wire Cable
+            description: Te permite transportar energía
 
     miner: # Internal name for the Extractor
         default:
@@ -445,7 +466,7 @@ buildings:
             description: Permite contruir un túnel para transportar los elementos por debajo de edificios y otras cintas transportadoras.
 
         tier2:
-            name: Túnel de nivel II
+            name: Túnel nivel II
             description: Permite contruir un túnel para transportar los elementos por debajo de edificios y otras cintas transportadoras.
 
     splitter: # Internal name for the Balancer
@@ -464,39 +485,46 @@ buildings:
     cutter:
         default:
             name: &cutter Cortador
-            description: Corta las figuras de arriba a abajo y saca ambas mitades. <strong> ¡Si solo usas una parte, asegúrate de destruir la otra parte o se parará!</strong>
+            description: Corta las figuras de arriba abajo y saca ambas mitades. <strong> ¡Si solo usas una parte, asegúrate de destruir la otra parte o se parará!</strong>
         quad:
             name: Cortador (Cuádruple)
             description: Corta figuras en cuatro partes. <strong> ¡Si solo usas una parte, asegúrate de destruir las otras partes o se parará!</strong>
 
+    advanced_processor:
+        default:
+            name: &advanced_processor Inversor de color
+            description: Invierte un color o una figura
+
     rotater:
         default:
             name: &rotater Rotador
-            description: Rota la figura en sentido horario, 90 grados.
+            description: Rota las figuras en sentido horario 90 grados.
         ccw:
             name: Rotador (Inverso)
-            description: Rota las figuras en sentido antihorario, 90 grados.
+            description: Rota las figuras en sentido antihorario 90 grados.
 
     stacker:
         default:
             name: &stacker Apilador
-            description: Junta ambos elementos. Si no pueden ser juntados, el elemento de la derecha es colocado encima del elemento de la izquierda.
+            description: Apila ambos elementos. Si no se pueden unir, el elemento de la derecha se coloca encima del elemento de la izquierda.
 
     mixer:
         default:
             name: &mixer Mezclador de colores
-            description: Junta dos colores usando mezcla aditiva.
+            description: Mezcla dos colores usando mezcla aditiva.
 
     painter:
         default:
             name: &painter Pintor
-            description: &painter_desc Colorea la figura entera con el color que entra por la izquierda.
+            description: &painter_desc Colorea la figura completa de la entrada izquierda con el color de la entrada de arriba.
+
         mirrored:
             name: *painter
             description: *painter_desc
+
         double:
             name: Pintor (Doble)
-            description: Colorea las figuras que entran por la izquierda con el color que entra por arriba.
+            description: Colorea las figuras de las entradas de la izquierda con el color de la entrada de arriba.
         quad:
             name: Pintor (Cuádruple)
             description: Permite colorear cada cuadrante de una figura con un color distinto.
@@ -504,99 +532,112 @@ buildings:
     trash:
         default:
             name: &trash Basurero
-            description: Acepta entradas desde todos los lados y los destruye. Para Siempre.
+            description: Acepta entradas desde todos los lados y los destruye. Para siempre.
 
         storage:
             name: Almacenamiento.
             description: Guarda el exceso de elementos, hasta cierta cantidad. Puede ser usado para controlar el desborde de elementos.
 
-    hub:
-        deliver: Envía
-        toUnlock: para desbloquear
-        levelShortcut: LVL
+    energy_generator:
+        deliver: Entregar
 
+        # This will be shown before the amount, so for example 'For 123 Energy'
+        toGenerateEnergy: Para
+
+        default:
+            name: &energy_generator Generador de energía
+            description: Genera energía consumiendo figuras.
+
+    wire_crossings:
+        default:
+            name: &wire_crossings Divisor de cables
+            description: Divide un cable en dos
+
+        merger:
+            name: Fusionador de cables
+            description: Fusiona dos cables en uno
+    
 storyRewards:
     # Those are the rewards gained from completing the store
     reward_cutter_and_trash:
-        title: Cortador de Figuras
-
-        desc: Acabas de desbloquear el <strong>cortador</strong> - corta las figuras por la mitad <strong>de arriba abajo</strong> ¡Sin importar su orientación!<br><br>Asegúrate de deshacerte de lo que no vayas a usar o <strong>se parará</strong> - Para ese propósito te he dado una basura que destruye todo lo que le pongas!
+        title: Cortador de figuras
+        desc: ¡Acabas de desbloquear el <strong>cortador</strong> - corta las figuras por la mitad <strong>de arriba abajo</strong> sin importar su orientación!<br><br>Asegúrate de deshacerte de lo que no vayas a usar o <strong>se parará</strong> - ¡Para eso te he dado un basurero, que destruye todo lo que le pongas!
 
     reward_rotater:
         title: Rotador
-        desc: ¡El <strong>rotador</strong> ha sido desbloqueado! Rota figuras en sentido horario, 90 grados.
+        desc: ¡El <strong>rotador</strong> se ha desbloqueado! Rota figuras en sentido horario 90 grados.
 
     reward_painter:
         title: Pintor
         desc: >-
-            El <strong>pintor</strong> ha sido desbloqueado - ¡Extrae vetas de color (igual que lo haces con las figuras) y combínalas con una figura en el pintor para colorearlas! <br><br>PD: Si tienes alguna forma de daltonismo, ¡hay un <strong>modo para daltonicos</strong> en las configuraciones!
+            El <strong>pintor</strong> se ha desbloqueado - ¡Extrae vetas de color (igual que lo haces con las figuras) y combínalas con una figura en el pintor para colorearlas! <br><br>PD: Si tienes alguna forma de daltonismo, ¡hay un <strong>modo para daltónicos</strong> en los ajustes!
 
     reward_mixer:
-        title: Mezclador de Color
-        desc: El <strong>mezclador</strong> ha sido desbloqueado - ¡Combina dos colores usando <strong>mezcla aditiva</strong> con este edificio!
+        title: Mezclador de color
+        desc: El <strong>mezclador</strong> se ha desbloqueado - ¡Combina dos colores usando <strong>mezcla aditiva</strong> con este edificio!
 
     reward_stacker:
         title: Apilador
         desc: ¡Ahora puedes combinar figuras con el <strong>apilador</strong>! Ambas entradas son combinadas, y si pueden ser colocadas una junto a la otra serán <strong>fusionadas</strong>. ¡Si no, la entrada derecha será <strong>apilada encima</strong> de la entrada izquierda!
 
     reward_splitter:
-        title: Separador/Fusión
-        desc: El <strong>balanceador</strong> multiusos ha sido desbloqueado - ¡Puede ser usado para construir fábricas más grandes <strong>separando y uniendo elementos</strong> en varias cintas transportadoras!<br><br>
+        title: Separador/Fusionador
+        desc: El <strong>balanceador</strong> multiusos se ha desbloqueado - ¡Se puede usar para construir fábricas más grandes <strong>separando y uniendo elementos</strong> en varias cintas transportadoras!<br><br>
 
     reward_tunnel:
         title: Túnel
-        desc: El <strong>túnel</strong> ha sido desbloqueado - ¡Ahora puedes transportar elementos por debajo de edificios u otras cintas!
+        desc: El <strong>túnel</strong> se ha desbloqueado - ¡Ahora puedes transportar elementos por debajo de edificios u otras cintas!
 
     reward_rotater_ccw:
-        title: Rotador Inverso
+        title: Rotador inverso
         desc: Has desbloqueado una variante del <strong>rotador</strong> - ¡Te permite rotar en sentido antihorario! Para construirlo selecciona el rotador y <strong>pulsa 'T' para ciclar por sus variantes</strong>
 
     reward_miner_chainable:
-        title: Extractor en Cadena
-        desc: ¡Has desbloqueado el <strong>extractor en cadena</strong>! Puede <strong>enviar los recursos</strong> a otros extractores, así puedes extraer recursos más eficientemente
+        title: Extractor en cadena
+        desc: ¡Has desbloqueado el <strong>extractor en cadena</strong>! Puede <strong>enviar los recursos</strong> a otros extractores, extrayendo recursos más eficientemente.
 
     reward_underground_belt_tier_2:
-        title: Túnel de Nivel II
-        desc: Has desbloqueado una nueva variante del <strong>túnel</strong> - ¡Tiene un <strong>mayor rango</strong>, ahora puedes mezclar los distintos tipos de túneles!
+        title: Túnel nivel II
+        desc: Has desbloqueado una nueva variante del <strong>túnel</strong> - ¡Tiene un <strong>mayor rango</strong>, y ahora puedes mezclar los distintos tipos de túneles!
 
     reward_splitter_compact:
-        title: Balanceador Compacto
+        title: Balanceador compacto
         desc: Has desbloqueado una variante compacta del <strong>balanceador</strong> - ¡Acepta dos entradas y las junta en una salida!
 
     reward_cutter_quad:
-        title: Cortador Cuádruple
+        title: Cortador cuádruple
         desc: Has desbloqueado una variante del <strong>cortador</strong> - ¡Permite cortar figuras en <strong>cuatro partes</strong> en vez de solo dos!
 
     reward_painter_double:
-        title: Doble Pintor
-        desc: Has desbloqueado una variante del <strong>pintor</strong> - ¡Funciona como un pintor regular pero procesa <strong>dos formas a la vez</strong>, consumiendo solo un color en vez de dos!
+        title: Pintor doble
+        desc: Has desbloqueado una variante del <strong>pintor</strong> - ¡Funciona como un pintor normal pero procesa <strong>dos figuras a la vez</strong>, consumiendo solo un color en vez de dos!
 
     reward_painter_quad:
-        title: Cuádruple Pintor
+        title: Pintor cuádruple
         desc: Has desbloqueado una variante del <strong>pintor</strong> - ¡Permite pintar cada parte de una figura individualmente!
 
     reward_storage:
-        title: Almacenamiento Intermedio
-        desc: Has desbloqueado una variante de la <strong>basura</strong> - ¡Permite almacenar elementos hasta una cierta capacidad!
+        title: Almacenamiento intermedio
+        desc: Has desbloqueado una variante del <strong>basurero</strong> - ¡Permite almacenar elementos hasta una cierta capacidad!
 
     reward_freeplay:
         title: Juego libre
-        desc: ¡Lo has conseguido! ¡Has desbloqueado el <strong>Juego Libre</strong>! ¡Esto significa que las figuras son ahora generadas aleatoriamente! (¡No te preocupes, más contenido está planeado para el juego completo!)
+        desc: ¡Lo has conseguido! ¡Has desbloqueado el <strong>Juego Libre</strong>! ¡Esto significa que ahora las figuras se generan aleatoriamente! (¡No te preocupes, hay más contenido planeado para el juego completo!)
 
     reward_blueprints:
         title: Planos
-        desc: ¡Ahora puedes <strong>copiar y pegar</strong> partes de tu fábrica! Selecciona un área (Mantén pulsado CTRL, después arrastra con el ratón), y pulsa 'C' para copiarlo.<br><br>Pegarlo <strong>no es gratis</strong>, necesitas producir <strong>figuras de planos</strong> para poder permitírtelo (Esas que acabas de entregar).
+        desc: ¡Ahora puedes <strong>copiar y pegar</strong> partes de tu fábrica! Selecciona un área (mantén pulsado CTRL, después arrastra con el ratón), y pulsa 'C' para copiarlo.<br><br>Pegarlo <strong>no es gratis</strong>, necesitas producir <strong>figuras de planos</strong> para poder permitírtelo (Esas que acabas de entregar).
 
     # Special reward, which is shown when there is no reward actually
     no_reward:
-        title: Siguiente Nivel
+        title: Siguiente nivel
         desc: >-
-            Este nivel no da recompensa, ¡pero el siguiente si! <br><br> PS: Mejor no destruyas la fábrica que tienes - ¡Necesitarás <strong>todas</strong> esas figuras más adelante para <strong>desbloquear mejoras</strong>!
+            Este nivel no da recompensa, ¡pero el siguiente sí! <br><br> PD: Es mejor que no destruyas la fábrica que tienes - ¡Necesitarás <strong>todas</strong> esas figuras más adelante para <strong>desbloquear mejoras</strong>!
 
-no_reward_freeplay:
-    title: Siguiente Nivel
-    desc: >-
-        ¡Felicidades! ¡Por cierto, hay más contenido planeado para el juego completo!
+    no_reward_freeplay:
+        title: Siguiente nivel
+        desc: >-
+            ¡Felicidades! ¡Por cierto, hay más contenido planeado para el juego completo!
 
 settings:
     title: Opciones
@@ -606,15 +647,15 @@ settings:
 
     versionBadges:
         dev: Desarrollo
-        staging: Staging
+        staging: Escenificación
         prod: Producción
     buildDate: Generado <at-date>
 
     labels:
         uiScale:
-            title: Escala de la Interfaz
+            title: Escala de la interfaz
             description: >-
-                Cambia el tamaño de la interfaz de usuario. La interfaz seguirá escalando dependiendo de la resolución de tu dispositivo, pero esta opción controla la cantidad de la escala.
+                Cambia el tamaño de la interfaz de usuario. La interfaz se seguirá escalando dependiendo de la resolución de tu dispositivo, pero esta opción controla la cantidad de escalado.
             scales:
                 super_small: Muy pequeño
                 small: Pequeño
@@ -622,24 +663,38 @@ settings:
                 large: Grande
                 huge: Enorme
 
+        autosaveInterval:
+            title: Intervalo de autoguardado
+            description: >-
+                Controla con qué frecuencia se guarda el juego automáticamente. También se puede desactivar por completo.
+
+            intervals:
+                one_minute: 1 minuto
+                two_minutes: 2 minutos
+                five_minutes: 5 minutos
+                ten_minutes: 10 minutos
+                twenty_minutes: 20 minutos
+                disabled: Desactivado
+
         scrollWheelSensitivity:
             title: Sensibilidad del zoom
             description: >-
-                Cambia cómo de sensible es el zoom (Tanto la rueda del ratón como el trackpad)
+                Cambia cómo de sensible es el zoom (Tanto la rueda del ratón como el panel táctil)
             sensitivity:
-                super_slow: Muy Lento
+                super_slow: Muy lento
                 slow: Lento
                 regular: Normal
                 fast: Rápido
-                super_fast: Muy Rápido
+                super_fast: Muy rápido
 
         movementSpeed:
             title: Velocidad de movimiento
-            description: Cambia qué tan rápido se mueve la cámara al usar el teclado.
+            description: >-
+                Cambia cómo de rápido se mueve la vista usando el teclado.
             speeds:
                 super_slow: Super lento
                 slow: Lento
-                regular: Regular
+                regular: Normal
                 fast: Rápido
                 super_fast: Súper rápido
                 extremely_fast: Extremadamente rápido
@@ -647,181 +702,171 @@ settings:
         language:
             title: Idioma
             description: >-
-                Cambia el idioma. Todas las traducciones son contribuciones de los usuarios y pueden estar incompletas!
+                Cambia el idioma. ¡Todas las traducciones son contribuciones de los usuarios y pueden estar incompletas!
+
+        enableColorBlindHelper:
+            title: Modo para daltónicos
+            description: >-
+                Activa varias herramientas que facilitan jugar si tienes alguna forma de daltonismo.
+
         fullscreen:
             title: Pantalla Completa
             description: >-
-                Es recomendado jugar en pantalla completa para conseguir la mejor experiencia. Solo disponible en el juego completo.
+                Se recomienda jugar en pantalla completa para conseguir la mejor experiencia. Solo disponible en el juego completo.
+
         soundsMuted:
-            title: Silenciar Sonidos
+            title: Silenciar sonidos
             description: >-
                 Si está habilitado, silencia todos los efectos de sonido.
 
         musicMuted:
-            title: Silenciar Música
+            title: Silenciar música
             description: >-
                 Si está habilitado, silencia toda la música.
 
         theme:
-            title: Tema del Juego
+            title: Tema del juego
             description: >-
-                Elije el tema del juego (claro/oscuro).
-
+                Elige el tema del juego (claro/oscuro).
             themes:
                 dark: Oscuro
                 light: Claro
 
         refreshRate:
-            title: Objetivo de Simulación
+            title: Objetivo de simulación
             description: >-
                 Si tienes un monitor de 144hz, cambia la tasa de refresco. Así el juego se ejecutará correctamente a una mayor tasa de refresco. Esto puede disminuir los FPS si tu ordenador no es lo suficientemente rápido.
 
         alwaysMultiplace:
-            title: Colocación Múltiple
+            title: Colocación múltiple
             description: >-
-                Si está activado, todos los edificios quedarán seleccionados después de colocarlos hasta que lo canceles. Es equivalente a pulsar SHIFT permanentemente.
+                Si está activado, todos los edificios se quedarán seleccionados después de colocarlos hasta que lo canceles. Equivale a pulsar SHIFT permanentemente.
 
         offerHints:
-            title: Pistas y Tutorial
+            title: Pistas y tutoriales
             description: >-
-                Activa para recibir pistas y tutoriales mientras juegas. También oculta algunos elementos de la interfaz hasta cierto nivel para hacer más fácil la introducción al juego.
+                Actívalo para recibir pistas y tutoriales mientras juegas. También oculta algunos elementos de la interfaz hasta cierto nivel para hacer más fácil la introducción al juego.
 
         enableTunnelSmartplace:
-            title: Túneles Inteligentes
+            title: Túneles inteligentes
             description: >-
-                Si está activado, colocar túneles automáticamente eliminará las cintas transportadoras innecesarias. Esto también permite arrastrar con el ratón y los túneles excedentes serán eliminados.
+                Si está activado, al colocar túneles se eliminará automáticamente las cintas transportadoras innecesarias. También te permite arrastrar con el ratón y los túneles restantes serán eliminados.
 
         vignette:
             title: Viñeta
             description: >-
                 Activa el efecto viñeta que oscurece las esquinas de la pantalla y hace el texto más fácil de leer.
 
-        autosaveInterval:
-            title: Intervalo de Autoguardado
-            description: >-
-                Controla cada cuánto tiempo se guarda el juego automáticamente. Aquí también puedes deshabilitarlo por completo.
-            intervals:
-                one_minute: 1 Minuto
-                two_minutes: 2 Minutos
-                five_minutes: 5 Minutos
-                ten_minutes: 10 Minutos
-                twenty_minutes: 20 Minutos
-                disabled: Deshabilitado
-        compactBuildingInfo:
-            title: Información Compacta de Edificios
-            description: >-
-                Acorta la caja de información mostrando solo sus ratios. Si no, se mostrará una descripción y una imagen.
-                
-        disableCutDeleteWarnings:
-            title: Deshabilitar las advertencias de Cortar/Eliminar
-            description: >-
-                Deshabilita los diálogos de advertencia que se muestran cuando se cortan/eliminan más de 100 elementos.
-
-        enableColorBlindHelper:
-            title: Modo para Daltónicos
-            description: Activa varias herramientas que facilitan jugar si tienes alguna forma de daltonismo.
-            
         rotationByBuilding:
             title: Rotación por tipo de edificio
             description: >-
-                Cada tipo de edificio recuerda la última rotación que le diste individualmente.
-                Esto puede ser más cómodo si cambias a menudo entre colocar diferentes tipos de edificio.
+                Cada tipo de edificio recuerda la última rotación que le diste individualmente. Esto puede ser más cómodo si cambias a menudo entre colocar diferentes tipos de edificio.
+
+        compactBuildingInfo:
+            title: Información compacta de edificios
+            description: >-
+                Acorta la caja de información mostrando solo sus ratios. Si no, se mostrará una descripción y una imagen.
+
+        disableCutDeleteWarnings:
+            title: Deshabilitar las advertencias de cortar/eliminar
+            description: >-
+                Deshabilita los diálogos de advertencia que se muestran cuando se cortan/eliminan más de 100 elementos.
 
 keybindings:
-    title: Atajos de Teclado
+    title: Atajos de teclado
     hint: >-
-        Pista: Asegúrate de usar CTRL, SHIFT y ALT! Habilitan distintas opciones de colocación.
-    resetKeybindings: Reestablecer Atajos de Teclado
+        Pista: ¡Asegúrate de usar CTRL, SHIFT y ALT! Habilitan distintas opciones de colocación.
+
+    resetKeybindings: Reestablecer atajos de teclado
 
     categoryLabels:
         general: Aplicación
         ingame: Juego
         navigation: Navegación
         placement: Colocación
-        massSelect: Selección Masiva
-        buildings: Atajos de Edificios
-        placementModifiers: Modificadores de Colocación
+        massSelect: Selección masiva
+        buildings: Atajos de edificios
+        placementModifiers: Modificadores de colocación
 
     mappings:
         confirm: Confirmar
         back: Atrás
-        mapMoveUp: Mover Arriba
-        mapMoveRight: Mover a la Derecha
-        mapMoveDown: Move Abajo
-        mapMoveLeft: Move a la Izquierda
-        centerMap: Centro del Mapa
+        mapMoveUp: Mover arriba
+        mapMoveRight: Mover a la derecha
+        mapMoveDown: Mover abajo
+        mapMoveLeft: Mover a la izquierda
+        mapMoveFaster: Mover más rápido
+        centerMap: Centrar mapa
 
         mapZoomIn: Acercarse
         mapZoomOut: Alejarse
-        createMarker: Crear Marca
+        createMarker: Crear marcador
 
         menuOpenShop: Mejoras
         menuOpenStats: Estadísticas
+        menuClose: Cerrar menú
 
-        toggleHud: Activar interfáz
-        toggleFPSInfo: Activa FPS e información de depurado
+        toggleHud: Activar HUD
+        toggleFPSInfo: Activar FPS e información de depurado
+        switchLayers: Cambiar capas
+        exportScreenshot: Exportar la base completa como imagen
         belt: *belt
         splitter: *splitter
         underground_belt: *underground_belt
         miner: *miner
         cutter: *cutter
+        advanced_processor: *advanced_processor
         rotater: *rotater
         stacker: *stacker
         mixer: *mixer
+        energy_generator: *energy_generator
         painter: *painter
         trash: *trash
+        wire: *wire
 
+        pipette: Pipette
         rotateWhilePlacing: Rotar
         rotateInverseModifier: >-
-            Modificador: Rotar inversamente en su lugar
+            Modificador: Rotar inversamente
         cycleBuildingVariants: Ciclar variantes
-        confirmMassDelete: Confirmar Borrado Masivo
-        cycleBuildings: Ciclar Edificios
-        lockBeltDirection: Colocar en línea recta
+        confirmMassDelete: Borrar área
+        pasteLastBlueprint: Pegar último plano
+        cycleBuildings: Ciclar edificios
+        lockBeltDirection: Activar planificador de cintas transportadoras
+        switchDirectionLockSide: >-
+            Planner: Cambiar sentido
 
         massSelectStart: Mantén pulsado y arrastra para empezar
         massSelectSelectMultiple: Seleccionar múltiples áreas
         massSelectCopy: Copiar área
+        massSelectCut: Cortar área
 
         placementDisableAutoOrientation: Desactivar orientación automática
         placeMultiple: Permanecer en modo de construcción
         placeInverse: Invierte automáticamente la orientación de las cintas transportadoras
-        pasteLastBlueprint: Pegar último plano
-        massSelectCut: Cortar área
-        exportScreenshot: Exportar toda la base como imagen
-        mapMoveFaster: Mover más rápido
-        switchDirectionLockSide: "Planner: Switch side"
-        pipette: Pipette
 
 about:
-    title: Sobre el Juego
+    title: Sobre el juego
     body: >-
-        Este juego es de código abierto y ha sido desarrollado por <a href="https://github.com/tobspr"
-        target="_blank">Tobias Springer</a> (Ese soy yo).<br><br>
+        Este juego es de código abierto y ha sido desarrollado por <a href="https://github.com/tobspr" target="_blank">Tobias Springer</a> (Ese soy yo).<br><br>
 
-        Si quieres contribuir revisa <a href="<githublink>"
-        target="_blank">shapez.io en github</a>.<br><br>
+        Si quieres contribuir, revisa <a href="<githublink>" target="_blank">shapez.io en github</a>.<br><br>
 
-        Este juego no habría sido posible si no fuera por la gran comunidad de Discord
-        sobre mis juegos - ¡Deberías unirte al <a href="<discordlink>"
-        target="_blank">servidor de Discord</a>!<br><br>
+        Este juego no habría sido posible si no fuera por la gran comunidad de Discord en mis juegos - ¡Deberías unirte al <a href="<discordlink>" target="_blank">servidor de Discord</a>!<br><br>
 
-        La banda sonora ha sido creada por <a href="https://soundcloud.com/pettersumelius"
-        target="_blank">Peppsen</a> - Él es genial.<br><br>
+        La banda sonora ha sido creada por <a href="https://soundcloud.com/pettersumelius" target="_blank">Peppsen</a> - Es genial.<br><br>
 
-        Finalmente muchísimas gracias a mi amigo <a
-        href="https://github.com/niklas-dahl" target="_blank">Niklas</a> - Sin nuestras sesiones
-        de Factorio este juego nunca existiría.
+        Por último, muchísimas gracias a mi amigo <a href="https://github.com/niklas-dahl" target="_blank">Niklas</a> - Sin nuestras sesiones de Factorio, este juego nunca existiría.
 
 changelog:
-    title: Historial de Cambios
+    title: Historial de cambios
 
 demo:
     features:
         restoringGames: Recuperando partidas guardadas
         importingGames: Importando partidas guardadas
         oneGameLimit: Limitado a una partida guardada
-        customizeKeybindings: Personalizando Atajos de Teclado
-        exportingBase: Exportando base entera como captura de pantalla
+        customizeKeybindings: Personalizando atajos de teclado
+        exportingBase: Exportando la base completa como imagen
 
     settingNotAvailable: No disponible en la versión de prueba.

translations/base-fi.yaml

@@ -20,7 +20,7 @@
 #
 
 steamPage:
-    # This is the short text appearing on the steam page 
+    # This is the short text appearing on the steam page
     shortText: shapez.io on peli tehtaiden rakentamisesta, joiden avulla automatisoidaan yhä monimutkaisempien muotojen luonti and yhdisteleminen loputtomassa maailmassa.
 
     # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
@@ -30,41 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io on peli tehtaiden rakentamisesta, joiden avulla automatisoidaan yhä monimutkaisempien muotojen luonti and yhdisteleminen. Toimita yhä monimutkaisemmat pyydetyt muodot edistyäksesi pelissä ja avataksesi päivityksiä kasvattamaan tehtaasi nopeutta.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Kun kysyntä kasvaa, sinun täytyy kasvattaa tehdastasi täyttämään uudet vaatimukset. - Joskin älä unohda resursseja, sinun täytyy laajentua [b]loputtomassa maailmassa[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Koska muodot voivat käydä pian tylsiksi, sinun täytyy sekoittaa värejä keskenään ja värjätä muotoja niillä - Sekoita punaista, vihreää ja sinista väriresurssia tehdäksesi erilaisia värejä ja värjätäksesi muotoja sillä tyydyttääksesi kysynnän.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Tämä peli tarjoaa 18 tasoa (Joiden pitäisi pitää sinut kiireisenä jo monia tunteja!) mutta lisään jatkuvasti lisää sisältöä peliin. - Paljon sisältöä on suunniteltu!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Itsenäisen pelin edut[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Reittipisteet
-            [*] Loputon määrä tallennuksia
-            [*] Tumma tila
-            [*] Lisää asetuksia
-            [*] Antakaa minun kehittää shapez.io:ta pidemmälle❤️
-            [*] Lisää ominaisuuksia tulossa!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Suunnitellut ominaisuudet & Yhteisön ehdotukset[/b]
+        [b]Future Updates[/b]
+
+        I am updating the game very often and trying to push an update at least every week!
 
-        Tässä pelissä on avoin lähdekoodi - Kuka tahansa voi osallistua! Sen lisäksi kuuntelen [b]paljon[/b] Yhteisöä! Yritän lukea kaikki ehdotukset ja ottaa mahdollisimman paljon palautetta huomioon.
         [list]
-            [*] Johtoja!
-            [*] Tarinatila, jossa rakennukset maksavat muotoja
-            [*] Lisää tasoja ja rakennuksia (pelkästään itsenäisessä pelissä)
-            [*] Erilaisia karttoja sekä ehkä esteitä kartoissa
-            [*] Säädettävä kartan luonti (Säädä alueiden lukumäärää ja kokoa, kartan siementä ja muuta)
-            [*] Lisää muototyyppejä
-            [*] Lisää suorituskyvyn parannuksia (Huolimatta siitä että peli jo nyt toimii meko hyvin!)
-            [*] Ja paljon muuta!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Muista tarkistaa trello taulusta koko etenemissuunnitelma! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Ladataan
@@ -73,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -134,28 +155,7 @@ mainMenu:
     savegameLevel: Taso <x>
     savegameLevelUnknown: Tuntematon Taso
 
-    contests:
-        contest_01_03062020:
-            title: "Kilpailu #01"
-            desc: Palkinto <strong>17,78€</strong> hienoimmalle päämajalle!
-            longDesc: >-
-                Jotta voin antaa takaisin jotain, ajattelin että olisi hienoa pitää viikottaisia kilpailuja!
-                <br><br>
-                <strong>Tämän viikon aihe:</strong> Rakenna hienoin päämaja!
-                <br><br>
-                Tässä on ehdot:<br>
-                <ul class="bucketList">
-                    <li>Lähetä kuvakaappaus tukikohdastasi osoitteeseen <strong>contest@shapez.io</strong></li>
-                    <li>Saat bonuspisteita jos jaat sen sosiaalisessa mediassa!</li>
-                    <li>Valitsen viisi kuvakaappausta ja lähetän ne <strong>discord</strong> yhteisölle äänestettäväksi.</li>
-                    <li>Voittaja saa <strong>22,23€</strong> (Paypal, Amazon lahjakortti tai mitä vain haluat)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Odotan innolla mahtavia luomuksiasi!
 
-        showInfo: Näytä
-        contestOver: Tämä kilpailu on päättynyt - Liity discord yhteisöön saadaksesi huomautuksia uusista kilpailuista!
 
 dialogs:
     buttons:
@@ -259,6 +259,7 @@ dialogs:
     createMarker:
         title: Uusi Merkki
         desc: Anna merkille kuvaava nimi, voit myös sisällyttää muodon <strong>lyhyen avaimen</strong> siihen. (Lyhyen avaimen voit luoda <a href="https://viewer.shapez.io" target="_blank">täällä</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Voit tehdä vain kaksi mukautettua merkkiä demoversiossa. Hanki itsenäinen versio saadaksesi loputtoman määrän merkkejä!
@@ -266,6 +267,9 @@ dialogs:
     exportScreenshotWarning:
         title: Vie kuvakaappaus
         desc: Pyysit tukikohtasi viemistä kuvakaappauksena. Huomaa, että tämä voi olla melko hidasta isolla tukikohdalla ja voi jopa kaataa pelisi!
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -301,6 +305,7 @@ ingame:
         cyan: Syaani
         white: Valkoinen
         uncolored: Ei Väriä
+        black: Black
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -541,6 +546,13 @@ buildings:
         default:
             name: &energy_generator Sähkögeneraattori
             description: Tuottaa sähköä kuluttamalla muotoja. Jokainen sähkögeneraattori vaatii eri muotoja.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -620,10 +632,6 @@ storyRewards:
         desc: >-
             This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
 
-    reward_wires:
-        title: Johdot
-        desc: TODO
-
     no_reward_freeplay:
         title: Seuraava taso
         desc: >-
@@ -833,6 +841,7 @@ keybindings:
         placementDisableAutoOrientation: Poista automaattinen suunta käytöstä
         placeMultiple: Pysy sijoittamistilassa
         placeInverse: Käännä automaattinen hihnan suunta
+        menuClose: Close Menu
 
 about:
     title: Tietoja tästä pelistä

translations/base-fr.yaml

@@ -30,49 +30,69 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io est un jeu ayant pour objectif d'automatiser la création et la fusion de formes à l'aide d'une usine. Livrez des formes de plus en plus complexes requises pour progresser dans le jeu et débloquez des améliorations qui accéléreront votre chaîne de production.
+        shapez.io est un jeu ou il faut construire des usines pour automatiser la création et la transformation de formes de plus en plus complexes sur une carte infinie.
+        En livrant les bonnes formes tu vas progresser dans le jeu et débloquer des améliorations pour accélerer ton usine.
 
-        La demande allant croissant, vous aurez à adapter l'échelle de votre usine afin de suivre la demande - Ne négligez pas les resources cependant, vous aurez à vous étendre sur une [b]carte infinie[/b] !
+        Comme la demande de formes augmente, il vas falloir agrandir ton usine pour produire plus - N'oublie pas les resources, il vas falloir s'étendre tout autour de la [b]carte infinie[/b]!
 
-        Traiter seulement des formes pouvant devenir monotone à la longue, vous aurez aussi à mélanger des couleurs et à les utiliser pour peindre vos formes - Combinez des pigments rouges, verts ou bleus pour produire différentes couleurs et enduisez-en vos formes afin de satisfaire les demandes.
+        Puis il vas falloir mélanger les couleurs et peindres tes formes avec - Combine du rouge, du bleu et du vert pour produire différente couleurs et peindre des formes pour satisfaire la demande.
 
-        Ce jeu propose 18 niveaux (qui devraient d'ores et déjà vous occuper pour de nombreuses heures !) mais j'ajoute régulièrement de nouveaux contenus - Beaucoup de nouveautés sont prévues !
+        Ce jeu propose 18 niveaux progressifs (qui devraient vous occuper pendant des heures!) et j'ajoute constament plus de contenu - Il y en as beaucoup qui arrive!
 
+        Acheter le jeu te donnes accès à la version hors-ligne qui as plus de contenu et tu recevras l'accès aux nouvelles fonctionnalités.
 
-        [b]Avantage de la version complète[/b]
+        [b]Avantages de la version hors-ligne[/b]
 
         [list]
-            [*] Balises
-            [*] Nombre illimité de sauvegardes
-            [*] Thème sombre
-            [*] Plus de paramètres de configuration
-            [*] Acheter la version complète m'aide à poursuivre le développement de shapez.io ❤️
-            [*] Encore plus de fonctionnalités à l'avenir !
+            [*] Mode sombre
+            [*] Balises infinies
+            [*] Sauvegardes infinies
+            [*] Plus de setting
+            [*] Arrive bientôt: Cables et éléctricité! Sort en Juillet 2020.
+            [*] Arrive bientôt: Plus de niveaux
+            [*] Me permet de plus déveloper le jeu ❤️
         [/list]
 
-        [b]Fonctionnalités planifiées & suggestions de la communauté[/b]
+        [b]Mises à jours futures[/b]
 
-        Ce jeu est open source - N'importe qui peut contribuer ! En outre, Je suis [b]très attentif[/b] à ce que dit la communauté ! J'essaie de lire toutes les suggestions et de tenir compte des retours autant que possible.
+        Je fait souvent des mises à jours et essaye d'en sortir une part semaine!
 
         [list]
-            [*] Mode Histoire où les batiments ont un coût en formes
-            [*] Plus de niveaux et de batiments (en exclusivité dans la version complète)
-            [*] Différentes cartes, contenant éventuellement des obstacles
-            [*] Création configurable de carte (éditer le nombre et la taille des gisements de resources, édition de la graine générant la carte, et plus encore)
-            [*] Davantage de types de formes
-            [*] Performance améliorée (bien que le jeu tourne déjà de manière tout à fait décente !)
-            [*] Adaptation de l'affichage des couleurs à différentes formes de daltonisme
-            [*] Et bien plus encore !
+            [*] Plusieurs cartes et challenges (e.g. carte avec des obstacles)
+            [*] Puzzles (Livrer les formes avec des batiments limités/une carte limitée)
+            [*] Un mode histoire ou les bâtiments on un coût
+            [*] Générateur de carte configurable (Configure les ressources/formes leur taille, densité et plus)
+            [*] Plus de formes
+            [*] Meilleures performances (Le jeu est déja très optimisé!)
+            [*] Et bien plus!
         [/list]
 
-        N'hésitez pas à consulter mon tableau trello pour avoir une vue d'ensemble de ce qui est prévu ! https://trello.com/b/ISQncpJP/shapezio
+        [b]Ce jeu est open source![/b]
+
+        Tout le monde peut contribuer, je suis très impliqué dans la communeauté et essaye de regarder toutes les suggestions et prendre les retours si possible.
+        Vas voir mon trello pour plus d'informations!
+
+        [b]Liens[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Discord officiel[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Trello[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Code source (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Aide à traduire[/url]
+        [/list]
+
+    discordLink: Discord officiel - Parles avec moi!
 
 global:
     loading: Chargement
     error: Erreur
 
     # How big numbers are rendered, e.g. "10,000"
-    thousandsDivider: "."
+    thousandsDivider: ","
+
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
 
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.   cf wikipedia système international d'unité
     # For french: https://fr.wikipedia.org/wiki/Pr%C3%A9fixes_du_Syst%C3%A8me_international_d%27unit%C3%A9s
@@ -132,28 +152,6 @@ mainMenu:
     savegameLevel: Niveau <x>
     savegameLevelUnknown: Niveau inconnu
 
-    contests:
-        contest_01_03062020:
-            title: "Concours #01"
-            desc: Gagnez <strong>$25</strong> pour l'usine la plus cool !
-            longDesc: >-
-                Pour vous remercier, j'ai pensé qu'il serait bien de faire un concours hebdomadaire !
-                <br><br>
-                <strong>Le sujet de cette semaine:</strong> Construire l'usine la plus cool !
-                <br><br>
-                Voici comment faire:<br>
-                <ul class="bucketList">
-                    <li>Envoyez une capture d'écran de votre usine à <strong>contest@shapez.io</strong></li>
-                    <li>Vous aurez des points bonus si vous la partagez sur les réseaux sociaux !</li>
-                    <li>Je choisirai 5 images et les soumettrai au vote à la communauté <strong>discord</strong>.</li>
-                    <li>Le gagnant empoche <strong>$25</strong> (Paypal, carte cadeau Amazon, ce que vous préférez)</li>
-                    <li>Limite: 07.06.2020 AM 12:00 CEST</li>
-                </ul>
-                <br>
-                J'attends avec impatience de voir vos superbes créations !
-
-        showInfo: Voir
-        contestOver: Ce concours est terminé - Rejoignez le serveur discord pour être tenu au courant des prochains concours !
     continue: Continuer
     newGame: Nouvelle partie
     madeBy: Créé par <author-link>
@@ -262,6 +260,7 @@ dialogs:
     createMarker:
         title: Nouvelle balise
         desc: Donnez-lui un nom, vous pouvez aussi inclure <strong>le raccourci </strong> d'une forme (Que vous pouvez générer <a href="https://viewer.shapez.io" target="_blank">ici</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Vous ne pouvez créer que deux balises dans la démo. Achetez la version complète pour en faire autant que vous voulez !
@@ -271,6 +270,10 @@ dialogs:
         desc: >-
             Vous avez demandé à exporter votre base sous la forme d'une capture d'écran. Soyez conscient que cela peut s'avérer passablement lent pour une grande base, voire même planter votre jeu !
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -293,6 +296,7 @@ ingame:
         copySelection: Copier
         clearSelection: Effacer la sélection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +411,11 @@ ingame:
         cyan: Cyan
         white: Blanc
         uncolored: Non coloré
+        black: Black
     shapeViewer:
         title: Calques
         empty: Vide
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -519,6 +525,27 @@ buildings:
         deliver: Délivrez
         toUnlock: pour débloquer
         levelShortcut: NV
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -799,6 +826,11 @@ keybindings:
         lockBeltDirection: Utiliser le plannificateur de convoyeurs
         switchDirectionLockSide: "Plannificateur: changer de côté"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: À propos de ce jeu

translations/base-hr.yaml

@@ -50,7 +50,6 @@
 steamPage:
     # This is the short text appearing on the steam page
     shortText: shapez.io je igra o izradi tvornica za automatizaciju stvaranja i spajanja sve složenijih oblika unutar beskonačno velike mape.
-            # shapez.io is a game about building factories to automate the creation and combination of increasingly complex shapes within an infinite map.
 
     # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
     # NOTICE:
@@ -60,42 +59,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Žice!
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Učitavanje
@@ -104,6 +120,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -168,29 +187,8 @@ mainMenu:
     savegameLevel: Nivo <x>
     savegameLevelUnknown: Nepoznati Nivo
 
-# TODO
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
+    # TODO
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
 
 dialogs:
     buttons:
@@ -261,7 +259,7 @@ dialogs:
         desc: >-
             Evo sve promjene od zadnjeg igranja:
 
-# TODO
+    # TODO
     upgradesIntroduction:
         title: Otključaj Nadogradnje
         desc: >-
@@ -295,6 +293,7 @@ dialogs:
     createMarker:
         title: Novi Putokaz
         desc: Daj mu smisleno ime. Može se uključiti i <strong>kratki kod</strong> oblika. (Koju možeš generirati <a href="https://viewer.shapez.io" target="_blank">ovdje</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: U demo verziji se mogu stvoriti samo dva putokaza istovremeno. Nabavi samostalnu igru za beskonačno mnogo putokaza!
@@ -302,6 +301,9 @@ dialogs:
     exportScreenshotWarning:
         title: Izvezi sliku zaslona
         desc: Zatražen je izvoz cijele baze u obliku slike zaslone. Ovo može biti jako sporo za velike tvornice, a može i srušiti igru!
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -431,7 +433,7 @@ ingame:
         hub: Središte
         description: Klikni lijevim klikom na marker kako bi skočio na njegovu lokaciju, a izbriši ga desnim klikom. <br><br>Za stvaranje markera pritisni <keybinding>, ili <strong>desnim klikom</strong> stvori marker na odabranoj lokaciji.
         creationSuccessNotification: Putokaz stvoren.
-    
+
     # Shape viewer
     shapeViewer:
         title: Slojevi
@@ -519,7 +521,7 @@ buildings:
         quad:
             name: Rezač (Četverostruki)
             description: Reže oblike u četiri dijela. <strong>Ako se koristi samo jedan dio, ostali se moraju uništiti da bi se spriječio zastoj!</strong>
-    
+
     advanced_processor:
         default:
             name: &advanced_processor Napredni Procesor
@@ -567,7 +569,7 @@ buildings:
         storage:
             name: Skladište
             description: Skladišti višak stvari do određenog kapaciteta. Može se koristiti kao zaštita od preljeva.
-    
+
     energy_generator:
         deliver: Dostavi
 
@@ -577,6 +579,13 @@ buildings:
         default:
             name: &energy_generator Generator
             description: Proizvodi energiju iz oblika. Svaki generator zahtijeva različiti oblik.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -656,10 +665,6 @@ storyRewards:
         desc: >-
             This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
 
-    reward_wires:
-        title: Žice
-        desc: TODO
-
     no_reward_freeplay:
         title: Next level
         desc: >-
@@ -688,7 +693,7 @@ settings:
                 regular: Normalno
                 large: Veliko
                 huge: Ogromno
-        
+
         autosaveInterval:
             title: Interval Automatskog Spremanja
             description: >-
@@ -814,7 +819,7 @@ keybindings:
         buildings: Kratice Građevina
         placementModifiers: Modifikatori Smještanja
 
-#TODO
+    #TODO
     mappings:
         confirm: Potvrdi
         back: Nazad
@@ -870,6 +875,7 @@ keybindings:
         placementDisableAutoOrientation: Onemogući automatsku orijentaciju
         placeMultiple: Ostani u modusu za smještanje
         placeInverse: Obrni automatsku orijentaciju pokretnih traka
+        menuClose: Close Menu
 #TODO
 about:
     title: O Igri

translations/base-hu.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Végtelen mentések
-            [*] Sötét Mód
-            [*] Több beállítás
-            [*] Lehetővé teszed, hogy tovább fejlesszem a shapez.io-t ❤️
-            [*] More features in the future!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        Ez a játék nyílt forráskódú - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Sztori mód, ahol az épületek alakzatokba kerülnek
-            [*] Több szint és épület (standalone exclusive)
-            [*] Különböző térképek, és talán akadályok
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] Sokkal több alakzat
-            [*] More performance improvements (Bár a játék így is elég jól fut!)
-            [*] Színvak mód
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Betöltés
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: E
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: <x>. szint
     savegameLevelUnknown: Ismeretlen szint
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: Continue
     newGame: New Game
     madeBy: Made by <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -270,6 +270,10 @@ dialogs:
             You requested to export your base as a screenshot. Please note that this can
             be quite slow for a big base and even crash your game!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Copy
         clearSelection: Clear Selection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +412,11 @@ ingame:
         cyan: Cyan
         white: White
         uncolored: No color
+        black: Black
     shapeViewer:
         title: Layers
         empty: Empty
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -516,6 +523,27 @@ buildings:
         deliver: Deliver
         toUnlock: to unlock
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -727,11 +755,11 @@ settings:
             title: Color Blind Mode
             description: Enables various tools which allow to play the game if you are color blind.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Keybindings
@@ -799,6 +827,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planner: Switch side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: A játékról

translations/base-it.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
-            [*] Color blind mode
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Caricamento
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Livello <x>
     savegameLevelUnknown: Livello sconosciuto
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: Mostra
-        contestOver: Questa competizione è conclusa - Unisciti su Discord per ricevere notizie sulle prossime competizioni!
     continue: Continua
     newGame: Nuova partita
     madeBy: Creato da <author-link>
@@ -198,77 +197,82 @@ dialogs:
             Impossibile eliminare il salvataggio:
 
     restartRequired:
-        title: Restart required
+        title: Restart richiesto
         text: >-
-            You need to restart the game to apply the settings.
+            Per applicare le nuove impostazioni è necessario il Restart del gioco.
 
     editKeybinding:
-        title: Change Keybinding
-        desc: Press the key or mouse button you want to assign, or escape to cancel.
+        title: Cambia comandi
+        desc: Premi un nuovo tasto o un tasto del mouse a cui vuoi assegnare questo comando, Esc per cancellarlo.
 
     resetKeybindingsConfirmation:
-        title: Reset keybindings
-        desc: This will reset all keybindings to their default values. Please confirm.
-
+        title: Reset comandi assegnati
+        desc: Così riporterai tutti comandi al loro stato di default. Perfavore conferma.
     keybindingsResetOk:
-        title: Keybindings reset
-        desc: The keybindings have been reset to their respective defaults!
+        title: Successo nel reset dei comandi
+        desc: I comandi sono stati riassegnati ai loro rispettivi comandi di default!
 
     featureRestriction:
-        title: Demo Version
-        desc: You tried to access a feature (<feature>) which is not available in the demo. Consider to get the standalone for the full experience!
+        title: Versione Demo
+        desc: Hai provato ad accedere ad una feature (<feature>) che non è disponibile nella Demo. Considera di prendere la versione standalne per un'esperienza completa!
 
     oneSavegameLimit:
-        title: Limited savegames
-        desc: You can only have one savegame at a time in the demo version. Please remove the existing one or get the standalone!
+        title: Salvataggi limitati
+        desc: Puoi avere solo un salvataggio nella versione Demo. Perfavore rimuovi il salvataggio già esistente o prendi la versione standalone!
 
     updateSummary:
-        title: New update!
+        title: Nuovo update!
         desc: >-
-            Here are the changes since you last played:
+            Qui puoi trovare i cambiamenti dall'ultima volta che hai giocato:
 
     upgradesIntroduction:
-        title: Unlock Upgrades
+        title: Aggiornamenti sbloccati
         desc: >-
-            All shapes you produce can be used to unlock upgrades - <strong>Don't destroy your old factories!</strong>
-            The upgrades tab can be found on the top right corner of the screen.
+            Tutte le forme che produci possono essere utilizzate per i miglioramenti - <strong>Non distruggere le tue vecchie fabbriche!</strong>
+            Puoi trovare gli aggiornamenti nell'angolo in alto a destra dello schermo.
 
     massDeleteConfirm:
-        title: Confirm delete
+        title: Conferma la rimozione
         desc: >-
-            You are deleting a lot of buildings (<count> to be exact)! Are you sure you want to do this?
+            Stai rimuovendo molte strutture (<count> to be exact)!
+            Sei sicuro di volerlo fare?
 
     blueprintsNotUnlocked:
-        title: Not unlocked yet
+        title: Non ancora sbloccato
         desc: >-
-            Blueprints have not been unlocked yet! Complete more levels to unlock them.
+            I progetti non sono stati ancora sbloccati! Completa più livelli per sbloccarli.
 
     keybindingsIntroduction:
-        title: Useful keybindings
+        title: Comandi utili
         desc: >-
-            This game has a lot of keybindings which make it easier to build big factories.
-            Here are a few, but be sure to <strong>check out the keybindings</strong>!<br><br>
-            <code class='keybinding'>CTRL</code> + Drag: Select area to copy / delete.<br>
-            <code class='keybinding'>SHIFT</code>: Hold to place multiple of one building.<br>
-            <code class='keybinding'>ALT</code>: Invert orientation of placed belts.<br>
+            Questo gioco ha molti comandi utili che possono rendere più semplice la costruzione delle fabbriche.
+            Qui ce ne sono un paio, ma sii sicuro <strong>controlla i comandi</strong>!<br><br>
+            <code class='keybinding'>CTRL</code> + Drag: Seleziona l'area da copiare / cancella.<br>
+            <code class='keybinding'>SHIFT</code>: Tieni premuto per costruire copie dalla struttura.<br>
+            <code class='keybinding'>ALT</code>: Invert l'orientamento dei nastri trasportatori.<br>
 
     createMarker:
-        title: New Marker
-        desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        title: Nuovo Marker
+        desc: Dagli un magnifico nome, puoi anche includere <strong>short key</strong> di una figura (Che puoi generare <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
-        desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
+        desc: Puoi creare solo due Marker personalizzati nella Demo. Prendi la versione standalone per Marker personalizzati illimitati!
     massCutConfirm:
-        title: Confirm cut
+        title: Conferma taglio
         desc: >-
-            You are cutting a lot of buildings (<count> to be exact)! Are you sure you
-            want to do this?
+            Stai tagliando molte strutture (<count> to be exact)!
+            Sei sicuro di volerlo fare?
 
     exportScreenshotWarning:
-        title: Export screenshot
+        title: Esportare screenshot
         desc: >-
-            You requested to export your base as a screenshot. Please note that this can
-            be quite slow for a big base and even crash your game!
+            Hai richiesto di esportare la tua base come screenshot. Perfavore tieni conto che potrebbe
+            essere lento per una grossa base e che potrebbe crushare il gioco!
+
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -292,45 +296,46 @@ ingame:
         copySelection: Copia
         clearSelection: Annulla selezione
         pipette: Contagocce
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
     buildingPlacement:
         # Buildings can have different variants which are unlocked at later levels,
         # and this is the hint shown when there are multiple variants available.
-        cycleBuildingVariants: Press <key> to cycle variants.
+        cycleBuildingVariants: Premi <key> per cambiare variante.
 
         # Shows the hotkey in the ui, e.g. "Hotkey: Q"
         hotkeyLabel: >-
             Hotkey: <key>
 
         infoTexts:
-            speed: Speed
-            range: Range
-            storage: Storage
+            speed: Velocità
+            range: Raggio
+            storage: Spazio
             oneItemPerSecond: 1 oggetto / secondo
             itemsPerSecond: <x> oggetti / s
             itemsPerSecondDouble: (x2)
 
-            tiles: <x> tiles
+            tiles: <x> titles
 
     # The notification when completing a level
     levelCompleteNotification:
         # <level> is replaced by the actual level, so this gets 'Level 03' for example.
-        levelTitle: Level <level>
-        completed: Completed
-        unlockText: Unlocked <reward>!
-        buttonNextLevel: Next Level
+        levelTitle: Livello <level>
+        completed: Completato
+        unlockText: Sbloccato <reward>!
+        buttonNextLevel: Prossimo livello
 
     # Notifications on the lower right
     notifications:
-        newUpgrade: A new upgrade is available!
-        gameSaved: Your game has been saved.
+        newUpgrade: U  nuovo aggiornamento è disponibile!
+        gameSaved: La tua partita è stata salvata.
 
     # The "Upgrades" window
     shop:
-        title: Upgrades
-        buttonUnlock: Upgrade
+        title: Aggiornamenti
+        buttonUnlock: Sblocca
 
         # Gets replaced to e.g. "Tier IX"
         tier: Tier <x>
@@ -338,11 +343,11 @@ ingame:
         # The roman number for each tier
         tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X]
 
-        maximumLevel: MAXIMUM LEVEL (Speed x<currentMult>)
+        maximumLevel: LIVELLO MASSIMO (Speed x<currentMult>)
 
     # The "Statistics" window
     statistics:
-        title: Statistics
+        title: Statistiche
         dataSources:
             stored:
                 title: Immagazzinati
@@ -407,9 +412,11 @@ ingame:
         cyan: Azzurro
         white: Bianco
         uncolored: No colore
+        black: Black
     shapeViewer:
         title: Livelli
         empty: Vuoto
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -517,6 +524,27 @@ buildings:
         deliver: Consegna
         toUnlock: per sbloccare
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -728,11 +756,11 @@ settings:
             title: Color Blind Mode
             description: Enables various tools which allow to play the game if you are color blind.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Keybindings
@@ -800,6 +828,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planner: Switch side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Riguardo questo gioco

translations/base-ja.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.ioは形の作成と合成を自動化するために工場を構築するゲームです。段々と複雑になる要件を納品していくことでゲームをすすめ、工場を高速化するためのアップグレードを解除していきます。
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        要件が増えてくると、ニーズに合わせて工場をスケールアップしていく必要があるでしょう。もちろん、[b]無限のマップ[/b]に展開する資源採取の拡張もお忘れなく！
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        形状だけではすぐに飽きがきますが、色素を混ぜて形を塗る工程もあります。赤、緑、青の色素の資源を組み合わせて、要件を満たす色と形状を作り出しましょう。
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        このゲームは現在18レベルまでが実装されていますが（これだけでもかなりのボリュームです）、今後も継続的に新しい要素が追加で実装されていく予定です。 - すでに沢山計画されています！
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Web版にはないスタンドアローン版のメリット[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] マップのマーク設置とマークへの移動
-            [*] 無制限のセーブデータ
-            [*] ダークモード
-            [*] 多彩な設定
-            [*] shapez.ioのさらなる開発ができます ❤️
-            [*] 将来の追加内容実装
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]今後の実装予定とコミュニティの提案[/b]
+        [b]Future Updates[/b]
 
-        このゲームはオープンソースです。誰でも開発に参加できます！　それ以外にも、私はコミュニティの意見を[b]とても[/b]よく聞いており、なるべくすべての提案を読み、できるだけ多くのフィードバックを考慮に入れるようにしています。
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] 建造物にコストがかかるストーリーモード
-            [*] 追加のレベル、及び建造物（スタンドアローン版限定）
-            [*] 別マップ、もしかすると障害物
-            [*] 設定可能なマップ生成（数やサイズの設定、ランダム生成シード値、その他）
-            [*] 追加の形
-            [*] パフォーマンス向上（このゲームは現状でもかなり軽いです）
-            [*] 色覚異常モード
-            [*] 他にも沢山！
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        完全なロードマップは私のTrelloボードをチェックしてみてください！ https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: ロード中
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: レベル <x>
     savegameLevelUnknown: 不明なレベル
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: 続きから
     newGame: 新規ゲーム
     madeBy: Made by <author-link>
@@ -253,6 +252,7 @@ dialogs:
 
     createMarker:
         title: マーカーを設置
+        titleEdit: マーカーを編集
         desc: わかりやすい名前をつけてください。形を表す<strong>短いキー</strong>を含めることもできます。（<a href="https://viewer.shapez.io" target="_blank">ここ</a>から生成できます）
 
     markerDemoLimit:
@@ -296,6 +296,7 @@ ingame:
         copySelection: コピー
         clearSelection: 選択範囲をクリア
         pipette: ピペット
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -411,9 +412,11 @@ ingame:
         cyan: シアン
         white: 白
         uncolored: 無色
+        black: Black
     shapeViewer:
         title: レイヤー
         empty: 空
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -521,6 +524,27 @@ buildings:
         storage:
             name: 格納庫
             description: 余ったアイテムを指定の上限まで格納します。余剰の受け口としても使用可能です。
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -728,11 +752,11 @@ settings:
             title: 色覚モード
             description: 色覚異常を持っていてもゲームがプレイできるようにするための各種ツールを有効化します。
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: キー設定
@@ -801,6 +825,10 @@ keybindings:
         lockBeltDirection: ベルトプランナーを有効化
         switchDirectionLockSide: "プランナー: 通る側を切り替え"
         pipette: ピペット
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: このゲームについて

translations/base-kor.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io는 다양한 도형의 생산과 조합을 자동화하는 공장들을 짓는 게임입니다. 점점 복잡해지는 요구사항을 충족하고 업그레이드를 잠금 해제해서 공장의 성능을 높일 수 있습니다.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        점점 증가하는 수요를 충족하기 위해 공장의 규모를 키워야 합니다. [b]무한한 공간[/b]으로 확장하여 도형 재료를 구하는 것도 잊지 마세요.
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        단순한 도형은 금방 싫증이 나므로, 색을 조합하여 도형을 색칠하세요. 빨강, 초록, 파랑을 조합하여 다양한 색을 만들고 도형을 색칠하여 요구사항을 충족하세요.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        이 게임에는 18개의 레벨이 있습니다. (이것만으로도 이미 몇시간이 걸렸을 거예요!) 하지만 저는 항상 새로운 컨텐츠를 추가하고 있습니다. 계획해 놓은 것들도 많구요!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]유료 버전의 장점[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] 마커
-            [*] 제한 없는 저장
-            [*] 다크 모드
-            [*] 더 다양한 설정
-            [*] 제가 shapez.io를 개발하는 데 도움이 됨 ❤️
-            [*] 향후 더 많은 컨텐츠
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b] 예정된 컨탠츠 및 커뮤니티 제안[/b]
+        [b]Future Updates[/b]
 
-        이 게임은 오픈 소스입니다. 따라서 누구나 기여할 수 있습니다! 또한, 커뮤니티의 제안을 [b]많이[/b] 듣고 있습니다! 가능한 많이 읽고 많이 반영하도록 노력하겠습니다.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] 건물을 도형으로 구매해야 돼는 스토리 모드
-            [*] 더 많은 레벨과 건물 (유료 버전 한정)
-            [*] 다양한 월드와 맵 장애물
-            [*] 당신만의 맵 제작
-            [*] 더 많은 종류의 도형
-            [*] 성능 향상 (지금도 게임이 잘 되긴 합니다!)
-            [*] 색맹자용 모드
-            [*] 그 외 다수!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        저의 트렐로 보드를 확인해서 로드맵을 확인해보세요! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: 로딩중
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -130,29 +150,7 @@ mainMenu:
     savegameLevel: 레벨 <x>
     savegameLevelUnknown: 레벨 모름
 
-    contests:
-        contest_01_03062020:
-            title: "콘테스트 #01"
-            desc: 가장 멋진 공장을 지으신 분에게 <strong>$25</strong>를 !
-            longDesc: >-
-                여러분들에게 무언가를 나눠드리고 싶어서 주간 콘테스트를 개최합니다!
 
-                <br><br>
-                <strong>이번주 토픽:</strong> 가장 멋있는 공장을 만드세요!
-                <br><br>
-                참여하는 법:<br>
-                <ul class="bucketList">
-                    <li>여러분 공장의 스크린샷을 여기로 보내세요: <strong>contest@shapez.io</strong></li>
-                    <li>소셜 미디어에 공유하면 보너스 포인트!</li>
-                    <li>스크린샷 5개를 골라 <strong>디스코드 </strong> 커뮤니티에서 투표를 진행할 예정입니다.</li>
-                    <li>우승자는 <strong>$25</strong>를 받습니다! (PayPal이나 아마존 기프트 카드 중 원하는 것으로)</li>
-                    <li>기한: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                당신들의 멋진 공장을 보고 싶습니다!
-
-        showInfo: 보기
-        contestOver: 이 콘테스트는 끝났습니다. 디스코드에서 새로운 콘테스트 관련 알림을 받으세요!
     continue: 계속하기
     newGame: 새 게임
     madeBy: 제작 <author-link>
@@ -260,6 +258,7 @@ dialogs:
     createMarker:
         title: 새로운 마커
         desc: 이 장소에 이름을 지어주세요, 당신은 원하는 모양으로 <strong>단축키</strong>를 생성할 수 있습니다. (<a href="https://viewer.shapez.io" target="_blank">여기</a>에서 만들 수 있습니다.)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: 데모 버전에서는 마커를 2개 까지만 놓을 수 있습니다. 유료 버전을 구입하면 마커를 무제한으로 놓을 수 있습니다!
@@ -270,6 +269,10 @@ dialogs:
             당신은 당신의 공장을 스크린샷으로 내보내려 하고있습니다. 공장이 너무 큰 경우에는
             시간이 오래 걸리거나 게임이 꺼질 수도 있음을 알려드립니다!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +295,7 @@ ingame:
         copySelection: 선택된 부분 복사하기
         clearSelection: 선택된 부분 지우기
         pipette: 스포이드
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +411,11 @@ ingame:
         cyan: 청록
         white: 하양
         uncolored: 색
+        black: Black
     shapeViewer:
         title: 층
         empty: 비었음
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -517,6 +523,27 @@ buildings:
         storage:
             name: 저장소
             description: 할당된 용량만큼 초과되는 도형을 저장한다.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -798,6 +825,11 @@ keybindings:
         lockBeltDirection: 벨트 플래너 활성화
         switchDirectionLockSide: "플래너: 방향 바꾸기"
         pipette: 피펫
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: 이 게임의 정보

translations/base-lt.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
-            [*] Color blind mode
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Loading
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unknown Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: Continue
     newGame: New Game
     madeBy: Made by <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -270,6 +270,10 @@ dialogs:
             You requested to export your base as a screenshot. Please note that this can
             be quite slow for a big base and even crash your game!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Copy
         clearSelection: Clear Selection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +412,11 @@ ingame:
         cyan: Cyan
         white: White
         uncolored: No color
+        black: Black
     shapeViewer:
         title: Layers
         empty: Empty
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -517,6 +524,27 @@ buildings:
         storage:
             name: Storage
             description: Stores excess items, up to a given capacity. Can be used as an overflow gate.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -727,11 +755,11 @@ settings:
             title: Color Blind Mode
             description: Enables various tools which allow to play the game if you are color blind.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Keybindings
@@ -799,6 +827,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planner: Switch side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: About this Game

translations/base-nl.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is een spel dat draait om het bouwen van fabrieken om steeds complexere vormen te produceren en deze productie te automatiseren. Lever de gevraagde, steeds complexere vormen, om verder te komen in het spel en om upgrades voor je fabrieken te ontgrendelen.
+        shapez.io is een spel dat draait om het bouwen van fabrieken om steeds complexere vormen te produceren en deze productie te automatiseren in een oneindig groot speelveld. 
+        Door het leveren van de gevraagde vormen, kom je verder in het spel en ontgrendel je upgrades waar je fabriek sneller van wordt. 
 
-        De vraag naar vormen wordt steeds groter, wat betekent dat je fabriek moet blijven uitbreiden om dit tegemoet te komen. Om de juiste grondstoffen te delven zul je steeds verder in het [b]oneindig grote speelveld[/b] moeten gaan werken!
-
-        Omdat simpele vormen snel saai worden, moet je kleuren mengen om de vormen te verven - combineer rode, groene en blauwe grondstoffen om verschillende kleuren te produceren en gebruik deze om de vormen te verven, zodat je de vraag hiernaar tegemoet kan komen.
+        De vraag naar vormen wordt steeds groter, wat betekent dat je de fabriek moet uitbreiden om de vraag tegemoet te komen. Om de juiste grondstoffen te delven zul je steeds verder in het [b]oneindig grote speelveld[/b] moeten gaan werken!
+        
+        Omdat simpele vormen snel saai worden, moet je kleuren mengen om de vormen te verven - Combineer rode, groene en blauwe grondstoffen om verschillende kleuren te produceren en gebruik deze om de vormen te verven, zodat je de vraag hiernaar tegemoet kan komen.
 
         Dit spel bevat 18 levels (Waar je al uren mee bezig zal zijn!), maar ik ben continu bezig om het spel uit te breiden - er staat veel in de planning!
 
+        Wanneer je het spel koopt dan krijg je toegang tot de standalone versie. Deze heeft extra functies en je krijgt ook toegang tot nieuwe ontwikkelingen.
 
-        [b]Standalone voordelen[/b]
+        [b]Standalone Voordelen[/b]
 
         [list]
-            [*] Markeringen
-            [*] Oneindig veel Savegames
             [*] Donkere modus
-            [*] Meer opties
-            [*] Met jouw steun kan ik shapez.io verder ontwikkelen ❤️
-            [*] Meer functies in de toekomst!
+            [*] Oneindig veel markeringen 
+            [*] Oneindig veel savegames
+            [*] Extra opties
+            [*] Binnenkort: Kabels & Energie! Hopelijk vanaf eind juli 2020.
+            [*] Binnenkort: Meer Levels
+            [*] Helpt mij om shapez.io verder te ontwikkelen ❤️
         [/list]
 
-        [b]Geplande functies & suggesties van de community[/b]
+        [b]Geplande Updates[/b]
 
-        Dit spel is open source - Iedereen kan bijdragen! Daarnaast luister ik [b]erg veel[/b] naar de community! Ik probeer alle suggesties te lezen en gebruik feedback zo veel als mogelijk.
+        Ik update het spel regelmatig en probeer dit zeker eenmaal per week te doen!
 
         [list]
-            [*] Verhaalmodus, waar gebouwen specifieke vormen kosten om te bouwen
-            [*] Meer levels & gebouwen (exclusief in de standalone)
-            [*] Verschillende mappen en misschien obstakels in mappen
-            [*] Aangepaste mappen aanmaken (Het kiezen van de hoeveelheid en de grootte van de grondstofbronnen, seeds, en meer)
+            [*] Verschillende speelvelden en uitdagingen (bijv. obstakels)
+            [*] Puzzels (Bezorg de gevraagde vorm binnen een afgesloten gebied of met bepaalde gebouwen)
+            [*] Een verhaalmodus waar gebouwen iets kosten
+            [*] Aanpasbare speelveldgenerator (Kies de hoeveelheid en grootte van grondstoffen, seed en meer)
             [*] Meer soorten vormen
-            [*] Meer prestatieverbeteringen (Hoewel het spel al vrij goed loopt!)
-            [*] Kleurenblindmodus
+            [*] Prestatieverbeteringen (Het spel loopt al vrij goed!)
             [*] En nog veel meer!
         [/list]
 
-        Bekijk mijn trello-bord voor het volledige stappenplan! https://trello.com/b/ISQncpJP/shapezio
+        [b]Dit spel is open source![/b]
+
+        Iedreen kan bijdragen. Ik ben actief in de community en probeer naar alle suggesties en feedback te kijken en deze mee te nemen in de ontwikkeling.
+        Bekijk mijn trello-bord voor het volledige stappenplan!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Stappenplan[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help met vertalen[/url]
+        [/list]
+
+    discordLink: Officiële Discord - Chat met mij!
 
 global:
     loading: Laden
@@ -73,12 +90,15 @@ global:
 
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
+    
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
 
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
-        thousands: K
+        thousands: k
         millions: M
-        billions: G
+        billions: B
         trillions: T
 
     # Shown for infinitely big numbers
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Onbekend Level
 
-    contests:
-        contest_01_03062020:
-            title: "Competitie #01"
-            desc: Win <strong>$25</strong> voor de meest coole basis!
-            longDesc: >-
-                Om wat aan jullie terug te geven leek het me leuk om wekelijkse competities te houden!
-                <br><br>
-                <strong>Het onderwerp van deze week:</strong> Bouw de meest coole basis!
-                <br><br>
-                Dit is hoe het zit:<br>
-                <ul class="bucketList">
-                    <li>Stuur een screenshot van jouw basis naar <strong>contest@shapez.io</strong></li>
-                    <li>Bonuspunten als je het deelt op social media!</li>
-                    <li>Ik kies 5 screenshots en presenteer deze aan de <strong>discord</strong> community om te stemmen.</li>
-                    <li>De winnaar krijgt <strong>$25</strong> (Paypal, Amazon Gift Card, wat jij het liefste hebt)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Ik kijk er naar uit om jullie geweldige creaties te zien!
 
-        showInfo: Laat zien
-        contestOver: Deze competitie is voorbij - word lid van de discord (engelstalig) om berichten te krijgen van nieuwe competities!
     continue: Verder
     newGame: Nieuw Spel
     madeBy: Gemaakt door <author-link>
@@ -170,7 +169,7 @@ dialogs:
         deleteGame: Ik weet wat ik doe
         viewUpdate: Zie Update
         showUpgrades: Zie Upgrades
-        showKeybindings: Zie sneltoetsen
+        showKeybindings: Zie Sneltoetsen
 
     importSavegameError:
         title: Import Error
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: Nieuwe markering
         desc: Geef het een betekenisvolle naam. Je kunt ook een <strong>icoontje</strong> van een vorm toevoegen (die je <a href="https://viewer.shapez.io" target="_blank">hier</a> kunt maken)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Je kunt maar twee markeringen plaatsen in de demo. Koop de standalone voor een ongelimiteerde hoeveelheid markeringen!
@@ -268,6 +268,10 @@ dialogs:
         desc: >-
             Je hebt aangegeven dat je jouw basis wil exporteren als screenshot. Als je een grote basis hebt kan dit proces langzaam zijn en er zelfs voor zorgen dat je spel crasht!
 
+    massCutInsufficientConfirm:
+        title: Bevestig knippen
+        desc: Je kunt het je niet veroorloven om de selectie te plakken! Weet je zeker dat je het wil knippen?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -283,13 +287,14 @@ ingame:
         placeBuilding: Plaats gebouw
         createMarker: Plaats markering
         delete: Vernietig
-        pasteLastBlueprint: Plak de laatst gekopiëerde blauwdruk
-        lockBeltDirection: Maak gebruik van de lopende band planner
+        pasteLastBlueprint: Plak laatst gekopiëerde blauwdruk
+        lockBeltDirection: Gebruik lopende band planner
         plannerSwitchSide: Draai de richting van de planner
         cutSelection: Knip
         copySelection: Kopieer
-        clearSelection: Cancel selectie
+        clearSelection: Annuleer selectie
         pipette: Pipet
+        switchLayers: Wissel lagen
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -366,7 +371,7 @@ ingame:
         buttons:
             continue: Verder spelen
             settings: Opties
-            menu: Terug naar het menu
+            menu: Terug naar het Menu
 
     # Bottom left tutorial hints
     tutorialHints:
@@ -405,9 +410,11 @@ ingame:
         cyan: Cyaan
         white: Wit
         uncolored: Geen kleur
+        black: Zwart
     shapeViewer:
         title: Lagen
         empty: Leeg
+        copyKey: Kopiëer sleutel
 
 # All shop upgrades
 shopUpgrades:
@@ -515,6 +522,27 @@ buildings:
         deliver: Lever
         toUnlock: om te ontgrendelen
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energiekabel
+            description: Voor transport van energie.
+    advanced_processor:
+        default:
+            name: Kleur-omkeerder
+            description: Keert de kleur om van een voorwerp.
+    energy_generator:
+        deliver: Lever
+        toGenerateEnergy: Voor
+        default:
+            name: Energiegenerator
+            description: Wekt energie op door vormen te consumeren.
+    wire_crossings:
+        default:
+            name: Kabelsplijter
+            description: Splijt één kabel in twee.
+        merger:
+            name: Kabelvoeger
+            description: Voegt twee kabels samen tot één.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -565,7 +593,7 @@ storyRewards:
             Je hebt een compacte variant van de <strong>verdeler</strong> ontgrendeld - Dit voegt twee lopende banden samen tot één.
 
     reward_cutter_quad:
-        title: Quad Cutting
+        title: Quad Knippen
         desc: Je hebt een variant van de <strong>knipper</strong> ontgrendeld - Dit knipt vormen in <strong>vier stukken</strong> in plaats van twee!
 
     reward_painter_double:
@@ -577,7 +605,7 @@ storyRewards:
         desc: Je hebt een variant van de <strong>verver</strong> ontgrendeld - Het verft elk kwadrant van de vorm een andere kleur!
 
     reward_storage:
-        title: Opslag buffer
+        title: Opslagbuffer
         desc: Je hebt een variant van de <strong>vuilnisbak</strong> ontgrendeld - Het slaat voorwerpen op tot een zekere hoeveelheid!
 
     reward_freeplay:
@@ -727,8 +755,8 @@ settings:
         rotationByBuilding:
             title: Rotatie per type gebouw
             description: >-
-                Elk type gebouw onthoud apart de rotatie waarin je het voor het laatst geplaatst hebt. 
-                Dit kan handig zijn wanneer je vaak tussen verschillende 
+                Elk type gebouw onthoud apart de rotatie waarin je het voor het laatst geplaatst hebt.
+                Dit kan handig zijn wanneer je vaak tussen verschillende
                 soorten gebouwen wisselt.
 
 keybindings:
@@ -797,6 +825,11 @@ keybindings:
         lockBeltDirection: Schakel lopende band-planner in
         switchDirectionLockSide: "Planner: Wissel van richting"
         pipette: Pipet
+        menuClose: Sluit Menu
+        switchLayers: Lagen omwisselen
+        advanced_processor: Kleur-omvormer
+        energy_generator: Energiegenerator
+        wire: Energiekabel
 
 about:
     title: Over dit spel

translations/base-no.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io er et spill som handler om å bygge fabrikker for å automatisere byggeprosessen og kombinere forskjellige former og fasonger. Lever objektene som øker i kompleskitet og fasonger for å progressere i spillet og åpne opp nye oppgraderinger til din fabrikk.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Siden forespørselen øker, må du skalere opp fabrikken din for å tilpasse deg til behovet - Men ikke glem tilgangen du har til ressurser, du må utvide på det [b]uendelige brettet[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Siden figurer i seg selv kan bli kjedelig, må du snart mikse farger og fargelegge dine figurer - Kombiner rød, grønn og blå farge-ressurser for å produsere forskjellige farger, og fargelegg figurene for å tilfredsstille behovet.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Spillet har 18 nivåer (Som bør holde deg opptatt i mange timer!) men jeg legger konstant til nytt innhold - Det er mye som er planlagt!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Frittstående Fordeler[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Kartmarkering
-            [*] Uendelige lagringsfiler
-            [*] Mørk Modus
-            [*] Flere instillinger
-            [*] Tillater meg å videreutvikle shapez.io ❤️
-            [*] Flere funksjoner i fremtiden!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planlagte funksjoner & Forslag fra samfunnet[/b]
+        [b]Future Updates[/b]
 
-        Spillet er åpen kildekode - Alle kan bidra! Utenom det, så lytter jeg [b]veldig[/b] til samfunnet! Jeg prøver å lese alle forslag og ta imot så mye tilbakemeldinger som mulig.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Kampanje
-            [*] Flere nivåer & bygninger (Frittstående eksklusivt)
-            [*] Forskjellige brett, og kanskje hinder på brettet
-            [*] Konfigurerbart brett-generasjon (Endre antall og størrelse på ressursfelt, seed, med mer)
-            [*] Flere forskjellige type former
-            [*] Mer forbedring av ytelse (Selv om spillet allerede kjører ganske bra!)
-            [*] Fargeblind modus
-            [*] Og mye mer!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Sjekk ut min trello tavle for hele planen! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Laster
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Nivå <x>
     savegameLevelUnknown: Ukjent Nivå
 
-    contests:
-        contest_01_03062020:
-            title: "Konkurranse #01"
-            desc: Vinn <strong>$25</strong> for den kuleste basen!
-            longDesc: >-
-                For å gi noe tilbake til deg, tenkte jeg det ville vært kult med ukentlige konkurranser!
-                <br><br>
-                <strong>Denne ukens tema:</strong> Bygg den kuleste basen!
-                <br><br>
-                Her er tingen:<br>
-                <ul class="bucketList">
-                    <li>Send et skjermbilde av basen din til <strong>contest@shapez.io</strong></li>
-                    <li>Bonus poeng om du deler på sosiale medier!</li>
-                    <li>Jeg velger 5 skjermbilder og foreslår de på <strong>discord</strong> for samfunnet til å stemme.</li>
-                    <li>Vinneren får <strong>$25</strong> (Paypal, Amazon Gift Card, eller hva du foretrekker)</li>
-                    <li>Frist: 07.06.2020 00:00 Sentraleuropeisk sommertid</li>
-                </ul>
-                <br>
-                Jeg ser fram til å se dine kule skapninger!
 
-        showInfo: Vis
-        contestOver: Denne konkurransen er ferdig - Bli med på discord for å få varsel om nye konkurranser!
     continue: Fortsett
     newGame: Nytt Spill
     madeBy: Laget av <author-link>
@@ -260,6 +259,7 @@ dialogs:
     createMarker:
         title: Ny Markør
         desc: Gi markøren et meningsfullt navn, du kan også inkludere <strong>"short key"</strong> av et objekt (Som du kan generere <a href="https://viewer.shapez.io" target="_blank">her</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Du kan kun ha to markører i demo verjsonen. Skaff deg frittstående versjon for ubegrensede markører!
@@ -267,6 +267,9 @@ dialogs:
     exportScreenshotWarning:
         title: Eksporter skjermbilde
         desc: Du forespurte å eksportere bilde av basen din som et skjermbilde. Vær obs på at dette kan ta lang tid for en stor base, og i verste fall kræsje spillet ditt (Husk å lagre først)!
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
 
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
@@ -290,6 +293,7 @@ ingame:
         copySelection: Kopier
         clearSelection: Fjern Valgte
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -405,9 +409,11 @@ ingame:
         cyan: Cyan
         white: Hvit
         uncolored: Ingen farge
+        black: Black
     shapeViewer:
         title: Lag
         empty: Tom
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -515,6 +521,27 @@ buildings:
         storage:
             name: Lagringsboks
             description: Lagrer overflødige objekter, opp til en viss kapasitet. Kan bli brukt som mellomlagring for overflyt.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -727,11 +754,11 @@ settings:
             title: Fargeblind Modus
             description: Aktiverer forskjellige verktøy som lar deg spille spillet om du er fargeblind.
         rotationByBuilding:
-          title: Roter basert på bygningstype
-          description: >-
-            Hver bygning type husker rotasjonen du sist brukte individuelt.
-            Dette kan være mer komfortabelt hvis du ofte veksler mellom plassering
-            av forskjellige bygninger.
+            title: Roter basert på bygningstype
+            description: >-
+                Hver bygning type husker rotasjonen du sist brukte individuelt.
+                Dette kan være mer komfortabelt hvis du ofte veksler mellom plassering
+                av forskjellige bygninger.
 
 keybindings:
     title: Hurtigtaster
@@ -799,6 +826,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planlegger: Bytt side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Om dette spillet

translations/base-pl.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io jest grą o budowaniu i automatyzacji fabryki różnych kształtów. Dostarczaj coraz bardziej skomplikowane kształty, żeby odblokować nowe ulepszenia i przyspieszyć produkcję w twojej fabryce.
+        shapez.io to gra o budowie fabryk, która automatyzuje tworzenie i przetwarzanie coraz bardziej złożonych kształtów na nieskończenie powiększającej się mapie.
+        Po dostarczeniu wymaganych kształtów będziesz postępować w grze i odblokowywać ulepszenia, aby przyspieszyć fabrykę.
 
-        Będziesz potrzebował coraz więcej elementów, więc również sporo miejsca na powiększanie fabryki. [b]Nieskończona mapa[/b] to coś co ułatwi Ci ten proces!
+        Wraz ze wzrostem zapotrzebowania na kształty, będziesz musiał powiększyć swoją fabrykę, aby zaspokoić popyt - Nie zapominaj jednak o zasobach, będziesz musiał rozwinąć się na [b] nieskończonej mapie [/ b]!
 
-        Same kształty mogą z czasem być nudne, dlatego gra będzie wymagała od Ciebie malowania ich różnymi kolorami - połącz czerwoną, zieloną i niebieską farbę, a powstanie nowa o innym kolorze. Korzystaj z farb, by móc ukończyć kolejne poziomy.
+        Wkrótce będziesz musiał mieszać kolory i malować nimi kształty - Połącz zasoby kolorów czerwonego, zielonego i niebieskiego, aby uzyskać różne kolory i pomalować kształty, aby zaspokoić popyt.
 
-        Na tę chwilę gra oferuje 18 poziomów (które powinny zagwarantować rozrywkę na co najmniej kilka godzin!), ale bez przerwy dodaję nowe - jest naprawdę wiele do dodania!
+        Ta gra oferuje 18 poziomów progresywnych (które powinny być zajęte przez wiele godzin!), Ale ciągle dodam nowe treści - Wiele jest zaplanowanych!
 
+        Zakup gry daje dostęp do samodzielnej wersji, która ma dodatkowe funkcje, a także dostęp do nowo opracowanych funkcji.
 
-        [b]Zalety pełnej wersji[/b]
+        [b]Samodzielne zalety[/b]
 
         [list]
-            [*] Znaczniki
-            [*] Nielimitowana ilość zapisanych gier
-            [*] Ciemny motyw gry
-            [*] Więcej ustawień
-            [*] Pomożesz mi w dalszym rozwijaniu shapez.io ❤️
-            [*] Więcej zawartości niedługo!
+            [*] Tryb ciemny
+            [*] Nieograniczone punkty trasy
+            [*] Nieograniczona liczba zapisanych gier
+            [*] Dodatkowe ustawienia
+            [*] Wkrótce: przewody i energia! Dążenie do (z grubsza) końca lipca 2020 r.
+            [*] Wkrótce: Więcej poziomów
+            [*] Pozwala mi dalej rozwijać shapez.io ❤️
         [/list]
 
-        [b]Zaplanowana zawartość & Sugestie społeczności[/b]
+        [b]Przyszłe aktualizacje[/b]
 
-        Ta gra jest open-source - Każdy może pomóc w rozwoju! Poza tym słucham tego, co społeczność ma do powiedzenia w kwestii gry! Staram się czytać wszystkie sugestie i odbierać jak najwięcej informacji zwrotnych na temat gry.
+        Aktualizuję grę bardzo często i staram się przesyłać aktualizacje przynajmniej co tydzień!
 
         [list]
-            [*] Kampania, gdzie do budowy potrzeba kształtów
-            [*] Więcej poziomów i budynków (tylko w pełnej wersji)
-            [*] Inne mapy, może z przeszkodami
-            [*] Możliwość modyfikowania parametrów generowanej mapy (ilość i rozmiar surowców, ziarno świata, itd.)
-            [*] Więcej rodzajów kształtów
-            [*] Optymalizacja (mimo wszystko gra już działa dość płynnie!)
-            [*] Tryb dla ślepoty barw
+            [*] Różne mapy i wyzwania (np. Mapy z przeszkodami)
+            [*] Puzzle (Dostarcz żądany kształt z ograniczonym obszarem / zestawem budynków)
+            [*] Tryb fabularny, w którym budynki kosztują
+            [*] Konfigurowalny generator map (Konfiguruj rozmiar / gęstość zasobu / kształtu, ziarno i więcej)
+            [*] Dodatkowe typy kształtów
+            [*] Ulepszenia wydajności (gra działa już całkiem dobrze!)
             [*] I wiele więcej!
         [/list]
 
-        Sprawdź tablicę trello i zobacz nad czym teraz pracuję! https://trello.com/b/ISQncpJP/shapezio
+        [b]Ta gra jest open source![/b]
+
+        Każdy może się przyłączyć, jestem aktywnie zaangażowany w społeczność i staram się przejrzeć wszystkie sugestie i wziąć pod uwagę opinie tam, gdzie to możliwe.
+        Zapoznaj się z moją tablicą trello, aby zobaczyć pełną mapę drogową!
+
+        [b]Linki[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Oficjalna Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Kod źródłowy (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Pomóż w tłumaczeniu[/url]
+        [/list]
+
+    discordLink: Oficjalna Discord - Porozmawiaj ze mną!
 
 global:
     loading: Ładowanie
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     # Translator note: We don't use SI size units for common speak, but if you want to keep it SI
     # ...also, Polish has wierd nature of diffrent number naming, we have "million" and "milliard"-thing wich actually is billion in English
@@ -136,29 +156,7 @@ mainMenu:
     savegameLevel: Poziom <x>
     savegameLevelUnknown: Nieznany poziom
 
-    contests:
-        contest_01_03062020:
-            title: "Konkurs #01"
-            desc: Wygraj <strong>25$</strong> za najciekawszą bazę!
-            #Translator note: We don't use AM/PM, we mainly use 24 hour clock system, older generations use 12h
-            longDesc: >-
-                Żeby dać wam coś od siebie, pomyślałem, że było by fajnie robić tygodniowe konkursy!
-                <br><br>
-                <strong>Temat tego tygodnia:</strong> Zbuduj najciekawszą fabrykę!
-                <br><br>
-                Zasady:<br>
-                <ul class="bucketList">
-                    <li>Wyślij zrzut ekranu fabryki na adres <strong>contest@shapez.io</strong></li>
-                    <li>Dodatkowe punkty za udostępnianie na mediach społecznościowych!</li>
-                    <li>Wybiorę 5 najlepszych moim zdaniem projektów i pozwolę społeczności <strong>discord</strong> głosować.</li>
-                    <li>Wygrany dostaje <strong>$25</strong> (Paypal, Amazon Gift Card, którekolwiek wolisz).</li>
-                    <li>Termin: 07.06.2020 12:00 CEST</li>
-                </ul>
-                <br>
-                Nie mogę się doczekać, by zobaczyć Wasze fabryki!
 
-        showInfo: Wyświetl
-        contestOver: Ten konkurs już się skończył - Dołącz do serwera Discord by nie przegapić kolejnych!
     madeBy: Gra wykonana przez <author-link>
     subreddit: Reddit
 
@@ -259,7 +257,7 @@ dialogs:
     createMarker:
         title: Nowy Znacznik
         desc: Podaj nazwę znacznika. Możesz w niej zawrzeć <strong>kod kształtu</strong>, który możesz wygenerować <a href="https://viewer.shapez.io" target="_blank">tutaj</a>.
-
+        titleEdit: Edytuj Znacznik
     markerDemoLimit:
         desc: Możesz stworzyć tylko dwa własne znaczniki w wersji demo. Zakup pełną wersję gry dla nielimitowanych znaczników!
 
@@ -275,6 +273,10 @@ dialogs:
             fabryki ta akcja może być bardzo wolna, a nawet może spowodować zawieszenie się lub awarię gry!
             Czy na pewno chcesz kontynuować?
 
+    massCutInsufficientConfirm:
+        title: Potwierdź cięcie
+        desc: Nie możesz sobie pozwolić na wklejenie tego obszaru! Czy na pewno chcesz to wyciąć?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -297,6 +299,7 @@ ingame:
         copySelection: Skopiuj
         clearSelection: Wyczyść zaznaczenie
         pipette: Wybierz obiekt z mapy
+        switchLayers: Switch layers
 
     # Names of the colors, used for the color blind mode
     colors:
@@ -308,6 +311,7 @@ ingame:
         cyan: Cyjanowy
         white: Biały
         uncolored: Brak koloru
+        black: Black
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -353,7 +357,7 @@ ingame:
         # 2nd translator's note: I think translating this to "level" is better (and that's how Google Translate translates it :))
         tier: Poziom <x>
 
-        # The roman number for each tier
+        # The roman numeral for each tier
         tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X]
 
         maximumLevel: POZIOM MAKSYMALNY (Szybkość x<currentMult>)
@@ -410,6 +414,7 @@ ingame:
     shapeViewer:
         title: Poziomy
         empty: Puste
+        copyKey: Copy Key
 
     # Interactive tutorial
     interactiveTutorial:
@@ -529,6 +534,27 @@ buildings:
         storage:
             name: Magazyn
             description: Magazynuje obiekty, do określonego limitu. Może zostać użyty jako bramka przepełnienia.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -750,14 +776,14 @@ settings:
                 100 budynków.
 
         enableColorBlindHelper:
-            title: Color Blind Mode
-            description: Enables various tools which allow to play the game if you are color blind.
+            title: Tryb ślepy na kolory
+            description: Włącza różne narzędzia, które pozwalają ci grać, jeśli jesteś daltonistą.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Obrót według typu budynku
+            description: >-
+                Każdy typ budynku pamięta obrót, który ostatnio ustawiłeś indywidualnie.
+                Może to być wygodniejsze, jeśli często przełączasz się między umieszczaniem
+                różne typy budynków.
 
 keybindings:
     title: Klawiszologia
@@ -825,6 +851,11 @@ keybindings:
         switchDirectionLockSide: >-
             Planowanie taśmociągu: Zmień stronę
         pipette: Wybieranie obiektów z mapy
+        menuClose: Zamknij Menu
+        switchLayers: zamknij menu
+        advanced_processor: Kolor Falownika
+        energy_generator: Generator Energii
+        wire: Drut Energetyczny
 
 about:
     title: O Grze

translations/base-pt-BR.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io é um jogo sobre construir fábricas para automatizar a criação e combinação de formas. Entregue formas cada vez mais complexas pedidas pelo jogo para progredir e desbloquear melhorias que aceleram sua fábrica.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Como a demanda é crescente, será necessário dimensionar uma fábrica que atenda a necessidade - Não se esqueça dos recursos à sua disposição, você poderá expandir em um [b]mapa infinito[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Formas podem ficar entediantes por si só, logo você terá que misturar cores e pintá-las - Combine os recursos vermelho, verde e azul para produzir cores diferentes e pintar as formas com elas pra atender a demanda.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Esse jogo apresenta 18 níveis (que já devem mantê-lo ocupado por horas!) mas estou constantemente adicionado conteúdo novo - Muito já está planejado!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Vantagens da Versão Standalone[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Marcações no mapa
-            [*] Jogos salvos ilimitados
-            [*] Modo escuro
-            [*] Mais opções no menu
-            [*] Me ajuda a desenvolver mais o shapez.io ❤️
-            [*] Ainda mais recursos no futuro!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Melhoras Planejadas & Sugestões da Comunidade[/b]
+        [b]Future Updates[/b]
 
-        Esse jogo tem código aberto - Qualquer um pode contribuir! Além disso, eu ouço [b]muito[/a] a comunidade! Tento ler todas as sugestões e levar o máximo possível de comentários sobre o jogo em consideração.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Modo história, onde construir custará formas
-            [*] Mais níves & construções (exclusivo da versão standalone)
-            [*] Mapas diferentes, e talvez obstáculos no mapa
-            [*] Criação de mapa configurável (Número e tamanho de recursos, seed, e mais)
-            [*] Mais tipos de formas
-            [*] Mais melhoras no desempenho (Mesmo que o jogo já esteja rodando bem rápido!)
-            [*] Acessibilidade para daltonismo
-            [*] E muito mais!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Não deixe de conferir na minha página no trello o planejamento completo! (em inglês) https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Carregando
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: K
@@ -130,28 +150,7 @@ mainMenu:
     savegameLevel: Nível <x>
     savegameLevelUnknown: Nível desconhecido
 
-    contests:
-        contest_01_03062020:
-            title: "Concurso #01"
-            desc: Ganhe <strong>$25</strong> pela melhor base!
-            longDesc: >-
-                Para retribuir, pensei que seria legal fazer concursos semanais!
-                <br><br>
-                <strong> Tópico dessa semana:</strong> Construa a base mais legal!
-                <br><br>
-                Esse é o plano:<br>
-                <ul class="bucketList">
-                    <li>Envie uma captura de tela da sua base para <strong>contest@shapez.io</strong></li>
-                    <li>Pontos bônus se você o compartilhar nas mídias sociais!</li>
-                    <li>Vou escolher 5 capturas de tela e propor à votação a comunidade <strong>discord</strong>.</li>
-                    <li>o vencedor recebe <strong>$25</strong> (Paypal, Amazon Gift Card, o que você preferir)</li>
-                    <li>Até 07.06.2020 12:00 CEST</li>
-                </ul>
-                <br>
-                Estou ansioso para ver suas criações incríveis!
 
-        showInfo: Participar
-        contestOver: Esse concurso está encerrado - Entre no discord para ser informado sobre novos concursos!
     helpTranslate: Ajude a traduzir!
     continue: Continuar
     newGame: Novo jogo
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: Nova Marcação
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
     markerDemoLimit:
         desc: >-
             Você só pode criar dois marcadores na versão demo. Adquira a versão completa para marcadores ilimitados!
@@ -269,6 +269,10 @@ dialogs:
         desc: >-
             Você está prestes a exportar uma captura de tela da sua base. Note que isso pode ser bastante lento para uma base grande, e até mesmo pode travar o jogo!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Copy
         clearSelection: Clear Selection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -406,9 +411,11 @@ ingame:
         cyan: Cyan
         white: White
         uncolored: No color
+        black: Black
     shapeViewer:
         title: Layers
         empty: Empty
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -518,6 +525,27 @@ buildings:
         deliver: Entregue
         toUnlock: para desbloquear
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -728,10 +756,10 @@ settings:
             title: Modo daltônico.
             description: Permite várias ferramentas que permitem jogar se você é daltônico.
         rotationByBuilding:
-          title: Rotação por tipo de construção
-          description: >-
-              Cada tipo de construção lembra a rotação que você definiu pela última vez individualmente.
-              Isso pode ser mais confortável se você alternar frequentemente entre a colocação de diferentes tipos de construção.
+            title: Rotação por tipo de construção
+            description: >-
+                Cada tipo de construção lembra a rotação que você definiu pela última vez individualmente.
+                Isso pode ser mais confortável se você alternar frequentemente entre a colocação de diferentes tipos de construção.
 
 keybindings:
     title: Controles
@@ -799,6 +827,11 @@ keybindings:
         lockBeltDirection: Ativar planejador de correia
         switchDirectionLockSide: "Planejador: Mudar de lado"
         pipette: Pipeta
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Sobre o jogo

translations/base-pt-PT.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io é um jogo cujo objetivo é construir fábricas para automatizar a criação e fusão de formas geométricas. Entrega as formas pedidas, que são cada vez mais complexas, de modo a progredir no jogo e desbloquear melhorias para acelerar a produção da tua fábrica
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Uma vez que a procura aumenta a cada nível, terás de aumentar a tua fábrica para fazer face às necessidades - Para isso, terás de te expandir no [b]mapa infinito[/b] para explorar todos os recursos!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Como produzir formas se tornará aborrecido rapidamente, não tardará até precisares de misturar cores e pintá-las com elas - Combina os recursos de cores vermelha, verde e azul para produzir diferentes cores e usá-las para pintar as formas geométricas com o intuito de satisfazer a procura.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Este jogo conta com 18 níveis (Que deverão manter-te ocupado durante horas!) mas estou constantemente a adicionar novos conteúdos - Há muitas coisas planedas!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Vantagens do jogo completo[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Marcos
-            [*] Savegames infinitos
-            [*] Modo escuro
-            [*] Mais definições
-            [*] Possibilita-me desenvolver ainda mais o shapez.io ❤️
-            [*] Mais conteúdo no futuro!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Conteúdo planeado & Sugestões da comunidade[/b]
+        [b]Future Updates[/b]
 
-        Este jogo é open source (código aberto) - Qualquer pessoa pode contribuir! Adicionalmente, Eu ouço [b]muito[/b] a comunidade! Eu tento ler todas as sugestões e retirar delas tanto feedback quanto possível.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Modo história onde as construções custam formas geométricas
-            [*] Mais níveis & construções (exclusivo do jogo completo)
-            [*] Mapas diferentes, e talvez com obstáculos
-            [*] Criação de mapas configuráveis (Editar o número e tamanho das minas, semente, e mais)
-            [*] Mais tipos de formas geométricas
-            [*] Mais melhorias de performance (Apesar do jogo já correr bastante bem!)
-            [*] Modo daltónico
-            [*] E muito mais!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Segue o meu trello board para veres todo o roteiro de desenvolvimento! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: A carregar
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Nível <x>
     savegameLevelUnknown: Nível desconhecido
 
-    contests:
-        contest_01_03062020:
-            title: "Concurso #01"
-            desc: Ganha <strong>$25</strong> para a base mais cool!
-            longDesc: >-
-                Para retribuir o teu apoio, pensei que seria bom fazer concursos semanais!
-                <br><br>
-                <strong>O tópico desta semana:</strong> Construir a base mais cool!
-                <br><br>
-                Como fazer:<br>
-                <ul class="bucketList">
-                    <li>Envia uma captura de ecrã da tua base para <strong>contest@shapez.io</strong></li>
-                    <li>Bónus se o partilhares nas redes sociais!</li>
-                    <li>Eu irei escolher 5 capturas de ecrã e propô-las-ei à comunidade do <strong>discord</strong> para votar.</li>
-                    <li>O vencedor ganha <strong>$25</strong> (Paypal, Amazon Gift Card, ou o que preferires)</li>
-                    <li>Prazo: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Estou ansioso por ver as vossas fantásticas criações!
 
-        showInfo: Ver
-        contestOver: Este concurso terminou - Entra no discord para seres notificado quando abrirem novos concursos!
     continue: Continuar
     newGame: Novo Jogo
     madeBy: Criado por <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: Novo marco
         desc: Dá-lhe um nome com significado, também poderás adicionar <strong>um pequeno código</strong> de uma forma. (Pode ser gerado <a href="https://viewer.shapez.io" target="_blank">aqui</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Apenas podes criar dois marcos na versão Demo. Adquire o jogo completo para colocar marcos infinitos!
@@ -269,6 +269,10 @@ dialogs:
             Tu estás a pedir pra exportar a tua base como uma captura de ecrã. Por favor tem em atenção que isto pode
             ser um pouco lento para uma base muito grande até mesmo bloquear o teu jogo!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -291,6 +295,7 @@ ingame:
         copySelection: Copiar
         clearSelection: Cancelar
         pipette: Pipeta
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -406,9 +411,11 @@ ingame:
         cyan: Ciano
         white: Branco
         uncolored: Sem cor
+        black: Black
     shapeViewer:
         title: Camadas
         empty: Vazio
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -515,6 +522,27 @@ buildings:
         deliver: Entrega
         toUnlock: para desbloquear
         levelShortcut: NVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -726,11 +754,11 @@ settings:
             title: Modo Daltónico
             description: Ativa várias ferramentas que te permitirão jogar o jogo se fores daltónico.
         rotationByBuilding:
-          title: Rotação por tipo de construção
-          description: >-
-            Cada tipo construção lembra-se da última rotação que definiste.
-            Esta definição pode ser mais confortável se alterares frequentemente
-            a colocação de diferentes tipos de construções.
+            title: Rotação por tipo de construção
+            description: >-
+                Cada tipo construção lembra-se da última rotação que definiste.
+                Esta definição pode ser mais confortável se alterares frequentemente
+                a colocação de diferentes tipos de construções.
 
 keybindings:
     title: Atalhos
@@ -798,6 +826,11 @@ keybindings:
         lockBeltDirection: Ativa o planeamento de tapetes
         switchDirectionLockSide: "Planeador: Troca o lado"
         pipette: Pipeta
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 about:
     title: Sobre o jogo
     body: >-

translations/base-ro.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io este un joc despre construirea fabricilor pentru a automatiza crearea și combinarea de forme. Livrează cerutele, din ce in ce mai complexe forme pentru a progresa în joc și a debloca upgrade-uri pentru a îți accelera fabrica.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Când cererea crește tu va trebui să îți mărești fabrica pentru a se potrivi cererilor - Nu uita de resurse totuși, tu va trebui să te extinzi în [b]harta infinită[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Când formele pot deveni plictisitoare curând tu trebuie să amesteci culori și să îți pictezi formele cu ea - Amestecă culorile roșu, verde și albastru pentru a produce diferite culori și a picta forme cu ele pentru a satisface cererile.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Acest joc cuprinde 18 nivele (Care are trebui să te păstreze ocupat pentru ore deja!) dar, eu adaug constant conținut nou - Sunt multe planificate!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Avantajele Standalone-ului[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypointuri
-            [*] Savegame-uri nelimitate
-            [*] Modul Întunecat
-            [*] Mai multe setări
-            [*] Îmi permiți să dezvolt mai departe shapez.io ❤️
-            [*] Mai multe funcții în viitor!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Funcții planificate & Sugestiile comunității[/b]
+        [b]Future Updates[/b]
 
-        Acest joc este open source - Toată lumea poate contribui! Pe lângă asta, eu ascult [b]mult[/b] de comunitate! Încerc să citesc toate sugestiile și să iau cât mai mule opinii în considerare pe cât posibil.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode unde construcțiile costă forme
-            [*] Mai multe nivele & construcții (exclusiv standalone-ului)
-            [*] Diferite hărți, și poate obstacole ale hărții
-            [*] Creare de hartă configurabilă (Editează numărul și mărimea zonelor, seed-ul, și multe altele)
-            [*] Mai multe forme
-            [*] Mai multe îmbunătățiri de performanță (Totuși jocul deja rulează destul de bine!)
-            [*] Mod pentru orbii de culoare
-            [*] Și multe altele!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Asigurați-vă ca îmi verificați trello board-ul pentru întregul progres! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Se Încarcă
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Nivelul <x>
     savegameLevelUnknown: Nivel necunoscut
 
-    contests:
-        contest_01_03062020:
-            title: "Concursul #01"
-            desc: Câștigă <strong>$25</strong> pentru cea mai tare bază!
-            longDesc: >-
-                Pentru a vă da ceva înapoi, M-am gândit că ar fi tare să fac concursuri săptămânale!
-                <br><br>
-                <strong>Subiectul acestei săptămâni:</strong> Construiește cea mai tare bază!
-                <br><br>
-                Treaba stă așa:<br>
-                <ul class="bucketList">
-                    <li>Trimite o poză cu baza ta la <strong>contest@shapez.io</strong></li>
-                    <li>Puncte bonus dacă o trimiți și pe rețelele de socializare!</li>
-                    <li>Eu voi alege 5 poze și le voi propune comunității pe <strong>discord</strong> pentru a vota.</li>
-                    <li>Câștigătorul primește <strong>$25</strong> (Paypal, Amazon Gift Card, orice preferi)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Abia aștept să văd creațiile voastre minunate!
 
-        showInfo: Vezi
-        contestOver: Acest concurs s-a terminat - Alătură-te server-ului de discord pentru a primi notificări despre noi concursuri!
     continue: Continuă
     newGame: Joc nou
     madeBy: Făcut de <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: Nou waypoint
         desc: Dă-i un nume plin de înțeles, de asemenea poți include a <strong>codul scurt</strong> al unei forme (Pe care îl poți genera <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Poți crea decât două waypoint-uri personalizate în demo. Ia standalone-ul pentru Waypoint-uri nelimitate!
@@ -267,6 +267,11 @@ dialogs:
         title: Exportează captură de ecran
         desc: >-
             Ai solicitat să exportezi baza ta ca o captură de ecran. Vă rugăm să rețineți că asta poate fi destul de lent pentru o bază mare și poate chiar să blocheze jocul!
+
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -289,6 +294,7 @@ ingame:
         copySelection: Copiază
         clearSelection: Golește Secțiunea
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -404,9 +410,11 @@ ingame:
         cyan: Cyan
         white: Alb
         uncolored: Necolorat
+        black: Black
     shapeViewer:
         title: Start
         empty: Gol
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -513,6 +521,27 @@ buildings:
         deliver: Deliver
         toUnlock: pentru a debloca
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -790,6 +819,11 @@ keybindings:
         lockBeltDirection: Activează planificator de benzi
         switchDirectionLockSide: "Planificator: Schimbă direcția"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Despre acest joc

translations/base-ru.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io — это игра о строительстве фабрик для автоматизации создания и объединения фигур. Доставляйте запрошенные, все более сложные фигуры, чтобы развиваться в игре и разблокировать улучшения, чтобы ускорить работу вашей фабрики.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Поскольку спрос растет, вам придется увеличивать свою фабрику, чтобы соответствовать потребностям. Однако, не забывайте о ресурсах, несмотря на то что вы будете расширятся на [b]бесконечной карте[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Поскольку фигуры вскоре могут наскучить, вам потребуется смешивать цвета и раскрашивать свои фигуры ими. Комбинируйте красный, зеленый и синий красители для получения разных цветов и красте ими фигуры, чтобы удовлетворить спрос.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Эта игра имеет 18 уровней (но и они займут вас на часы!). Я постоянно добавляю новый контент - там много чего запланировано!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Преимущества полной версии[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Метки
-            [*] Неограниченное количество сохранений
-            [*] Темный режим
-            [*] Больше настроек
-            [*] Позволит мне быстрее разрабатывать shapez.io ❤️
-            [*] Больше возможностей в будущем!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Планируемые функции & Предложения сообщества[/b]
+        [b]Future Updates[/b]
 
-        Это игра с открытым исходным кодом - любой может внести свой вклад! Кроме того, я во [b]многом[/b] прислушиваюсь к сообществу! Я стараюсь прочитать все предложения и учту как можно больше отзывов.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Режим истории, где здания стоят фигур
-            [*] Больше уровней & зданий (эксклюзивно для полной версии)
-            [*] Различные карты и, возможно, карта препятствий
-            [*] Настраиваемое создание карт (редактирование количества и размера участков, семя и т. д.)
-            [*] Больше видов фигур
-            [*] Больше улучшений производительности (хотя игра уже работает довольно хорошо!)
-            [*] Режим дальтоника
-            [*] И многое другое!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Не забудьте проверить мою доску trello со всеми планами! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Загрузка
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -132,28 +152,7 @@ mainMenu:
     savegameLevel: Уровень <x>
     savegameLevelUnknown: Неизвестный уровень
 
-    contests:
-        contest_01_03062020:
-            title: "Конкурс №01"
-            desc: Выиграй <strong>$25</strong> за лучшую базу!
-            longDesc: >-
-                Чтобы вернуть вам что-то, я подумал, что было бы здорово проводить еженедельные конкурсы!
-                <br><br>
-                <strong>Тема этой недели:</strong> Постройка самой классной базы!
-                <br><br>
-                Вот что нужно сделать:<br>
-                <ul class="bucketList">
-                    <li>Отправить скриншот вашей базы сюда: <strong>contest@shapez.io</strong></li>
-                    <li>Бонусные баллы, если вы поделитесь этим в социальных сетях!</li>
-                    <li>Я выберу 5 скриншотов и предложу сообществу в <strong>дискорде</strong> проголосовать.</li>
-                    <li>Победитель получит <strong>$25</strong> (Paypal, Amazon Gift Card, что вы предпочитаете)</li>
-                    <li>Крайний срок: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Я с нетерпением жду, чтобы увидеть ваши удивительные творения!
 
-        showInfo: Посмотреть
-        contestOver: Этот конкурс закончился - присоединяйтесь в дискорде, чтобы получать уведомления о новых конкурсах!
     continue: Продолжить
     newGame: Новая Игра
     madeBy: Создал <author-link>
@@ -256,6 +255,7 @@ dialogs:
     createMarker:
         title: Новый маркер
         desc: Дайте ему содержательное имя, также можно добавить <strong>сокращение</strong> в виде фигуры (Которое можно сгенерировать <a href="https://viewer.shapez.io" target="_blank">здесь</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Вы можете создать только 2 своих маркера в демо-версии. Приобретите полную версию для безлимитных маркеров.
@@ -272,6 +272,10 @@ dialogs:
             что это может быть довольно медленным процессом для большой базы
             и даже привести к аварийному завершению игры!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -294,6 +298,7 @@ ingame:
         copySelection: Копировать
         clearSelection: Отменить
         pipette: Пипетка
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -409,9 +414,11 @@ ingame:
         cyan: Бирюзовый
         white: Белый
         uncolored: Бесцветный
+        black: Black
     shapeViewer:
         title: Слои
         empty: Пусто
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -518,6 +525,27 @@ buildings:
         deliver: Доставить
         toUnlock: чтобы открыть
         levelShortcut: Ур.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -728,11 +756,11 @@ settings:
             title: Режим Дальтоника
             description: Включает различные инструменты, которые позволяют играть в игру дальтоникам.
         rotationByBuilding:
-          title: Поворот по типу здания
-          description: >-
-            Каждый тип здания запоминает поворот, который в последний раз был установлен.
-            С этой настройкой может быть удобнее, при частом переключении между
-            различными типами зданий.
+            title: Поворот по типу здания
+            description: >-
+                Каждый тип здания запоминает поворот, который в последний раз был установлен.
+                С этой настройкой может быть удобнее, при частом переключении между
+                различными типами зданий.
 
 keybindings:
     title: Настройки управления
@@ -800,6 +828,11 @@ keybindings:
         lockBeltDirection: Включает конвейерный планировщик
         switchDirectionLockSide: "Планировщик: Переключение сторон"
         pipette: Пипетка
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Об игре

translations/base-sl.yaml

@@ -21,10 +21,10 @@
 
 steamPage:
     # This is the short text appearing on the steam page
-    shortText: shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+    shortText: shapez.io je igra grajenja tovarne katere cilj je avtomatiziranje kreiranja in procesiranja vse bolj zapletenih oblik na neskončni ravnini.
 
     # This is the text shown above the discord link
-    discordLink: Official Discord - Chat with me!
+    discordLink: Uradni Discord - Pridruži se klepetu!
 
     # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
     # NOTICE:
@@ -33,56 +33,55 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
-        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
+        shapez.io je igra grajenja tovarne katere cilj je avtomatiziranje kreiranja in procesiranja vse bolj zapletenih oblik na neskončni ravnini.
+        Ob dostavi zahtevanih oblik boste napredovali v igri in odklenili nadgradnje, da boste pospešili tovarno.
 
-        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
+        Ko se bo povpraševanje po oblikah povečalo, boste morali prilagoditi svojo tovarno, da bo zadostilo povpraševanju. Ne pozabite na vire, morali pa se boste razširiti čez [b]neskončno ravnino[/b]!
 
-        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Kmalu boste morali mešati barve in z njimi barvati svoje oblike - Združite rdeče, zelene in modre barvne vire, da ustvarite različne barve in z njimi barvate oblike, da zadostite povpraševanju.
 
-        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned! 
-
-        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
+        V tej igri je 18 progresivnih stopenj (ki vas bodo zaposlile za več ur!), Vendar nenehno dodajam novo vsebino - načrtovanih novosti je veliko!  
+        Nakup igre vam omogoča dostop do samostojne različice, ki ima dodatne funkcije, prav tako pa boste imeli dostop do novo razvitih funkcij.
 
         [img]{STEAM_APP_IMAGE}/extras/header_standalone_advantages.png[/img]
 
         [list]
-            [*] Dark Mode
-            [*] Unlimited Waypoints
-            [*] Unlimited Savegames
-            [*] Additional settings
-            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
-            [*] Coming soon: More Levels
-            [*] Allows me to further develop shapez.io ❤️
+            [*] Temna tema
+            [*] Neomejeno označb
+            [*] Neomejeno shranjenih tovarn
+            [*] Dodatne nastavitve
+            [*] Prihaja kmalu: Žice in energija! Prihajajo (približno) konec julija 2020.
+            [*] Prihaja kmalu: Več stopenj
+            [*] Omogoča mi nadaljni razvoj shapez.io ❤️
         [/list]
 
         [img]{STEAM_APP_IMAGE}/extras/header_future_updates.png[/img]
 
-        I am updating the game very often and trying to push an update at least every week!
+        Igro posodabljam zelo pogosto in poskušam dodati novosti vsaj vsak teden!
 
         [list]
-            [*] Different maps and challenges (e.g. maps with obstacles)
-            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
-            [*] A story mode where buildings have a cost
-            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
-            [*] Additional types of shapes
-            [*] Performance improvements (The game already runs pretty well!)
-            [*] And much more!
+            [*] Različni zemljevidi in izzivi (npr. Zemljevidi z ovirami)
+            [*] Izzivi (vnesite želeno obliko z omejenim območjem / nizom zgradb)
+            [*] Način zgodbe, kjer imajo stavbe stroške/cene
+            [*] Nastavljiv generator zemljevidov (konfigurirajte velikost / gostoto oblik /, seme in več)
+            [*] Dodatne vrste oblik
+            [*] Izboljšanje zmogljivosti (igra že sedaj deluje zelo dobro!)
+            [*] In veliko več!
         [/list]
 
         [img]{STEAM_APP_IMAGE}/extras/header_open_source.png[/img]
 
-        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
-        Be sure to check out my trello board for the full roadmap! 
+        Vsakdo lahko prispeva, aktivno sem vključen v skupnost in poskušam pregledati vse predloge in upoštevati povratne informacije, kjer je to mogoče.
+        Bodite prepričani, da si oglejte mojo Trello ploščo za celoten načrt!
 
         [img]{STEAM_APP_IMAGE}/extras/header_links.png[/img]
 
         [list]
-            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
-            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://discord.com/invite/HN7EVzV]Uradni Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Načrtovane posodobitve[/url]
             [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
-            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
-            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Izvorna Koda (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Pomagaj pri prevodu[/url]
         [/list]
 
 global:
@@ -92,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -153,29 +155,6 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: Unknown Level
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This week's topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and showcase them to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
-
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
-
 dialogs:
     buttons:
         ok: OK
@@ -283,6 +262,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -566,6 +546,13 @@ buildings:
         default:
             name: &energy_generator Energy Generator
             description: Generates energy by consuming shapes. Each energy generator requires a different shape.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -645,10 +632,6 @@ storyRewards:
         desc: >-
             This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
 
-    reward_wires:
-        title: Wires
-        desc: TODO
-
     no_reward_freeplay:
         title: Next level
         desc: >-

translations/base-sv.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io är ett spel som går ut på att automatisera skapandet av former. Leverera de efterfrågade, alltmer komplexa formerna för att utvecklas genom spelet och skaffa uppgraderingar för att öka hastigheten i fabriken.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Eftersom efterfrågan ökar behöver du bygga ut fabriken för att möta behoven - Glöm bara inte bort resurserna, du kommer behöva expadera fabriken över den [b]oändligt stora världen[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Eftersom former kan bli tråkiga kommer du behöva blanda färger och måla dina former med dem - Kombinera röd, grön, och blå för att producera olika färger och måla former med dem för att tillfredställa efterfrågan.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        Detta spel innehåller just nu 18 nivåer (Vilket borde hålla dig upptagen i några timmar!) men jag lägger konstant till fler saker - Det finns mycket planerat!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]Fristående Fördelar[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Oändligt antal sparfiler
-            [*] Mörkt tema
-            [*] Fler inställningar
-            [*] Tillåter mig att vidare utveckla shapez.io ❤️
-            [*] Fler funktioner i framtiden!
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planerade tillägg & Gruppförslag[/b]
+        [b]Future Updates[/b]
 
-        Detta spel är open source - Vem som helst kan hjälpa! Förutom det lyssnar jag [b]ofta[/b] på min community! Jag försöker läsa alla förslag och ta till mig så mycket feedback som möjligt.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode däri byggnader kostar former
-            [*] Fler nivåer & och byggnader (exklusivt för den fristående versionen)
-            [*] Olika världar, och kanske världshinder
-            [*] Konfigurerbar världskapande (Ändra antal och storlek på resursfläckar, seed, med mera)
-            [*] Fler sorters former
-            [*] Fler prestandaförbättringar (Även om spelet redan spelar ganska väl!)
-            [*] Färgblint läge
-            [*] Och mycket mer!
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        Se till att kolla min trello för en full framtidskarta! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: Laddar
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: "."
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: ","
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: k
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Nivå <x>
     savegameLevelUnknown: Okänd Nivå
 
-    contests:
-        contest_01_03062020:
-            title: "Tävling #01"
-            desc: Vinn <strong>$25</strong> för den coolaste fabriken!
-            longDesc: >-
-                För att ge något åter till dig, tänkte jag att det skulle vara coolt att skapa veckovisa tävlingar!
-                <br><br>
-                <strong>Denna veckas tema:</strong> Bygg den coolaste fabriken!
-                <br><br>
-                Så här går det till:<br>
-                <ul class="bucketList">
-                    <li>Skicka in en skärmdump av din fabrik till <strong>contest@shapez.io</strong></li>
-                    <li>Bonuspoäng om du delar den på sociala medier!</li>
-                    <li>Jag kommer välja 5 skärmdumpar och framföra dem till<strong>discord</strong>gruppen och låta dem rösta.</li>
-                    <li>Vinnaren får <strong>$25</strong> (Paypal, Amazon Gift Card, Vilket du än föredrar)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                Jag ser fram emot att se era grymma skapelser!
 
-        showInfo: Se
-        contestOver: Tävlingen är avslutad - Gå med i discordservern för att bli notifierad kring nya tävlingar!
     continue: Fortsätt
     newGame: Nytt spel
     madeBy: Skapad av <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: Ny Markör
         desc: Ge den ett meningsfullt namn, du kan också inkludera en <strong>kort kod</strong> av en form (Vilket du kan generera här <a href="https://viewer.shapez.io" target="_blank"></a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: Du kan endast skapa två markörer i demoversionen. Skaffa den fristående versionen för ett oändligt antal!
@@ -270,6 +270,10 @@ dialogs:
             Du efterfrågade att exportera din fabrik som en skärmdump.
             Vänligen notera att detta kan ta ett tag för en stor bas och i vissa fall till och med krascha ditt spel
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Kopiera
         clearSelection: Rensa vald
         pipette: Pipett
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +412,11 @@ ingame:
         cyan: Turkos
         white: Vit
         uncolored: Ofärgad
+        black: Black
     shapeViewer:
         title: Lager
         empty: Tom
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -516,6 +523,27 @@ buildings:
         deliver: Leverera
         toUnlock: Att låsa upp
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -727,10 +755,10 @@ settings:
             title: Färgblint läge
             description: Aktiverar olika verktyg som låter dig spela spelet om du är färbling.
         rotationByBuilding:
-          title: Rotering per byggnadstyp
-          description: >-
-            Varje byggnadstyp kommer ihåg rotationen du senast var på individuellt.
-            Detta kan vara mer bekvämt om du ofta bytar byggnader som du placerar.
+            title: Rotering per byggnadstyp
+            description: >-
+                Varje byggnadstyp kommer ihåg rotationen du senast var på individuellt.
+                Detta kan vara mer bekvämt om du ofta bytar byggnader som du placerar.
 
 keybindings:
     title: Snabbtangenter
@@ -798,6 +826,11 @@ keybindings:
         lockBeltDirection: Sätt på rullbandsplanerare
         switchDirectionLockSide: "Planerare: Byt sida"
         pipette: Pipett
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: Om detta spel

translations/base-tr.yaml

@@ -30,42 +30,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io is a game about building factories to automate the creation and combination of shapes. Deliver the requested, increasingly complex shapes to progress within the game and unlock upgrades to speed up your factory.
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        Since the demand raises you will have to scale up your factory to fit the needs - Don't forget about resources though, you will have to expand in the [b]infinite map[/b]!
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        Since shapes can get boring soon you need to mix colors and paint your shapes with it - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        This game features 18 levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
         [b]Standalone Advantages[/b]
 
         [list]
-            [*] Waypoints
-            [*] Unlimited Savegames
             [*] Dark Mode
-            [*] More settings
-            [*] Allow me to further develop shapez.io ❤️
-            [*] More features in the future!
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
-        [b]Planned features & Community suggestions[/b]
+        [b]Future Updates[/b]
 
-        This game is open source - Anybody can contribute! Besides of that, I listen [b]a lot[/b] to the community! I try to read all suggestions and take as much feedback into account as possible.
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] Story mode where buildings cost shapes
-            [*] More levels & buildings (standalone exclusive)
-            [*] Different maps, and maybe map obstacles
-            [*] Configurable map creation (Edit number and size of patches, seed, and more)
-            [*] More types of shapes
-            [*] More performance improvements (Although the game already runs pretty good!)
-            [*] Color blind mode
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
             [*] And much more!
         [/list]
 
-        Be sure to check out my trello board for the full roadmap! https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: yükleniyor
@@ -74,6 +91,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ","
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: b
@@ -131,28 +151,7 @@ mainMenu:
     savegameLevel: Seviye <x>
     savegameLevelUnknown: Bilinmeyen seviye
 
-    contests:
-        contest_01_03062020:
-            title: "Contest #01"
-            desc: Win <strong>$25</strong> for the coolest base!
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: View
-        contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: Devam et
     newGame: Yeni Oyun
     madeBy: Made by <author-link>
@@ -255,6 +254,7 @@ dialogs:
     createMarker:
         title: New Marker
         desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
@@ -270,6 +270,10 @@ dialogs:
             You requested to export your base as a screenshot. Please note that this can
             be quite slow for a big base and even crash your game!
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -292,6 +296,7 @@ ingame:
         copySelection: Copy
         clearSelection: Clear Selection
         pipette: Pipette
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -407,9 +412,11 @@ ingame:
         cyan: Cyan
         white: Beyaz
         uncolored: Renksiz
+        black: Black
     shapeViewer:
         title: Layers
         empty: Bos
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -517,6 +524,27 @@ buildings:
         storage:
             name: Storage
             description: Stores excess items, up to a given capacity. Can be used as an overflow gate.
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -728,11 +756,11 @@ settings:
             title: Color Blind Mode
             description: Enables various tools which allow to play the game if you are color blind.
         rotationByBuilding:
-          title: Rotation by building type
-          description: >-
-            Each building type remembers the rotation you last set it to individually.
-            This may be more comfortable if you frequently switch between placing
-            different building types.
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually.
+                This may be more comfortable if you frequently switch between placing
+                different building types.
 
 keybindings:
     title: Keybindings
@@ -800,6 +828,11 @@ keybindings:
         lockBeltDirection: Enable belt planner
         switchDirectionLockSide: "Planner: Switch side"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: About this Game

translations/base-uk.yaml

@@ -0,0 +1,877 @@
+#
+#  GAME TRANSLATIONS
+#
+#  Contributing:
+#
+#    If you want to contribute, please make a pull request on this respository
+#    and I will have a look.
+#
+#  Placeholders:
+#
+#    Do *not* replace placeholders! Placeholders have a special syntax like
+#    `Hotkey: <key>`. They are encapsulated within angle brackets. The correct
+#    translation for this one in German for example would be: `Taste: <key>` (notice
+#    how the placeholder stayed '<key>' and was not replaced!)
+#
+#  Adding a new language:
+#
+#    If you want to add a new language, ask me in the discord and I will setup
+#    the basic structure so the game also detects it.
+#
+
+steamPage:
+    # This is the short text appearing on the steam page
+    shortText: shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+
+    # This is the text shown above the discord link
+    discordLink: Official Discord - Chat with me!
+
+    # This is the long description for the steam page - It is contained here so you can help to translate it, and I will regulary update the store page.
+    # NOTICE:
+    # - Do not translate the first line (This is the gif image at the start of the store)
+    # - Please keep the markup (Stuff like [b], [list] etc) in the same format
+    longText: >-
+        [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
+
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
+
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
+
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
+
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
+
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
+
+        [img]{STEAM_APP_IMAGE}/extras/header_standalone_advantages.png[/img]
+
+        [list]
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
+        [/list]
+
+        [img]{STEAM_APP_IMAGE}/extras/header_future_updates.png[/img]
+
+        I am updating the game very often and trying to push an update at least every week!
+
+        [list]
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
+        [/list]
+
+        [img]{STEAM_APP_IMAGE}/extras/header_open_source.png[/img]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [img]{STEAM_APP_IMAGE}/extras/header_links.png[/img]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+global:
+    loading: Loading
+    error: Error
+
+    # How big numbers are rendered, e.g. "10,000"
+    thousandsDivider: ","
+
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
+    # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
+    suffix:
+        thousands: k
+        millions: M
+        billions: B
+        trillions: T
+
+    # Shown for infinitely big numbers
+    infinite: inf
+
+    time:
+        # Used for formatting past time dates
+        oneSecondAgo: one second ago
+        xSecondsAgo: <x> seconds ago
+        oneMinuteAgo: one minute ago
+        xMinutesAgo: <x> minutes ago
+        oneHourAgo: one hour ago
+        xHoursAgo: <x> hours ago
+        oneDayAgo: one day ago
+        xDaysAgo: <x> days ago
+
+        # Short formats for times, e.g. '5h 23m'
+        secondsShort: <seconds>s
+        minutesAndSecondsShort: <minutes>m <seconds>s
+        hoursAndMinutesShort: <hours>h <minutes>m
+
+        xMinutes: <x> minutes
+
+    keys:
+        tab: TAB
+        control: CTRL
+        alt: ALT
+        escape: ESC
+        shift: SHIFT
+        space: SPACE
+
+demoBanners:
+    # This is the "advertisement" shown in the main menu and other various places
+    title: Demo Version
+    intro: >-
+        Get the standalone to unlock all features!
+
+mainMenu:
+    play: Play
+    continue: Continue
+    newGame: New Game
+    changelog: Changelog
+    subreddit: Reddit
+    importSavegame: Import
+    openSourceHint: This game is open source!
+    discordLink: Official Discord Server
+    helpTranslate: Help translate!
+    madeBy: Made by <author-link>
+
+    # This is shown when using firefox and other browsers which are not supported.
+    browserWarning: >-
+        Sorry, but the game is known to run slow on your browser! Get the standalone version or download chrome for the full experience.
+
+    savegameLevel: Level <x>
+    savegameLevelUnknown: Unknown Level
+
+
+
+dialogs:
+    buttons:
+        ok: OK
+        delete: Delete
+        cancel: Cancel
+        later: Later
+        restart: Restart
+        reset: Reset
+        getStandalone: Get Standalone
+        deleteGame: I know what I am doing
+        viewUpdate: View Update
+        showUpgrades: Show Upgrades
+        showKeybindings: Show Keybindings
+
+    importSavegameError:
+        title: Import Error
+        text: >-
+            Failed to import your savegame:
+
+    importSavegameSuccess:
+        title: Savegame Imported
+        text: >-
+            Your savegame has been successfully imported.
+
+    gameLoadFailure:
+        title: Game is broken
+        text: >-
+            Failed to load your savegame:
+
+    confirmSavegameDelete:
+        title: Confirm deletion
+        text: >-
+            Are you sure you want to delete the game?
+
+    savegameDeletionError:
+        title: Failed to delete
+        text: >-
+            Failed to delete the savegame:
+
+    restartRequired:
+        title: Restart required
+        text: >-
+            You need to restart the game to apply the settings.
+
+    editKeybinding:
+        title: Change Keybinding
+        desc: Press the key or mouse button you want to assign, or escape to cancel.
+
+    resetKeybindingsConfirmation:
+        title: Reset keybindings
+        desc: This will reset all keybindings to their default values. Please confirm.
+
+    keybindingsResetOk:
+        title: Keybindings reset
+        desc: The keybindings have been reset to their respective defaults!
+
+    featureRestriction:
+        title: Demo Version
+        desc: You tried to access a feature (<feature>) which is not available in the demo. Consider getting the standalone version for the full experience!
+
+    oneSavegameLimit:
+        title: Limited savegames
+        desc: You can only have one savegame at a time in the demo version. Please remove the existing one or get the standalone version!
+
+    updateSummary:
+        title: New update!
+        desc: >-
+            Here are the changes since you last played:
+
+    upgradesIntroduction:
+        title: Unlock Upgrades
+        desc: >-
+            All shapes you produce can be used to unlock upgrades - <strong>Don't destroy your old factories!</strong>
+            The upgrades tab can be found on the top right corner of the screen.
+
+    massDeleteConfirm:
+        title: Confirm delete
+        desc: >-
+            You are deleting a lot of buildings (<count> to be exact)! Are you sure you want to do this?
+
+    massCutConfirm:
+        title: Confirm cut
+        desc: >-
+            You are cutting a lot of buildings (<count> to be exact)! Are you sure you want to do this?
+
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: >-
+            You can not afford to paste this area! Are you sure you want to cut it?
+
+    blueprintsNotUnlocked:
+        title: Not unlocked yet
+        desc: >-
+            Complete level 12 to unlock Blueprints!
+
+    keybindingsIntroduction:
+        title: Useful keybindings
+        desc: >-
+            This game has a lot of keybindings which make it easier to build big factories.
+            Here are a few, but be sure to <strong>check out the keybindings</strong>!<br><br>
+            <code class='keybinding'>CTRL</code> + Drag: Select an area.<br>
+            <code class='keybinding'>SHIFT</code>: Hold to place multiple of one building.<br>
+            <code class='keybinding'>ALT</code>: Invert orientation of placed belts.<br>
+
+    createMarker:
+        title: New Marker
+        desc: Give it a meaningful name, you can also include a <strong>short key</strong> of a shape (Which you can generate <a href="https://viewer.shapez.io" target="_blank">here</a>)
+        titleEdit: Edit Marker
+
+    markerDemoLimit:
+        desc: You can only create two custom markers in the demo. Get the standalone for unlimited markers!
+
+    exportScreenshotWarning:
+        title: Export screenshot
+        desc: You requested to export your base as a screenshot. Please note that this can be quite slow for a big base and even crash your game!
+
+ingame:
+    # This is shown in the top left corner and displays useful keybindings in
+    # every situation
+    keybindingsOverlay:
+        moveMap: Move
+        selectBuildings: Select area
+        stopPlacement: Stop placement
+        rotateBuilding: Rotate building
+        placeMultiple: Place multiple
+        reverseOrientation: Reverse orientation
+        disableAutoOrientation: Disable auto-orientation
+        toggleHud: Toggle HUD
+        placeBuilding: Place building
+        createMarker: Create marker
+        delete: Delete
+        pasteLastBlueprint: Paste last blueprint
+        lockBeltDirection: Enable belt planner
+        plannerSwitchSide: Flip planner side
+        cutSelection: Cut
+        copySelection: Copy
+        clearSelection: Clear selection
+        pipette: Pipette
+        switchLayers: Switch layers
+
+    # Names of the colors, used for the color blind mode
+    colors:
+        red: Red
+        green: Green
+        blue: Blue
+        yellow: Yellow
+        purple: Purple
+        cyan: Cyan
+        white: White
+        black: Black
+        uncolored: No color
+
+    # Everything related to placing buildings (I.e. as soon as you selected a building
+    # from the toolbar)
+    buildingPlacement:
+        # Buildings can have different variants which are unlocked at later levels,
+        # and this is the hint shown when there are multiple variants available.
+        cycleBuildingVariants: Press <key> to cycle variants.
+
+        # Shows the hotkey in the ui, e.g. "Hotkey: Q"
+        hotkeyLabel: >-
+            Hotkey: <key>
+
+        infoTexts:
+            speed: Speed
+            range: Range
+            storage: Storage
+            oneItemPerSecond: 1 item / second
+            itemsPerSecond: <x> items / s
+            itemsPerSecondDouble: (x2)
+
+            tiles: <x> tiles
+
+    # The notification when completing a level
+    levelCompleteNotification:
+        # <level> is replaced by the actual level, so this gets 'Level 03' for example.
+        levelTitle: Level <level>
+        completed: Completed
+        unlockText: Unlocked <reward>!
+        buttonNextLevel: Next Level
+
+    # Notifications on the lower right
+    notifications:
+        newUpgrade: A new upgrade is available!
+        gameSaved: Your game has been saved.
+
+    # The "Upgrades" window
+    shop:
+        title: Upgrades
+        buttonUnlock: Upgrade
+
+        # Gets replaced to e.g. "Tier IX"
+        tier: Tier <x>
+
+        # The roman number for each tier
+        tierLabels: [I, II, III, IV, V, VI, VII, VIII, IX, X]
+
+        maximumLevel: MAXIMUM LEVEL (Speed x<currentMult>)
+
+    # The "Statistics" window
+    statistics:
+        title: Statistics
+        dataSources:
+            stored:
+                title: Stored
+                description: Displaying amount of stored shapes in your central building.
+            produced:
+                title: Produced
+                description: Displaying all shapes your whole factory produces, including intermediate products.
+            delivered:
+                title: Delivered
+                description: Displaying shapes which are delivered to your central building.
+        noShapesProduced: No shapes have been produced so far.
+
+        # Displays the shapes per minute, e.g. '523 / m'
+        shapesPerMinute: <shapes> / m
+
+    # Settings menu, when you press "ESC"
+    settingsMenu:
+        playtime: Playtime
+
+        buildingsPlaced: Buildings
+        beltsPlaced: Belts
+
+        buttons:
+            continue: Continue
+            settings: Settings
+            menu: Return to menu
+
+    # Bottom left tutorial hints
+    tutorialHints:
+        title: Need help?
+        showHint: Show hint
+        hideHint: Close
+
+    # When placing a blueprint
+    blueprintPlacer:
+        cost: Cost
+
+    # Map markers
+    waypoints:
+        waypoints: Markers
+        hub: HUB
+        description: Left-click a marker to jump to it, right-click to delete it.<br><br>Press <keybinding> to create a marker from the current view, or <strong>right-click</strong> to create a marker at the selected location.
+        creationSuccessNotification: Marker has been created.
+
+    # Shape viewer
+    shapeViewer:
+        title: Layers
+        empty: Empty
+        copyKey: Copy Key
+
+    # Interactive tutorial
+    interactiveTutorial:
+        title: Tutorial
+        hints:
+            1_1_extractor: Place an <strong>extractor</strong> on top of a <strong>circle shape</strong> to extract it!
+            1_2_conveyor: >-
+                Connect the extractor with a <strong>conveyor belt</strong> to your hub!<br><br>Tip: <strong>Click and drag</strong> the belt with your mouse!
+
+            1_3_expand: >-
+                This is <strong>NOT</strong> an idle game! Build more extractors and belts to finish the goal quicker.<br><br>Tip: Hold <strong>SHIFT</strong> to place multiple extractors, and use <strong>R</strong> to rotate them.
+
+# All shop upgrades
+shopUpgrades:
+    belt:
+        name: Belts, Distributor & Tunnels
+        description: Speed x<currentMult> → x<newMult>
+    miner:
+        name: Extraction
+        description: Speed x<currentMult> → x<newMult>
+    processors:
+        name: Cutting, Rotating & Stacking
+        description: Speed x<currentMult> → x<newMult>
+    painting:
+        name: Mixing & Painting
+        description: Speed x<currentMult> → x<newMult>
+
+# Buildings and their name / description
+buildings:
+    hub:
+        deliver: Deliver
+        toUnlock: to unlock
+        levelShortcut: LVL
+
+    belt:
+        default:
+            name: &belt Conveyor Belt
+            description: Transports items, hold and drag to place multiple.
+
+    wire:
+        default:
+            name: &wire Wire
+            description: Allows you to transport energy
+
+    miner: # Internal name for the Extractor
+        default:
+            name: &miner Extractor
+            description: Place over a shape or color to extract it.
+
+        chainable:
+            name: Extractor (Chain)
+            description: Place over a shape or color to extract it. Can be chained.
+
+    underground_belt: # Internal name for the Tunnel
+        default:
+            name: &underground_belt Tunnel
+            description: Allows you to tunnel resources under buildings and belts.
+
+        tier2:
+            name: Tunnel Tier II
+            description: Allows you to tunnel resources under buildings and belts.
+
+    splitter: # Internal name for the Balancer
+        default:
+            name: &splitter Balancer
+            description: Multifunctional - Evenly distributes all inputs onto all outputs.
+
+        compact:
+            name: Merger (compact)
+            description: Merges two conveyor belts into one.
+
+        compact-inverse:
+            name: Merger (compact)
+            description: Merges two conveyor belts into one.
+
+    cutter:
+        default:
+            name: &cutter Cutter
+            description: Cuts shapes from top to bottom and outputs both halves. <strong>If you use only one part, be sure to destroy the other part or it will stall!</strong>
+        quad:
+            name: Cutter (Quad)
+            description: Cuts shapes into four parts. <strong>If you use only one part, be sure to destroy the other parts or it will stall!</strong>
+
+    advanced_processor:
+        default:
+            name: &advanced_processor Advanced Processor
+            description: Advanced shape processing
+
+    rotater:
+        default:
+            name: &rotater Rotate
+            description: Rotates shapes clockwise by 90 degrees.
+        ccw:
+            name: Rotate (CCW)
+            description: Rotates shapes counter-clockwise by 90 degrees.
+
+    stacker:
+        default:
+            name: &stacker Stacker
+            description: Stacks both items. If they can not be merged, the right item is placed above the left item.
+
+    mixer:
+        default:
+            name: &mixer Color Mixer
+            description: Mixes two colors using additive blending.
+
+    painter:
+        default:
+            name: &painter Painter
+            description: &painter_desc Colors the whole shape on the left input with the color from the top input.
+
+        mirrored:
+            name: *painter
+            description: *painter_desc
+
+        double:
+            name: Painter (Double)
+            description: Colors the shapes on the left inputs with the color from the top input.
+        quad:
+            name: Painter (Quad)
+            description: Allows you to color each quadrant of the shape with a different color.
+
+    trash:
+        default:
+            name: &trash Trash
+            description: Accepts inputs from all sides and destroys them. Forever.
+
+        storage:
+            name: Storage
+            description: Stores excess items, up to a given capacity. Can be used as an overflow gate.
+
+    energy_generator:
+        deliver: Deliver
+
+        # This will be shown before the amount, so for example 'For 123 Energy'
+        toGenerateEnergy: For
+
+        default:
+            name: &energy_generator Energy Generator
+            description: Generates energy by consuming shapes. Each energy generator requires a different shape.
+
+    wire_crossings:
+        default:
+            name: &wire_crossings Wire Splitter
+            description: Splits a wire into two
+
+        merger:
+            name: Wire Merger
+            description: Merges two wires into one
+
+storyRewards:
+    # Those are the rewards gained from completing the store
+    reward_cutter_and_trash:
+        title: Cutting Shapes
+        desc: You just unlocked the <strong>cutter</strong> - it cuts shapes half from <strong>top to bottom</strong> regardless of its orientation!<br><br>Be sure to get rid of the waste, or otherwise <strong>it will stall</strong> - For this purpose I gave you a trash, which destroys everything you put into it!
+
+    reward_rotater:
+        title: Rotating
+        desc: The <strong>rotater</strong> has been unlocked! It rotates shapes clockwise by 90 degrees.
+
+    reward_painter:
+        title: Painting
+        desc: >-
+            The <strong>painter</strong> has been unlocked - Extract some color veins (just as you do with shapes) and combine it with a shape in the painter to color them!<br><br>PS: If you are colorblind, there is a <strong>colorblind mode</strong> in the settings!
+
+    reward_mixer:
+        title: Color Mixing
+        desc: The <strong>mixer</strong> has been unlocked - Combine two colors using <strong>additive blending</strong> with this building!
+
+    reward_stacker:
+        title: Combiner
+        desc: You can now combine shapes with the <strong>combiner</strong>! Both inputs are combined, and if they can be put next to each other, they will be <strong>fused</strong>. If not, the right input is <strong>stacked on top</strong> of the left input!
+
+    reward_splitter:
+        title: Splitter/Merger
+        desc: The multifunctional <strong>balancer</strong> has been unlocked - It can be used to build bigger factories by <strong>splitting and merging items</strong> onto multiple belts!<br><br>
+
+    reward_tunnel:
+        title: Tunnel
+        desc: The <strong>tunnel</strong> has been unlocked - You can now tunnel items through belts and buildings with it!
+
+    reward_rotater_ccw:
+        title: CCW Rotating
+        desc: You have unlocked a variant of the <strong>rotater</strong> - It allows you to rotate shapes counter-clockwise! To build it, select the rotater and <strong>press 'T' to cycle through its variants</strong>!
+
+    reward_miner_chainable:
+        title: Chaining Extractor
+        desc: You have unlocked the <strong>chaining extractor</strong>! It can <strong>forward its resources</strong> to other extractors so you can more efficiently extract resources!
+
+    reward_underground_belt_tier_2:
+        title: Tunnel Tier II
+        desc: You have unlocked a new variant of the <strong>tunnel</strong> - It has a <strong>bigger range</strong>, and you can also mix-n-match those tunnels now!
+
+    reward_splitter_compact:
+        title: Compact Balancer
+        desc: >-
+            You have unlocked a compact variant of the <strong>balancer</strong> - It accepts two inputs and merges them into one belt!
+
+    reward_cutter_quad:
+        title: Quad Cutting
+        desc: You have unlocked a variant of the <strong>cutter</strong> - It allows you to cut shapes in <strong>four parts</strong> instead of just two!
+
+    reward_painter_double:
+        title: Double Painting
+        desc: You have unlocked a variant of the <strong>painter</strong> - It works as the regular painter but processes <strong>two shapes at once</strong> consuming just one color instead of two!
+
+    reward_painter_quad:
+        title: Quad Painting
+        desc: You have unlocked a variant of the <strong>painter</strong> - It allows you to paint each part of the shape individually!
+
+    reward_storage:
+        title: Storage Buffer
+        desc: You have unlocked a variant of the <strong>trash</strong> - It allows you to store items up to a given capacity!
+
+    reward_freeplay:
+        title: Freeplay
+        desc: You did it! You unlocked the <strong>free-play mode</strong>! This means that shapes are now randomly generated! (No worries, more content is planned for the standalone!)
+
+    reward_blueprints:
+        title: Blueprints
+        desc: You can now <strong>copy and paste</strong> parts of your factory! Select an area (Hold CTRL, then drag with your mouse), and press 'C' to copy it.<br><br>Pasting it is <strong>not free</strong>, you need to produce <strong>blueprint shapes</strong> to afford it! (Those you just delivered).
+
+    # Special reward, which is shown when there is no reward actually
+    no_reward:
+        title: Next level
+        desc: >-
+            This level gave you no reward, but the next one will! <br><br> PS: Better don't destroy your existing factory - You need <strong>all</strong> those shapes later again to <strong>unlock upgrades</strong>!
+
+
+
+    no_reward_freeplay:
+        title: Next level
+        desc: >-
+            Congratulations! By the way, more content is planned for the standalone!
+
+settings:
+    title: Settings
+    categories:
+        game: Game
+        app: Application
+
+    versionBadges:
+        dev: Development
+        staging: Staging
+        prod: Production
+    buildDate: Built <at-date>
+
+    labels:
+        uiScale:
+            title: Interface scale
+            description: >-
+                Changes the size of the user interface. The interface will still scale based on your device's resolution, but this setting controls the amount of scaling.
+            scales:
+                super_small: Super small
+                small: Small
+                regular: Regular
+                large: Large
+                huge: Huge
+
+        autosaveInterval:
+            title: Autosave Interval
+            description: >-
+                Controls how often the game saves automatically. You can also disable it entirely here.
+
+            intervals:
+                one_minute: 1 Minute
+                two_minutes: 2 Minutes
+                five_minutes: 5 Minutes
+                ten_minutes: 10 Minutes
+                twenty_minutes: 20 Minutes
+                disabled: Disabled
+
+        scrollWheelSensitivity:
+            title: Zoom sensitivity
+            description: >-
+                Changes how sensitive the zoom is (Either mouse wheel or trackpad).
+            sensitivity:
+                super_slow: Super slow
+                slow: Slow
+                regular: Regular
+                fast: Fast
+                super_fast: Super fast
+
+        movementSpeed:
+            title: Movement speed
+            description: >-
+                Changes how fast the view moves when using the keyboard.
+            speeds:
+                super_slow: Super slow
+                slow: Slow
+                regular: Regular
+                fast: Fast
+                super_fast: Super Fast
+                extremely_fast: Extremely Fast
+
+        language:
+            title: Language
+            description: >-
+                Change the language. All translations are user-contributed and might be incomplete!
+
+        enableColorBlindHelper:
+            title: Color Blind Mode
+            description: >-
+                Enables various tools which allow you to play the game if you are color blind.
+
+        fullscreen:
+            title: Fullscreen
+            description: >-
+                It is recommended to play the game in fullscreen to get the best experience. Only available in the standalone.
+
+        soundsMuted:
+            title: Mute Sounds
+            description: >-
+                If enabled, mutes all sound effects.
+
+        musicMuted:
+            title: Mute Music
+            description: >-
+                If enabled, mutes all music.
+
+        theme:
+            title: Game theme
+            description: >-
+                Choose the game theme (light / dark).
+            themes:
+                dark: Dark
+                light: Light
+
+        refreshRate:
+            title: Simulation Target
+            description: >-
+                If you have a 144hz monitor, change the refresh rate here so the game will properly simulate at higher refresh rates. This might actually decrease the FPS if your computer is too slow.
+
+        alwaysMultiplace:
+            title: Multiplace
+            description: >-
+                If enabled, all buildings will stay selected after placement until you cancel it. This is equivalent to holding SHIFT permanently.
+
+        offerHints:
+            title: Hints & Tutorials
+            description: >-
+                Whether to offer hints and tutorials while playing. Also hides certain UI elements up to a given level to make it easier to get into the game.
+
+        enableTunnelSmartplace:
+            title: Smart Tunnels
+            description: >-
+                When enabled, placing tunnels will automatically remove unnecessary belts. This also enables you to drag tunnels and excess tunnels will get removed.
+
+        vignette:
+            title: Vignette
+            description: >-
+                Enables the vignette, which darkens the screen corners and makes text easier to read.
+
+        rotationByBuilding:
+            title: Rotation by building type
+            description: >-
+                Each building type remembers the rotation you last set it to individually. This may be more comfortable if you frequently switch between placing different building types.
+
+        compactBuildingInfo:
+            title: Compact Building Infos
+            description: >-
+                Shortens info boxes for buildings by only showing their ratios. Otherwise a description and image is shown.
+
+        disableCutDeleteWarnings:
+            title: Disable Cut/Delete Warnings
+            description: >-
+                Disables the warning dialogs brought up when cutting/deleting more than 100 entities.
+
+keybindings:
+    title: Keybindings
+    hint: >-
+        Tip: Be sure to make use of CTRL, SHIFT and ALT! They enable different placement options.
+
+    resetKeybindings: Reset Keybindings
+
+    categoryLabels:
+        general: Application
+        ingame: Game
+        navigation: Navigating
+        placement: Placement
+        massSelect: Mass Select
+        buildings: Building Shortcuts
+        placementModifiers: Placement Modifiers
+
+    mappings:
+        confirm: Confirm
+        back: Back
+        mapMoveUp: Move Up
+        mapMoveRight: Move Right
+        mapMoveDown: Move Down
+        mapMoveLeft: Move Left
+        mapMoveFaster: Move Faster
+        centerMap: Center Map
+
+        mapZoomIn: Zoom in
+        mapZoomOut: Zoom out
+        createMarker: Create Marker
+
+        menuOpenShop: Upgrades
+        menuOpenStats: Statistics
+        menuClose: Close Menu
+
+        toggleHud: Toggle HUD
+        toggleFPSInfo: Toggle FPS and Debug Info
+        switchLayers: Switch layers
+        exportScreenshot: Export whole Base as Image
+        belt: *belt
+        splitter: *splitter
+        underground_belt: *underground_belt
+        miner: *miner
+        cutter: *cutter
+        advanced_processor: *advanced_processor
+        rotater: *rotater
+        stacker: *stacker
+        mixer: *mixer
+        energy_generator: *energy_generator
+        painter: *painter
+        trash: *trash
+        wire: *wire
+
+        pipette: Pipette
+        rotateWhilePlacing: Rotate
+        rotateInverseModifier: >-
+            Modifier: Rotate CCW instead
+        cycleBuildingVariants: Cycle Variants
+        confirmMassDelete: Delete area
+        pasteLastBlueprint: Paste last blueprint
+        cycleBuildings: Cycle Buildings
+        lockBeltDirection: Enable belt planner
+        switchDirectionLockSide: >-
+            Planner: Switch side
+
+        massSelectStart: Hold and drag to start
+        massSelectSelectMultiple: Select multiple areas
+        massSelectCopy: Copy area
+        massSelectCut: Cut area
+
+        placementDisableAutoOrientation: Disable automatic orientation
+        placeMultiple: Stay in placement mode
+        placeInverse: Invert automatic belt orientation
+
+about:
+    title: About this Game
+    body: >-
+        This game is open source and developed by <a href="https://github.com/tobspr" target="_blank">Tobias Springer</a> (this is me).<br><br>
+
+        If you want to contribute, check out <a href="<githublink>" target="_blank">shapez.io on github</a>.<br><br>
+
+        This game wouldn't have been possible without the great discord community around my games - You should really join the <a href="<discordlink>" target="_blank">discord server</a>!<br><br>
+
+        The soundtrack was made by <a href="https://soundcloud.com/pettersumelius" target="_blank">Peppsen</a> - He's awesome.<br><br>
+
+        Finally, huge thanks to my best friend <a href="https://github.com/niklas-dahl" target="_blank">Niklas</a> - Without our factorio sessions, this game would never have existed.
+
+changelog:
+    title: Changelog
+
+demo:
+    features:
+        restoringGames: Restoring savegames
+        importingGames: Importing savegames
+        oneGameLimit: Limited to one savegame
+        customizeKeybindings: Customizing Keybindings
+        exportingBase: Exporting whole Base as Image
+
+    settingNotAvailable: Not available in the demo.

translations/base-zh-CN.yaml

@@ -57,43 +57,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io 是一款在无边际的地图上建造工厂、自动化生产与组合愈加复杂的图形的游戏。提交任务，制造更复杂的流水线，解锁升级来提升您工厂的运作速度。
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        你将会需要随着不断上升得需求扩大你的工厂。当然，不要忘记你可以在[b]无尽[/b]的地图上开采资源！
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        只对图形进行加工可能会使你感到无聊。我们为你准备了颜色资源——将红、绿、蓝三种颜色混合，生产更多不同的颜色并粉刷在图形上以满足需求。
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        这个游戏目前有18个关卡（这应该已经能让你忙碌几个小时了！），并且正在不断地更新中。很多新关卡已经在开发计划当中！
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]独立版优势[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] 地图标记
-            [*] 无限存档
-            [*] 深色模式
-            [*] 更多设置
-            [*] 支持作者继续开发shapez.io❤️
-            [*] 在以后还有更多特性！
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
+        [b]Future Updates[/b]
 
-        [b]开发计划与社区意见[/b]
-
-        本游戏已开源，所有人都能参与游戏内容的开发！除此以外，我[b]非常重视[/b]玩家社区的反馈！我会阅读每一条建议并尽量顾及所有建议。
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] 要消耗图形来造建筑的的故事模式
-            [*] 更多关卡&建筑（单机版独有）
-            [*] 更多地图，也许会有障碍物
-            [*] 可配置的地图生成（矿脉密度与大小、 随机种子以及其他地图设置）
-            [*] 更多图形
-            [*] 更多的性能改进（当然，现在游戏已经非常流畅了！）
-            [*] 色盲模式
-            [*] 以及更多其他的功能！
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        记得查看我的Trello计划板！那里有所有的开发计划！https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: 加载中
@@ -103,6 +119,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: ""
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # TODO: Chinese translation: suffix changes every 10000 in Chinese numbering system.
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
@@ -161,28 +180,7 @@ mainMenu:
     savegameLevel: 第<x>关
     savegameLevelUnknown: 未知关卡
 
-    contests:
-        contest_01_03062020:
-            title: "竞赛 #01"
-            desc: 最6的工厂将能赢得<strong>25</strong>美元的奖金！
-            longDesc: >-
-                To give something back to you, I thought it would be cool to make weekly contests!
-                <br><br>
-                <strong>This weeks topic:</strong> Build the coolest base!
-                <br><br>
-                Here's the deal:<br>
-                <ul class="bucketList">
-                    <li>Submit a screenshot of your base to <strong>contest@shapez.io</strong></li>
-                    <li>Bonus points if you share it on social media!</li>
-                    <li>I will choose 5 screenshots and propose it to the <strong>discord</strong> community to vote.</li>
-                    <li>The winner gets <strong>$25</strong> (Paypal, Amazon Gift Card, whatever you prefer)</li>
-                    <li>Deadline: 07.06.2020 12:00 AM CEST</li>
-                </ul>
-                <br>
-                I'm looking forward to seeing your awesome creations!
 
-        showInfo: 详细信息
-        contestOver: 本次竞赛已结束。加入官方Discord以收到关于新竞赛的提醒！
         # contestOver: This contest has ended - Join the discord to get noticed about new contests!
     continue: 继续游戏
     newGame: 新游戏
@@ -288,6 +286,7 @@ dialogs:
     createMarker:
         title: 创建地图标记
         desc: 给地图标记起一个的名字。你可以在名字中加入一个<strong>短代码</strong>以加入图形。（你可以在<a href="https://viewer.shapez.io" target="_blank">这里</a>生成短代码。）
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: 在演示版中你只能创建两个地图标记。请获取独立版以创建更多标记。
@@ -301,6 +300,10 @@ dialogs:
         desc: >-
             你将要导出你的工厂的截图。如果你的基地很大，截图过程将会很慢，且有可能导致游戏崩溃！
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -323,6 +326,7 @@ ingame:
         copySelection: 复制
         clearSelection: 取消选择
         pipette: 选取器
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -440,9 +444,11 @@ ingame:
         cyan: 青色
         white: 白色
         uncolored: 无色
+        black: Black
     shapeViewer:
         title: 层 # TODO: find better translation
         empty: 空
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -549,6 +555,27 @@ buildings:
         deliver: 交付
         toUnlock: 来解锁
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -843,6 +870,11 @@ keybindings:
         lockBeltDirection: 启用传送带规划
         switchDirectionLockSide: "规划器：换边"
         pipette: 选取器
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: 关于游戏

translations/base-zh-TW.yaml

@@ -57,43 +57,59 @@ steamPage:
     longText: >-
         [img]{STEAM_APP_IMAGE}/extras/store_page_gif.gif[/img]
 
-        shapez.io 是一款在無邊際的地圖上建造工廠、自動化生產與組合愈加複雜的圖形的遊戲。提交任務，製造更複雜的流水線，解鎖升級來提升您工廠的運作速度。
+        shapez.io is a game about building factories to automate the creation and processing of increasingly complex shapes across an infinitely expanding map.
+        Upon delivering the requested shapes you will progress within the game and unlock upgrades to speed up your factory.
 
-        你將會需要隨著不斷上升的需求擴大你的工廠。當然，不要忘記你可以在[b]無盡[/b]的地圖上開採資源！
+        As the demand for shapes increases, you will have to scale up your factory to meet the demand - Don't forget about resources though, you will have to expand across the [b]infinite map[/b]!
 
-        只對圖形進行加工可能會使你感到無聊。我們為你準備了顏色資源——將紅、綠、藍三種顏色調色，產生更多不同的顏色並著色在圖形上以滿足任務需求。
+        Soon you will have to mix colors and paint your shapes with them - Combine red, green and blue color resources to produce different colors and paint shapes with it to satisfy the demand.
 
-        這個遊戲目前有18個關卡（這應該已經能讓你忙碌幾個小時了！），並且遊戲正在不斷地更新中。很多新關卡已經在開發計劃當中！
+        This game features 18 progressive levels (Which should keep you busy for hours already!) but I'm constantly adding new content - There is a lot planned!
 
+        Purchasing the game gives you access to the standalone version which has additional features and you'll also receive access to newly developed features.
 
-        [b]獨立版優勢[/b]
+        [b]Standalone Advantages[/b]
 
         [list]
-            [*] 地圖標記
-            [*] 無限存檔
-            [*] 深色模式
-            [*] 更多設置
-            [*] 支持作者繼續開發shapez.io❤️
-            [*] 在以後還有更多特性！
+            [*] Dark Mode
+            [*] Unlimited Waypoints
+            [*] Unlimited Savegames
+            [*] Additional settings
+            [*] Coming soon: Wires & Energy! Aiming for (roughly) end of July 2020.
+            [*] Coming soon: More Levels
+            [*] Allows me to further develop shapez.io ❤️
         [/list]
 
+        [b]Future Updates[/b]
 
-        [b]開發計劃與社區意見[/b]
-
-        本遊戲已開源，所有人都能參與遊戲內容的開發！除此以外，我[b]非常重視[/b]玩家社區的反饋！我會閱讀每一條建議並儘量顧及所有建議。
+        I am updating the game very often and trying to push an update at least every week!
 
         [list]
-            [*] 要消耗圖形來造建築的的故事模式
-            [*] 更多關卡&建築（獨立版獨有）
-            [*] 更多地圖，也許會有障礙物
-            [*] 可配置的地圖生成（礦脈密度與大小、 隨機種子以及其他地圖設置）
-            [*] 更多圖形
-            [*] 更多的性能改進（當然，現在遊戲已經非常流暢了！）
-            [*] 色盲模式
-            [*] 以及更多其他的功能！
+            [*] Different maps and challenges (e.g. maps with obstacles)
+            [*] Puzzles (Deliver the requested shape with a restricted area / set of buildings)
+            [*] A story mode where buildings have a cost
+            [*] Configurable map generator (Configure resource/shape size/density, seed and more)
+            [*] Additional types of shapes
+            [*] Performance improvements (The game already runs pretty well!)
+            [*] And much more!
         [/list]
 
-        記得查看我的Trello計劃板！那裡有所有的開發計劃！ https://trello.com/b/ISQncpJP/shapezio
+        [b]This game is open source![/b]
+
+        Anybody can contribute, I'm actively involved in the community and attempt to review all suggestions and take feedback into consideration where possible.
+        Be sure to check out my trello board for the full roadmap!
+
+        [b]Links[/b]
+
+        [list]
+            [*] [url=https://discord.com/invite/HN7EVzV]Official Discord[/url]
+            [*] [url=https://trello.com/b/ISQncpJP/shapezio]Roadmap[/url]
+            [*] [url=https://www.reddit.com/r/shapezio]Subreddit[/url]
+            [*] [url=https://github.com/tobspr/shapez.io]Source code (GitHub)[/url]
+            [*] [url=https://github.com/tobspr/shapez.io/blob/master/translations/README.md]Help translate[/url]
+        [/list]
+
+    discordLink: Official Discord - Chat with me!
 
 global:
     loading: 加載中
@@ -102,6 +118,9 @@ global:
     # How big numbers are rendered, e.g. "10,000"
     thousandsDivider: " "
 
+    # What symbol to use to seperate the integer part from the fractional part of a number, e.g. "0.4"
+    decimalSeparator: "."
+
     # The suffix for large numbers, e.g. 1.3k, 400.2M, etc.
     suffix:
         thousands: 千
@@ -159,28 +178,7 @@ mainMenu:
     savegameLevel: Level <x>
     savegameLevelUnknown: 未知關卡
 
-    contests:
-        contest_01_03062020:
-            title: "比賽 #01"
-            desc: 最屌的工廠將能贏得<strong>25</strong>美元的獎金！
-            longDesc: >-
-                為了回饋您，我認為每週進行比賽也很酷！
-                 <br> <br>
-                 <strong>本週主題：</ strong>建立最酷的基地！
-                 <br> <br>
-                 是這樣的：<br>
-                 <ul class =“ bucketList”>
-                     <li>將您的基地的螢幕截圖提交到<strong> contest@shapez.io </ strong> </ li>
-                     <li>如果您在社交媒體上分享會有額外獎勵積分！</ li>
-                     <li>我將選擇5張螢幕截圖，並將其提交給<strong> discord </ strong>社區進行投票。</ li>
-                     <li>獲勝者將獲得<strong> $ 25 </ strong>（PayPal，亞馬遜禮品卡，隨您喜歡）</ li>
-                     <li>截止日期：CEST 07.06.2020 12:00 AM </ li>
-                 </ ul>
-                 <br>
-                 我期待看到您的出色創作！
 
-        showInfo: 詳細信息
-        contestOver: 本次競賽已結束。加入官方Discord以收到關於新競賽的提醒！
     continue: 繼續
     newGame: 新遊戲
     madeBy: 作者：<author-link>
@@ -283,6 +281,7 @@ dialogs:
     createMarker:
         title: 創建標記
         desc: 給地圖標記起一個的名字。你可以在名字中加入一個<strong>短代碼</strong>以加入圖形。 （你可以在<a href="https://viewer.shapez.io" target="_blank">這裡</a>生成短代碼。）
+        titleEdit: Edit Marker
 
     markerDemoLimit:
         desc: 在演示版中你只能創建兩個地圖標記。請獲取獨立版以創建更多標記。
@@ -296,6 +295,10 @@ dialogs:
         desc: >-
             你將要匯出你的工廠的截圖。如果你的基地很大，截圖過程將會很慢，甚至有可能導致遊戲當掉！
 
+    massCutInsufficientConfirm:
+        title: Confirm cut
+        desc: You can not afford to paste this area! Are you sure you want to cut it?
+
 ingame:
     # This is shown in the top left corner and displays useful keybindings in
     # every situation
@@ -318,6 +321,7 @@ ingame:
         copySelection: 複製選取
         clearSelection: 清空選取
         pipette: 吸附
+        switchLayers: Switch layers
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -435,9 +439,11 @@ ingame:
         cyan: 青
         white: 白
         uncolored: 無顏色
+        black: Black
     shapeViewer:
         title: 層
         empty: 空
+        copyKey: Copy Key
 
 # All shop upgrades
 shopUpgrades:
@@ -544,6 +550,27 @@ buildings:
         deliver: 交付
         toUnlock: 來解鎖
         levelShortcut: LVL
+    wire:
+        default:
+            name: Energy Wire
+            description: Allows you to transport energy.
+    advanced_processor:
+        default:
+            name: Color Inverter
+            description: Accepts a color or shape and inverts it.
+    energy_generator:
+        deliver: Deliver
+        toGenerateEnergy: For
+        default:
+            name: Energy Generator
+            description: Generates energy by consuming shapes.
+    wire_crossings:
+        default:
+            name: Wire Splitter
+            description: Splits a energy wire into two.
+        merger:
+            name: Wire Merger
+            description: Merges two energy wires into one.
 
 storyRewards:
     # Those are the rewards gained from completing the store
@@ -831,6 +858,11 @@ keybindings:
         lockBeltDirection: 啟用傳送帶規劃
         switchDirectionLockSide: "規劃器：換邊"
         pipette: Pipette
+        menuClose: Close Menu
+        switchLayers: Switch layers
+        advanced_processor: Color Inverter
+        energy_generator: Energy Generator
+        wire: Energy Wire
 
 about:
     title: 關於遊戲