diff --git a/language-cz.cpp b/language-cz.cpp
index fe37b9c0..47b9af12 100644
--- a/language-cz.cpp
+++ b/language-cz.cpp
@@ -2289,30 +2289,16 @@ S("Saved the high quality shot to %1", "HQ snímek uložen do %1")
 S("Map saved to %1", "Mapa uložena do %1")
 S("Map loaded from %1", "Mapa načtena z %1")
 S("copying", "kopíruje")
-S("boundary", "hranice")
 S("clear monster", "vymazat netvore")
 S("use at your own risk!", "použití na vlastní nebezpečí!")
 
-// Note: in English, these have been arranged from longest to shortest.
-// This gives a somewhat nice effect on the top left corner of the screen.
-// You may want to aim for the same effect when translating
-
-S("0-9 = radius (%1)", "0-9 = poloměr (%1)")
-S("b = boundary", "c = kopírování")
-S("m = monsters", "i = předměty")
-S("w = walls",    "b = hranice")
-S("i = items",    "m = netvoři")
-S("l = lands",    "l = kraje")
-S("c = copy",     "w = zdi")
-
-// And this is from shortest to longest (bottom left corner)
-S("F1 = help",                "F1 = nápověda")
-S("F2 = save",                "F2 = uložení")
-S("F3 = load",                "F3 = nahrání")
-S("F5 = restart",             "F5 = restart")
-S("F6 = HQ shot",             "F6 = HQ snímek")
-S("F7 = player on/off",       "F7 = zapnout/vypnout hráče")
-S("ESC = return to the game", "ESC = návrat do hry")
+S("radius",   "poloměr")
+S("boundary", "hranice")
+S("monsters", "netvoři")
+S("walls",    "zdi")
+S("items",    "předměty")
+S("lands",    "kraje")
+S("copy",     "kopírování")
 
 S(
   "This mode allows you to edit the map.\n\n"
@@ -2465,8 +2451,8 @@ S("Follow the Mouse and escape with %the1!", "Následuj Myšku a uteč s %abl1!"
 S("Hardness frozen at %1.", "Obtížnost nastavená na: %1.")
 S("Congratulations! Your score is %1.", "Gratulujeme! Tvé skóre je %1.")
 
-S("u = undo",     "u = zpět")
-S("f = flip %1",     "f = překlopit %1")
+S("undo",     "zpět")
+S("flip",     "překlopit")
 
 S("Failed to save map to %1", "Uložení mapy do %1 se nezdařilo")
 S("Failed to load map from %1", "Nahrání mapy z %1 se nezdařilo")
@@ -2583,8 +2569,7 @@ S("eight domains", "osm domén")
 S("zebra pattern", "vzor 'zebra'")
 S("three stripes", "tři pásy")
 S("random black-and-white", "náhodný černobílý vzor")
-S("p = paint", "p = obarvit")
-S("r = regular", "r = vzory")
+S("paint", "obarvit")
 
 S(
    "In this mode you can draw your own player characters, "
@@ -2626,24 +2611,19 @@ S("hexagonal", "šestiúhelníky")
 S("heptagonal", "sedmiúhelníky")
 S("floor/pattern", "podlaha/vzor")
 
-S("l = layers: %1", "l = vrstvy: %1")
-S("1-9 = rotations: %1", "1-9 = rotace: %1")
-S("0 = symmetry", "0 = symetrie")
-S("0 = asymmetry", "0 = asymetrie")
+S("layers", "vrstvy")
+S("rotations", "rotace")
+S("symmetry", "symetrie")
 S("%1 vertices", "vrcholy: %1")
-S("a = add v", "a = přidej v")
-S("m = move v", "m = přesuň v")
-S("d = delete v", "d = vymaž v")
-S("c = readd v", "c = znovu přidej v")
-S("b = reorder", "b = změň uspořádání")
-S("t = shift", "t = přesuň")
-S("y = spin", "y = otoč")
+S("add vertex", "přidej v") // fix
+S("move vertex", "přesuň v") // fix
+S("delete vertex", "vymaž v") // fix
+S("shift", "přesuň")
+S("spin", "otoč")
 
-S("'n' to start", "n = start")
-S("z = zoom in", "z = přiblížení")
-S("o = zoom out", "o = oddálení")
-S("g = grid", "g = síť")
-S("e = edit this", "e = editace")
+S("start new shape", "start") // fix
+S("grid", "síť")
+S("select shape to edit", "editace") // fix
 
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
@@ -7324,11 +7304,11 @@ S("This pattern needs x-y divisible by 3", "Tento vzor vyžaduje, aby bylo x-y d
 S("This pattern needs x-y divisible by 2", "Tento vzor vyžaduje, aby bylo x-y dělitelné dvěma")
 
 // missing from the texture editor
-S("p = color", "p = barva")
-S("b = brush size: %1", "b = velikost štětce: %1")
-S("d = draw", "d = kresli")
-S("l = line", "l = čára")
-S("c = circle", "c = kruh")
+S("color", "barva")
+S("brush size", "velikost štětce")
+S("draw", "kresli")
+S("line", "čára")
+S("circle", "kruh")
 
 // new binary tiling
 
@@ -7854,7 +7834,7 @@ S("Welcome to the Heptagonal Mode!", "Vítej v Sedmiúhelníkovém módu!")
 S("adult Tortoise flags", "flagy dospělých Želv")
 S("baby Tortoise flags", "flagy Želviček")
 
-S("Map settings", "Nastavení mapy")
+S("map settings", "nastavení mapy")
 
 S("disable wandering monsters","vypnout bludné netvory")
 S("disable ghost timer", "vypnout časové duchy")
@@ -9459,13 +9439,13 @@ S("F5 = clear", "F5 = vyčistit")
 S("Are you sure you want to clear the map?", "Opravdu chceš vyčistit mapu?")
 S("select area to copy", "vyber oblast pro zkopírování")
 S("statue", "socha")
-S("c = reuse", "c = znovu použít")
-S("d = delete", "d = vymazat")
-S("p = grid color", "p = barva mřížky")
-S("f = fill", "f = vyplnit")
-S("T = text", "t = text")
-S("e = erase", "e = kasuj")
-S("z = spheres", "z = koule")
+S("reuse", "znovu použít")
+S("delete", "vymazat")
+S("grid color", "barva mřížky")
+S("fill", "vyplnit")
+S("text", "text")
+S("erase", "kasuj")
+S("spheres", "koule")
 S("z-level", "z-hladina")
 
 S("Failed to load pictures from %1", "Nahrání obrázků z %1 se nezdařilo")
@@ -9928,9 +9908,9 @@ S("highlight faraway monsters", "zvýrazni vzdálené netvory")
 
 S("hint: shift+A to enter the map editor", "nápověda: stiskem shift+A se dostaneš do mapového editoru")
 
-S("z = set Shift+click", "z = nastav Shift+klik")
-S("B = build on walls ", "B = stavění na zdech")
-S("S = snap (%1)", "S = přicvaknutí (%1)")
+S("set Shift+click", "nastav Shift+klik")
+S("build on walls ", "stavění na zdech")
+S("snap", "přicvaknutí")
 S("Z =", "Z = ")
 S("X =", "X = ")
 S("Y =", "Y = ")
diff --git a/language-de.cpp b/language-de.cpp
index 4b952911..65c7baac 100644
--- a/language-de.cpp
+++ b/language-de.cpp
@@ -2144,30 +2144,16 @@ S("Saved the high quality shot to %1", "HQ Screenshot nach %1 gespeichert")
 S("Map saved to %1", "Karte unter %1 gespeichert")
 S("Map loaded from %1", "Karte von %1 geladen")
 S("copying", "kopieren")
-S("boundary", "Grenze")
 S("clear monster", "Monster entfernen")
 S("use at your own risk!", "Benutzen auf eigene Gefahr!")
 
-// Note: in English, these have been arranged from longest to shortest.
-// This gives a somewhat nice effect on the top left corner of the screen.
-// You may want to aim for the same effect when translating
-
-S("0-9 = radius (%1)", "0-9 = Radius (%1)")
-S("b = boundary", "i = Grenze")
-S("m = monsters", "m = Monster")
-S("w = walls",    "w = Wände")
-S("i = items",    "l = Items")
-S("l = lands",    "c = Länder")
-S("c = copy",     "b = Kopieren")
-
-// And this is from shortest to longest (bottom left corner)
-S("F1 = help",                "F1 = Hilfe")
-S("F2 = save",                "F2 = Speichern")
-S("F3 = load",                "F3 = Laden")
-S("F5 = restart",             "F5 = Neustart")
-S("F6 = HQ shot",             "F6 = HQ Screenshot")
-S("F7 = player on/off",       "F7 = Spieler an/aus")
-S("ESC = return to the game", "ESC = Zurück zum Spiel")
+S("radius", "Radius")
+S("boundary", "Grenze")
+S("monsters", "Monster")
+S("walls",    "Wände")
+S("items",    "Items")
+S("lands",    "Länder")
+S("copy",     "Kopieren")
 
 S("This mode allows you to edit the map.\n\n"
   "NOTE: Use at your own risk. Combinations which never "
@@ -2322,8 +2308,8 @@ S("Follow the Mouse and escape with %the1!", "Folge der Maus und entkomme mit %d
 S("Hardness frozen at %1.", "Festgefroren: %1.")
 S("Congratulations! Your score is %1.", "Glückwunsch! Deine Punktzahl beträgt %1.")
 
-S("u = undo",     "u = rückgängig")
-S("f = flip %1",  "f = kippen %1")
+S("undo", "rückgängig")
+S("flip", "kippen")
 
 S("Failed to save map to %1", "Karte konnte nicht nach %1 gespeichert werden")
 S("Failed to load map from %1", "Karte konnte nicht von %1 geladen werden")
@@ -2442,8 +2428,7 @@ S("eight domains", "Acht Bereiche")
 S("zebra pattern", "Zebramuster")
 S("three stripes", "Drei Streifen")
 S("random black-and-white", "Zufalls Schwarz und Weiß")
-S("p = paint", "p = Farbe")
-S("r = regular", "r = regulär")
+S("paint", "Farbe")
 
 S("In this mode you can draw your own player characters, "
   "floors, monsters, and items. Press 'e' while hovering over "
@@ -2482,24 +2467,19 @@ S("hexagonal", "hexagonal")
 S("heptagonal", "heptagonal")
 S("floor/pattern", "Boden/Muster")
 
-S("l = layers: %1", "l = Ebenen: %1")
-S("1-9 = rotations: %1", "1-9 = Drehungen: %1")
-S("0 = symmetry", "0 = Symmetrie")
-S("0 = asymmetry", "0 = Asymmetrie")
+S("layers", "Ebenen")
+S("rotations", "Drehungen")
+S("symmetry", "Symmetrie")
 S("%1 vertices", "Eckpunkte: %1")
-S("a = add v", "a = hinzufügen v")
-S("m = move v", "m = bewegen v")
-S("d = delete v", "d = entfernen v")
-S("c = readd v", "c = wiederhinzufügen v")
-S("b = reorder", "b = neu anordnen")
-S("t = shift", "t = verlagern")
-S("y = spin", "y = drehen")
+S("add vertex", "hinzufügen v") // fix
+S("move vertx", "bewegen v") // fix
+S("delete vertex", "d = entfernen v") // fix
+S("shift", "verlagern")
+S("spin", "drehen")
 
-S("'n' to start", "n = start")
-S("z = zoom in", "z = reinzoomen")
-S("o = zoom out", "o = rauszoomen")
-S("g = grid", "g = Raster")
-S("e = edit this", "e = editieren")
+S("start new shape", "start") // fix
+S("grid", "Raster")
+S("select shape to edit", "editieren") // fix
 
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
diff --git a/language-fr.cpp b/language-fr.cpp
index b1d6c239..334d9257 100644
--- a/language-fr.cpp
+++ b/language-fr.cpp
@@ -2163,30 +2163,16 @@ S("Saved the high quality shot to %1", "Capture d'écran à haute résolution en
 S("Map saved to %1", "Carte sauvegardée dans %1")
 S("Map loaded from %1", "Carte chargée depuis %1")
 S("copying", "copier")
-S("boundary", "frontière")
 S("clear monster", "enlever les monstres")
 S("use at your own risk!", "utiliser à vos risques et périls !")
 
-// Note: in English, these have been arranged from longest to shortest.
-// This gives a somewhat nice effect on the top left corner of the screen.
-// You may want to aim for the same effect when translating
-
-S("0-9 = radius (%1)", "0-9 = rayon (%1)")
-S("b = boundary", "i = frontière")
-S("m = monsters", "m = monstre")
-S("w = walls",    "w = murs")
-S("i = items",    "l = objets")
-S("l = lands",    "c = pays")
-S("c = copy",     "b = copier")
-
-// And this is from shortest to longest (bottom left corner)
-S("F1 = help",                "F1 = aide")
-S("F2 = save",                "F2 = sauvegarder")
-S("F3 = load",                "F3 = charger")
-S("F5 = restart",             "F5 = redémarrer")
-S("F6 = HQ shot",             "F6 = capture HQ")
-S("F7 = player on/off",       "F7 = joueur on/off")
-S("ESC = return to the game", "ESC = retour au jeu")
+S("radius",   "rayon")
+S("boundary", "frontière")
+S("monsters", "monstre")
+S("walls",    "murs")
+S("items",    "objets")
+S("lands",    "pays")
+S("copy",     "copier")
 
 S("This mode allows you to edit the map.\n\n"
   "NOTE: Use at your own risk. Combinations which never "
@@ -2343,8 +2329,8 @@ S("Follow the Mouse and escape with %the1!", "Suivez la Souris et échappez vous
 S("Hardness frozen at %1.", "Difficulté figée : %1.")
 S("Congratulations! Your score is %1.", "Félicitations ! Votre score est de %1.")
 
-S("u = undo",     "u = défaire")
-S("f = flip %1",  "f = renverser %1")
+S("undo", "défaire")
+S("flip", "renverser")
 
 S("Failed to save map to %1", "Échec de la sauvegarde de la carte vers %1")
 S("Failed to load map from %1", "Échec du chargement de la carte depuis %1")
@@ -2463,8 +2449,7 @@ S("eight domains", "huit domaines")
 S("zebra pattern", "motif zébré")
 S("three stripes", "trois bandes")
 S("random black-and-white", "noir et blanc aléatoire")
-S("p = paint", "p = couleurs")
-S("r = regular", "r = régulier")
+S("paint", "couleurs")
 
 S("In this mode you can draw your own player characters, "
   "floors, monsters, and items. Press 'e' while hovering over "
@@ -2503,24 +2488,19 @@ S("hexagonal", "hexagonal")
 S("heptagonal", "heptagonal")
 S("floor/pattern", "sol/motif")
 
-S("l = layers: %1", "l = couches : %1")
-S("1-9 = rotations: %1", "1-9 = rotations : %1")
-S("0 = symmetry", "0 = symétrie")
-S("0 = asymmetry", "0 = asymétrie")
+S("layers", "couches")
+S("rotations", "rotations")
+S("symmetry", "symétrie")
 S("%1 vertices", "sommets : %1")
-S("a = add v", "a = ajouter v")
-S("m = move v", "m = déplacer v")
-S("d = delete v", "d = supprimer v")
-S("c = readd v", "c = réajouter v")
-S("b = reorder", "b = réordonner")
-S("t = shift", "t = décaler")
-S("y = spin", "y = tourner")
+S("add vertex", "ajouter v") // fix
+S("move vertex", "déplacer v") // fix
+S("delete vertex", "supprimer v") // fix
+S("shift", "décaler")
+S("spin", "tourner")
 
-S("'n' to start", "n = démarrer")
-S("z = zoom in", "z = agrandir")
-S("o = zoom out", "o = rétrécir")
-S("g = grid", "g = grille")
-S("e = edit this", "e = éditer")
+S("'n' to start", "n = démarrer") // fix
+S("grid", "grille")
+S("select shape to edit", "éditer") // fix
 
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
@@ -6966,11 +6946,11 @@ S("This pattern needs x-y divisible by 3", "Ce motif nécessite que x-y soit div
 S("This pattern needs x-y divisible by 2", "Ce motif nécessite que x-y soit divisible par 2")
 
 // missing from the texture editor
-S("p = color", "p = couleur")
-S("b = brush size: %1", "b = taille de brosse : %1")
-S("d = draw", "d = dessiner")
-S("l = line", "l = ligne")
-S("c = circle", "c = cercle")
+S("color", "couleur")
+S("brush size", "taille de brosse")
+S("draw", "dessiner")
+S("line", "ligne")
+S("circle", "cercle")
 
 // new binary tiling
 
@@ -7461,7 +7441,7 @@ S("Welcome to the Heptagonal Mode!", "Bienvenue dans le mode Heptagonal !")
 S("adult Tortoise flags", "drapeaux de Tortues adultes")
 S("baby Tortoise flags", "drapeaux de bébé Tortues")
 
-S("Map settings", "réglages de carte")
+S("map settings", "réglages de carte")
 
 S("disable wandering monsters","désactiver les monstres vagabonds")
 S("disable ghost timer", "désactiver le compteur fantôme")
@@ -9074,13 +9054,13 @@ S("F5 = clear", "F5 = effacer")
 S("Are you sure you want to clear the map?", "Êtes vous sûr de vouloir effacer la carte ?")
 S("select area to copy", "sélectionner la zone à copier")
 S("statue", "statue")
-S("c = reuse", "c = réutiliser")
-S("d = delete", "d = effacer")
-S("p = grid color", "p = couleur de la grille")
-S("f = fill", "f = remplir")
-S("T = text", "T = texte")
-S("e = erase", "e = effacer")
-S("z = spheres", "z = sphère")
+S("reuse", "réutiliser")
+S("delete", "effacer")
+S("grid color", "couleur de la grille")
+S("fill", "remplir")
+S("text", "texte")
+S("erase", "effacer")
+S("spheres", "sphère")
 S("z-level", "niveau z")
 
 S("Failed to load pictures from %1", "Échec du chargement des images depuis %1")
diff --git a/language-pl.cpp b/language-pl.cpp
index 7af555dd..ebb169c5 100644
--- a/language-pl.cpp
+++ b/language-pl.cpp
@@ -2250,30 +2250,16 @@ S("Saved the high quality shot to %1", "Zapisano zrzut HQ do %1")
 S("Map saved to %1", "Mapa zapisana do %1")
 S("Map loaded from %1", "Mapa wczytana z %1")
 S("copying", "kopiuję")
-S("boundary", "brzeg")
 S("clear monster", "zabierz potwora")
 S("use at your own risk!", "używasz na własne ryzyko!")
 
-// Note: in English, these have been arranged from longest to shortest.
-// This gives a somewhat nice effect on the top left corner of the screen.
-// You may want to aim for the same effect when translating
-
-S("0-9 = radius (%1)", "0-9 = promień (%1)")
-S("b = boundary", "i = przedmioty")
-S("m = monsters", "m = potwory")
-S("w = walls",    "w = ściany")
-S("i = items",    "l = krainy")
-S("l = lands",    "c = kopia")
-S("c = copy",     "b = brzeg")
-
-// And this is from shortest to longest (bottom left corner)
-S("F1 = help",                "F1 = pomoc")
-S("F2 = save",                "F2 = zapisz")
-S("F3 = load",                "F3 = wczytaj")
-S("F5 = restart",             "F5 = restart")
-S("F6 = HQ shot",             "F6 = zrzut HQ")
-S("F7 = player on/off",       "F7 = gracz wł/wył")
-S("ESC = return to the game", "ESC = powrót do gry")
+S("radius",   "promień")
+S("boundary", "brzeg")
+S("monsters", "potwory")
+S("walls",    "ściany")
+S("items",    "przedmioty")
+S("lands",    "krainy")
+S("copy",     "kopia")
 
 S(
   "This mode allows you to edit the map.\n\n"
@@ -2435,8 +2421,8 @@ S("Follow the Mouse and escape with %the1!", "Idź za Myszką i ucieknij z %abl1
 S("Hardness frozen at %1.", "Trudność zamrożona: %1.")
 S("Congratulations! Your score is %1.", "Gratulacje! Twój wynik to %1.")
 
-S("u = undo",     "u = cofnij")
-S("f = flip %1",     "f = odbicie %1")
+S("undo",     "cofnij")
+S("flip",     "odbicie")
 
 S("Failed to save map to %1", "Nie udało się zapisać do %1")
 S("Failed to load map from %1", "Nie udało się wczytać %1")
@@ -2553,8 +2539,7 @@ S("eight domains", "osiem domen")
 S("zebra pattern", "wzór zebry")
 S("three stripes", "trzy paski")
 S("random black-and-white", "losowy czarno-biały wzorek")
-S("p = paint", "p = kolory")
-S("r = regular", "r = wzorki")
+S("paint", "kolory")
 
 S(
    "In this mode you can draw your own player characters, "
@@ -2596,24 +2581,23 @@ S("hexagonal", "sześciokąt")
 S("heptagonal", "siedmiokąt")
 S("floor/pattern", "podłoga/wzorek")
 
-S("l = layers: %1", "l = warstwy: %1")
-S("1-9 = rotations: %1", "1-9 = obroty: %1")
-S("0 = symmetry", "0 = symetria")
-S("0 = asymmetry", "0 = asymetria")
+S("layers", "warstwy")
+S("rotations", "obroty")
+S("symmetry", "symetria")
 S("%1 vertices", "wierzchołki: %1")
-S("a = add v", "a = dodaj v")
-S("m = move v", "m = przenieś v")
-S("d = delete v", "d = skasuj v")
-S("c = readd v", "c = ponownie v")
+S("add vertex", "dodaj wierzchołek")
+S("move vertex", "przenieś wierzchołek")
+S("delete vertex", "skasuj wierzchołek")
+S("readd vertex", "ponownie wierzchołek")
 S("b = reorder", "b = kolejność")
-S("t = shift", "t = przesuń")
-S("y = spin", "y = obróć")
+S("shift", "przesuń")
+S("spin", "obróć")
 
-S("'n' to start", "n = start")
+S("start new shape", "nowy kształt")
 S("z = zoom in", "z = zbliżenie")
 S("o = zoom out", "o = oddalenie")
-S("g = grid", "g = siatka")
-S("e = edit this", "e = edytuj to")
+S("grid", "siatka")
+S("select shape to edit", "edytuj to")
 
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
@@ -7077,11 +7061,11 @@ S("This pattern needs x-y divisible by 3", "Ten wzór wymaga x-y podzielnego prz
 S("This pattern needs x-y divisible by 2", "Ten wzór wymaga x-y podzielnego przez 2")
 
 // missing from the texture editor
-S("p = color", "p = kolor")
-S("b = brush size: %1", "b = pędzel: %1")
-S("d = draw", "d = rysuj")
-S("l = line", "l = linia")
-S("c = circle", "c = kółko")
+S("color", "kolor")
+S("brush size", "pędzel")
+S("draw", "rysuj")
+S("line", "linia")
+S("circle", "kółko")
 
 // new binary tiling
 
@@ -7578,7 +7562,7 @@ S("Welcome to the Heptagonal Mode!", "Witaj w Trybie Siedmiokątów!")
 S("adult Tortoise flags", "flagi dorosłego Żółwia")
 S("baby Tortoise flags", "flagi Żółwika")
 
-S("Map settings", "Ustawienia mapy")
+S("map settings", "ustawienia mapy")
 
 S("disable wandering monsters","wyłącz błądzące potwory")
 S("disable ghost timer", "wyłącz duchy czasowe")
@@ -9169,13 +9153,13 @@ S("F5 = clear", "F5 = kasuj")
 S("Are you sure you want to clear the map?", "Na pewno chcesz skasować mapę?")
 S("select area to copy", "wybierz powierzchnię do skopiowania")
 S("statue", "pomnik")
-S("c = reuse", "c = ponownie")
-S("d = delete", "d = kasuj")
-S("p = grid color", "p = kolor siatki")
-S("f = fill", "f = wypełnij")
-S("T = text", "T = tekst")
-S("e = erase", "e = kasuj")
-S("z = spheres", "z = sfery")
+S("reuse", "ponownie")
+S("delete", "kasuj")
+S("grid color", "kolor siatki")
+S("fill", "wypełnij")
+S("text", "tekst")
+S("erase", "kasuj")
+S("spheres", "sfery")
 S("z-level", "poziom z")
 
 S("Failed to load pictures from %1", "Nie udało się wczytać obrazków %1")
@@ -9643,9 +9627,9 @@ S("highlight faraway monsters", "podświetlaj odległe potwory")
 
 S("hint: shift+A to enter the map editor", "wskazówka: shift+A uruchamia edytor map")
 
-S("z = set Shift+click", "z = ustaw Shift+klik")
-S("B = build on walls ", "B = budowa na ścianie")
-S("S = snap (%1)", "S = przyciąganie (%1)")
+S("set Shift+click", "ustaw Shift+klik")
+S("build on walls ", "budowa na ścianie")
+S("snap", "przyciąganie")
 S("Z =", "Z = ")
 S("X =", "X = ")
 S("Y =", "Y = ")
diff --git a/language-ptbr.cpp b/language-ptbr.cpp
index 397ec45e..9752177e 100644
--- a/language-ptbr.cpp
+++ b/language-ptbr.cpp
@@ -2687,25 +2687,6 @@ S("hexagonal", "sześciokąt")
 S("heptagonal", "siedmiokąt")
 S("floor/pattern", "podłoga/wzorek")
 
-S("l = layers: %1", "l = warstwy: %1")
-S("1-9 = rotations: %1", "1-9 = obroty: %1")
-S("0 = symmetry", "0 = symetria")
-S("0 = asymmetry", "0 = asymetria")
-S("%1 vertices", "wierzchołki: %1")
-S("a = add v", "a = dodaj v")
-S("m = move v", "m = przenieś v")
-S("d = delete v", "d = skasuj v")
-S("c = readd v", "c = ponownie v")
-S("b = reorder", "b = kolejność")
-S("t = shift", "t = przesuń")
-S("y = spin", "y = obróć")
-
-S("'n' to start", "n = start")
-S("z = zoom in", "z = zbliżenie")
-S("o = zoom out", "o = oddalenie")
-S("g = grid", "g = siatka")
-S("e = edit this", "e = edytuj to")
-
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
 S("z: %1", "z: %1")
diff --git a/language-ru.cpp b/language-ru.cpp
index 24720f86..b06e4b2f 100644
--- a/language-ru.cpp
+++ b/language-ru.cpp
@@ -2255,30 +2255,16 @@ S("Saved the high quality shot to %1", "Скрин высокого качест
 S("Map saved to %1", "Карта сохранена в %1")
 S("Map loaded from %1", "Карта загружена из %1")
 S("copying", "копирование")
-S("boundary", "граница")
 S("clear monster", "удалить монстра")
 S("use at your own risk!", "используйте это на свой риск!")
  
-// Note: in English, these have been arranged from longest to shortest.
-// This gives a somewhat nice effect on the top left corner of the screen.
-// You may want to aim for the same effect when translating
- 
-S("0-9 = radius (%1)", "0-9 = радиус (%1)")
-S("b = boundary", "i = предметы")
-S("m = monsters", "b = граница")
-S("w = walls",    "m = монстры")
-S("i = items",    "l = земли")
-S("l = lands",    "c = копия")
-S("c = copy",     "w = стены")
- 
-// And this is from shortest to longest (bottom left corner)
-S("F1 = help",                "F1 = помощь")
-S("F2 = save",                "F2 = записать")
-S("F3 = load",                "F3 = загрузить")
-S("F5 = restart",             "F5 = перезапуск")
-S("F6 = HQ shot",             "F6 = скриншот HQ")
-S("F7 = player on/off",       "F7 = игрок вкл/выкл")
-S("ESC = return to the game", "ESC = вернуться в игру")
+S("radius",   "радиус")
+S("boundary", "граница")
+S("monsters", "монстры")
+S("walls",    "стены")
+S("items",    "предметы")
+S("lands",    "земли")
+S("copy",     "копия")
  
 S(
   "This mode allows you to edit the map.\n\n"
@@ -2438,8 +2424,8 @@ S("Follow the Mouse and escape with %the1!", "Следуq за Мышкой и 
 S("Hardness frozen at %1.", "Сложность заморожена на %1.")
 S("Congratulations! Your score is %1.", "Поздравляем! Ваш результат: %1.")
 
-S("u = undo",     "u = отмена")
-S("f = flip %1",     "f = перевернуть %1")
+S("undo",     "отмена")
+S("flip",     "перевернуть")
 S("Failed to save map to %1", "Не удалось созранить карту в %1")
 S("Failed to load map from %1", "Не удалось загрузить карту из %1")
 S("save whom", "кого спасти")
@@ -2556,8 +2542,7 @@ S("eight domains", "восемь областей")
 S("zebra pattern", "ущор зебры")
 S("three stripes", "три полосы")
 S("random black-and-white", "случайный чёрно-белый")
-S("p = paint", "p = раскраска")
-S("r = regular", "r = узор")
+S("paint", "раскраска")
  
 S(
    "In this mode you can draw your own player characters, "
@@ -2598,24 +2583,19 @@ S("hexagonal", "шестиугольник")
 S("heptagonal", "семиугольник")
 S("floor/pattern", "пол/узор")
  
-S("l = layers: %1", "l = слой: %1")
-S("1-9 = rotations: %1", "1-9 = поворот: %1")
-S("0 = symmetry", "0 = симметрия")
-S("0 = asymmetry", "0 = асимметрия")
+S("layers", "слой")
+S("rotations", "поворот")
+S("symmetry", "симметрия")
 S("%1 vertices", "вершины: %1")
-S("a = add v", "a = добавить v")
-S("m = move v", "m = передвинуть v")
-S("d = delete v", "d = удалить v")
-S("c = readd v", "c = обновить v")
-S("b = reorder", "b = порядок")
-S("t = shift", "t = сдвиг")
-S("y = spin", "y = поворот")
+S("add vertex", "добавить v") // fix
+S("move vertex", "передвинуть v") // fix
+S("delete vertex", "удалить v") // fix
+S("shift", "сдвиг")
+S("spin", "поворот")
  
-S("'n' to start", "n = начать")
-S("z = zoom in", "z = приблизить")
-S("o = zoom out", "o = отдалить")
-S("g = grid", "g = сетка")
-S("e = edit this", "e = изменить")
+S("start new shape", "начать") // fix
+S("grid", "сетка")
+S("select shape to edit", "изменить") // fix
  
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
diff --git a/language-tr.cpp b/language-tr.cpp
index 1115b956..ec50a649 100644
--- a/language-tr.cpp
+++ b/language-tr.cpp
@@ -2146,30 +2146,15 @@ S("Saved the high quality shot to %1", "HQ resim %1 konumuna kaydedildi")
 S("Map saved to %1", "Harita %1 konumuna kaydedildi")
 S("Map loaded from %1", "Harita %1 konumundan yüklendi")
 S("copying", "kopyalıyor")
-S("boundary", "sınır")
 S("clear monster", "canavarı temizle")
 S("use at your own risk!", "sorumluluk sende!")
 
-// Note: in English, these have been arranged from longest to shortest.
-// This gives a somewhat nice effect on the top left corner of the screen.
-// You may want to aim for the same effect when translating
-
-S("0-9 = radius (%1)", "0-9 = promień (%1)")
-S("b = boundary", "i = sınır")
-S("m = monsters", "m = canavar")
-S("w = walls",    "w = duvar")
-S("i = items",    "l = eşya")
-S("l = lands",    "c = diyar")
-S("c = copy",     "b = kopya")
-
-// And this is from shortest to longest (bottom left corner)
-S("F1 = help",                "F1 = yardım")
-S("F2 = save",                "F2 = kaydet")
-S("F3 = load",                "F3 = yükle")
-S("F5 = restart",             "F5 = yeniden başlat")
-S("F6 = HQ shot",             "F6 = HQ resim çek")
-S("F7 = player on/off",       "F7 = oyuncu açık/kapalı")
-S("ESC = return to the game", "ESC = oyuna geri dön")
+S("boundary", "sınır")
+S("monsters", "canavar")
+S("walls",    "duvar")
+S("items",    "eşya")
+S("lands",    "diyar")
+S("copy",     "kopya")
 
 S(
   "This mode allows you to edit the map.\n\n"
@@ -2319,11 +2304,11 @@ S("Follow the Mouse and escape with %the1!", "Fareyi takip et ve %abl1 kaç!")
 S("Hardness frozen at %1.", "Trudność zamrożona: %1.")
 S("Congratulations! Your score is %1.", "Tebrikler! Puanın: %1.")
 
-S("u = undo",     "u = geri al")
+S("undo",     "geri al")
 S("Failed to save map to %1", "Harita %1 konumuna kaydedilemedi.")
 S("Failed to load map from %1", "Harita %1 konumundan yüklenemedi")
 S("other", "diğer") // other keys in the main menu
-S("f = flip %1",     "f = çevir %1")
+S("flip",     "çevir")
 S("save whom", "kim kurtarılacak")
 
 // VERSION 7.4
@@ -2436,8 +2421,7 @@ S("eight domains", "sekiz alan")
 S("zebra pattern", "zebra dokusu")
 S("three stripes", "üç şerit")
 S("random black-and-white", "rastgle siyah-beyaz")
-S("p = paint", "p = boya")
-S("r = regular", "r = düzenli")
+S("paint", "boya")
 
 S(
    "In this mode you can draw your own player characters, "
@@ -2473,24 +2457,21 @@ S("hexagonal", "altıgensel")
 S("heptagonal", "yedigensel")
 S("floor/pattern", "zemin/doku")
 
-S("l = layers: %1", "l = katmanlar: %1")
-S("1-9 = rotations: %1", "1-9 = döndürmeler %1")
-S("0 = symmetry", "0 = simetri")
-S("0 = asymmetry", "0 = asimetri")
+S("layers", "katmanlar")
+S("rotations", "döndürmeler")
+S("symmetry", "simetri")
 S("%1 vertices", "köşeler: %1")
-S("a = add v", "a = ekle v")
-S("m = move v", "m = taşı v")
-S("d = delete v", "d = sil v")
-S("c = readd v", "c = yeniden ekle v")
-S("b = reorder", "b = yeniden sırala")
-S("t = shift", "t = kaydır")
-S("y = spin", "y = döndür")
+S("add vertex", "ekle v") // fix
+S("move vertex", "taşı v") // fix
+S("delete vertex", "sil v") // fix
+S("shift", "kaydır")
+S("spin", "döndür")
 
-S("'n' to start", "n = başlat")
+S("start new shape", "başlat") // fix
 S("z = zoom in", "z = yaklaş")
 S("o = zoom out", "o = uzaklaş")
-S("g = grid", "g = şablon")
-S("e = edit this", "e = bunu düzenle")
+S("grid", "şablon")
+S("select shape to edit", "bunu düzenle") // fix
 
 S("x: %1", "x: %1")
 S("y: %1", "y: %1")
diff --git a/mapeditor.cpp b/mapeditor.cpp
index beb707f6..17c947f3 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -1438,13 +1438,13 @@ EX namespace mapeditor {
       });
     dialog::addBoolItem(XLAT("boundary"), painttype == 5, 'b');
     dialog::add_action([] { painttype = 5, paintwhat_str = XLAT("boundary"); });
-    dialog::addBoolItem(XLAT("monster"), painttype == 0, 'm');
+    dialog::addBoolItem(XLAT("monsters"), painttype == 0, 'm');
     dialog::add_action([] { pushScreen(showList), painttype = 0, dialog::infix = ""; });
-    dialog::addBoolItem(XLAT("item"), painttype == 1, 'i');
+    dialog::addBoolItem(XLAT("items"), painttype == 1, 'i');
     dialog::add_action([] { pushScreen(showList), painttype = 1, dialog::infix = ""; });
-    dialog::addBoolItem(XLAT("land"), painttype == 2, 'l');
+    dialog::addBoolItem(XLAT("lands"), painttype == 2, 'l');
     dialog::add_action([] { pushScreen(showList), painttype = 2, dialog::infix = ""; });
-    dialog::addBoolItem(XLAT("wall"), painttype == 3, 'w');
+    dialog::addBoolItem(XLAT("walls"), painttype == 3, 'w');
     dialog::add_action([] { pushScreen(showList), painttype = 3, dialog::infix = ""; });
     dialog::addBoolItem(XLAT("paint"), painttype == 6, 'w');
     dialog::add_action([] {
@@ -2395,15 +2395,15 @@ EX namespace mapeditor {
         }
       else dialog::addBreak(100);
       #endif
-      dialog::addItem_mouse("draw", 'd');
+      dialog::addItem_mouse(XLAT("draw"), 'd');
       dialog::add_action([] { mousekey = 'd'; });
-      dialog::addItem_mouse("line", 'l');
+      dialog::addItem_mouse(XLAT("line"), 'l');
       dialog::add_action([] { mousekey = 'l'; });
-      dialog::addItem_mouse("circle", 'c');
+      dialog::addItem_mouse(XLAT("circle"), 'c');
       dialog::add_action([] { mousekey = 'c'; });
-      if(drawing_tool) dialog::addItem_mouse("text", 'T');
+      if(drawing_tool) dialog::addItem_mouse(XLAT("text"), 'T');
       dialog::add_action([] { mousekey = 'T'; });
-      if(drawing_tool) dialog::addItem_mouse("erase", 'e');
+      if(drawing_tool) dialog::addItem_mouse(XLAT("erase"), 'e');
       dialog::add_action([] { mousekey = 'e'; });
       int s = isize(texture::config.data.pixels_to_draw);
       if(s) dialog::addInfo(its(s)); else dialog::addBreak(100);
@@ -2411,11 +2411,11 @@ EX namespace mapeditor {
       }
 
     if(GDIM == 2)
-      dialog::addBoolItem_action("snap", snapping, 'S');
+      dialog::addBoolItem_action(XLAT("snap"), snapping, 'S');
 
     if(GDIM == 3) {
-      if(front_config == eFront::sphere_camera) dialog::addInfo("camera", 'z');
-      if(front_config == eFront::sphere_center) dialog::addInfo("spheres", 'z');
+      if(front_config == eFront::sphere_camera) dialog::addItem(XLAT("camera"), 'z');
+      if(front_config == eFront::sphere_center) dialog::addItem(XLAT("spheres"), 'z');
       if(nonisotropic && front_config == eFront::equidistants) dialog::addSelItem("Z =", fts(front_edit), 'z');
       if(nonisotropic && front_config == eFront::const_x) dialog::addSelItem("X =", fts(front_edit), 'z');
       if(nonisotropic && front_config == eFront::const_y) dialog::addSelItem("Y =", fts(front_edit), 'z');
@@ -2423,11 +2423,11 @@ EX namespace mapeditor {
       }
 
     if(mousekey == 'g') {
-      dialog::addColorItem("grid color", gridcolor, 'p');
+      dialog::addColorItem(XLAT("grid color"), gridcolor, 'p');
       dialog::add_action(edit_grid_color);
       }
     else {
-      dialog::addColorItem("color", freedraw ? dtcolor : colortouse, 'p');
+      dialog::addColorItem(XLAT("color"), freedraw ? dtcolor : colortouse, 'p');
       dialog::add_action([freedraw] {
         if(freedraw) {
           dialog::openColorDialog(dtcolor, texture_colors);
@@ -2441,7 +2441,7 @@ EX namespace mapeditor {
       }
 
     if(GDIM == 2) {
-      dialog::addItem_mouse("grid", 'g');
+      dialog::addItem_mouse(XLAT("grid"), 'g');
       dialog::add_action([] {
         shiftpoint mh = full_mouseh();
         hyperpoint mh1 = inverse_shift(drawtrans, mh);
@@ -2453,7 +2453,7 @@ EX namespace mapeditor {
       }
 
     if(!freedraw) {
-      dialog::addItem_mouse("select shape to edit", 'e');
+      dialog::addItem_mouse(XLAT("select shape to edit"), 'e');
       dialog::add_action([] {
         if(mouseover) initdraw(mouseover);
         else mousekey = 'e';