fixed name of element 'polarisator' to 'polarizer'

diff --git a/docs/elements/df_steel_grid_fixed.txt b/docs/elements/df_steel_grid_fixed.txt
index 768a00cafa7849a537805664288e8bd21fd10db8..6fabe784e5584ad3660587eebe4e610d346f2831 100644 (file)
--- a/docs/elements/df_steel_grid_fixed.txt
+++ b/docs/elements/df_steel_grid_fixed.txt
@@ -1,2 +1,2 @@
-This is a fixed (reflecting) steel polarisator that lets the ray of light pass
+This is a fixed (reflecting) steel polarizer that lets the ray of light pass
 into a certain angle only.

diff --git a/docs/elements/df_steel_grid_rotating.txt b/docs/elements/df_steel_grid_rotating.txt
index 94346ca871c163d99d6290ee5149115405bd6518..9c05df785cad2fd9e9100b71c48e0069733c821a 100644 (file)
--- a/docs/elements/df_steel_grid_rotating.txt
+++ b/docs/elements/df_steel_grid_rotating.txt
@@ -1,2 +1,2 @@
-This automated steel polarisator is permanently rotating to reflect
+This automated steel polarizer is permanently rotating to reflect
 the laser beam into different directions.

diff --git a/docs/elements/df_wooden_grid_fixed.txt b/docs/elements/df_wooden_grid_fixed.txt
index fd584c1e77f85ebe7862f44a7402b97baefd6cae..9bf851494a1858b0eaf82865ed1ec66ebe149c07 100644 (file)
--- a/docs/elements/df_wooden_grid_fixed.txt
+++ b/docs/elements/df_wooden_grid_fixed.txt
@@ -1,2 +1,2 @@
-This is a fixed (non-reflecting) wooden polarisator that lets the ray of light
+This is a fixed (non-reflecting) wooden polarizer that lets the ray of light
 pass into a certain angle only.

diff --git a/docs/elements/df_wooden_grid_rotating.txt b/docs/elements/df_wooden_grid_rotating.txt
index c8c5e5bfd72a3e2dd05506f09658a6b2e2b72377..51c9acea538faf57368ed5ff313b6a034d61fe18 100644 (file)
--- a/docs/elements/df_wooden_grid_rotating.txt
+++ b/docs/elements/df_wooden_grid_rotating.txt
@@ -1,2 +1,2 @@
-This automated wooden polarisator is permanently rotating to reflect
+This automated wooden polarizer is permanently rotating to reflect
 the laser beam into different directions.

diff --git a/docs/elements/mm_polarisator.txt b/docs/elements/mm_polarisator.txt
deleted file mode 100644 (file)
index 8955c8f..0000000
--- a/docs/elements/mm_polarisator.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This polarisator can manually be rotated to let the ray of light pass into a
-certain angle only.

diff --git a/docs/elements/mm_polarisator_cross.txt b/docs/elements/mm_polarisator_cross.txt
deleted file mode 100644 (file)
index 717d6db..0000000
--- a/docs/elements/mm_polarisator_cross.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This polarisator can manually be rotated to let the ray of light pass into one
-of two angles only.

diff --git a/docs/elements/mm_polarizer.txt b/docs/elements/mm_polarizer.txt
new file mode 100644 (file)
index 0000000..6bc9626
--- /dev/null
+++ b/docs/elements/mm_polarizer.txt
@@ -0,0 +1,2 @@
+This polarizer can manually be rotated to let the ray of light pass into a
+certain angle only.

diff --git a/docs/elements/mm_polarizer_cross.txt b/docs/elements/mm_polarizer_cross.txt
new file mode 100644 (file)
index 0000000..1f349a1
--- /dev/null
+++ b/docs/elements/mm_polarizer_cross.txt
@@ -0,0 +1,2 @@
+This polarizer can manually be rotated to let the ray of light pass into one
+of two angles only.

diff --git a/docs/elements/mm_steel_grid_fixed.txt b/docs/elements/mm_steel_grid_fixed.txt
index 768a00cafa7849a537805664288e8bd21fd10db8..6fabe784e5584ad3660587eebe4e610d346f2831 100644 (file)
--- a/docs/elements/mm_steel_grid_fixed.txt
+++ b/docs/elements/mm_steel_grid_fixed.txt
@@ -1,2 +1,2 @@
-This is a fixed (reflecting) steel polarisator that lets the ray of light pass
+This is a fixed (reflecting) steel polarizer that lets the ray of light pass
 into a certain angle only.

diff --git a/docs/elements/mm_wooden_grid_fixed.txt b/docs/elements/mm_wooden_grid_fixed.txt
index fd584c1e77f85ebe7862f44a7402b97baefd6cae..9bf851494a1858b0eaf82865ed1ec66ebe149c07 100644 (file)
--- a/docs/elements/mm_wooden_grid_fixed.txt
+++ b/docs/elements/mm_wooden_grid_fixed.txt
@@ -1,2 +1,2 @@
-This is a fixed (non-reflecting) wooden polarisator that lets the ray of light
+This is a fixed (non-reflecting) wooden polarizer that lets the ray of light
 pass into a certain angle only.

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 8daac3238eaa2efb89e321b89997c1925620442f..6bbe1d492a4a9242d45c65dfaab79647b9144c06 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4521,87 +4521,87 @@ struct ConfigInfo image_config[] =
   { "mm_wooden_grid_fixed_4.ypos",             "6"                     },
   { "mm_wooden_grid_fixed_4.frames",           "1"                     },
 
-  { "mm_polarisator_1",                                "RocksMM.png"           },
-  { "mm_polarisator_1.xpos",                   "0"                     },
-  { "mm_polarisator_1.ypos",                   "5"                     },
-  { "mm_polarisator_1.frames",                 "1"                     },
-  { "mm_polarisator_2",                                "RocksMM.png"           },
-  { "mm_polarisator_2.xpos",                   "1"                     },
-  { "mm_polarisator_2.ypos",                   "5"                     },
-  { "mm_polarisator_2.frames",                 "1"                     },
-  { "mm_polarisator_3",                                "RocksMM.png"           },
-  { "mm_polarisator_3.xpos",                   "2"                     },
-  { "mm_polarisator_3.ypos",                   "5"                     },
-  { "mm_polarisator_3.frames",                 "1"                     },
-  { "mm_polarisator_4",                                "RocksMM.png"           },
-  { "mm_polarisator_4.xpos",                   "3"                     },
-  { "mm_polarisator_4.ypos",                   "5"                     },
-  { "mm_polarisator_4.frames",                 "1"                     },
-  { "mm_polarisator_5",                                "RocksMM.png"           },
-  { "mm_polarisator_5.xpos",                   "4"                     },
-  { "mm_polarisator_5.ypos",                   "5"                     },
-  { "mm_polarisator_5.frames",                 "1"                     },
-  { "mm_polarisator_6",                                "RocksMM.png"           },
-  { "mm_polarisator_6.xpos",                   "5"                     },
-  { "mm_polarisator_6.ypos",                   "5"                     },
-  { "mm_polarisator_6.frames",                 "1"                     },
-  { "mm_polarisator_7",                                "RocksMM.png"           },
-  { "mm_polarisator_7.xpos",                   "6"                     },
-  { "mm_polarisator_7.ypos",                   "5"                     },
-  { "mm_polarisator_7.frames",                 "1"                     },
-  { "mm_polarisator_8",                                "RocksMM.png"           },
-  { "mm_polarisator_8.xpos",                   "7"                     },
-  { "mm_polarisator_8.ypos",                   "5"                     },
-  { "mm_polarisator_8.frames",                 "1"                     },
-  { "mm_polarisator_9",                                "RocksMM.png"           },
-  { "mm_polarisator_9.xpos",                   "8"                     },
-  { "mm_polarisator_9.ypos",                   "5"                     },
-  { "mm_polarisator_9.frames",                 "1"                     },
-  { "mm_polarisator_10",                       "RocksMM.png"           },
-  { "mm_polarisator_10.xpos",                  "9"                     },
-  { "mm_polarisator_10.ypos",                  "5"                     },
-  { "mm_polarisator_10.frames",                        "1"                     },
-  { "mm_polarisator_11",                       "RocksMM.png"           },
-  { "mm_polarisator_11.xpos",                  "10"                    },
-  { "mm_polarisator_11.ypos",                  "5"                     },
-  { "mm_polarisator_11.frames",                        "1"                     },
-  { "mm_polarisator_12",                       "RocksMM.png"           },
-  { "mm_polarisator_12.xpos",                  "11"                    },
-  { "mm_polarisator_12.ypos",                  "5"                     },
-  { "mm_polarisator_12.frames",                        "1"                     },
-  { "mm_polarisator_13",                       "RocksMM.png"           },
-  { "mm_polarisator_13.xpos",                  "12"                    },
-  { "mm_polarisator_13.ypos",                  "5"                     },
-  { "mm_polarisator_13.frames",                        "1"                     },
-  { "mm_polarisator_14",                       "RocksMM.png"           },
-  { "mm_polarisator_14.xpos",                  "13"                    },
-  { "mm_polarisator_14.ypos",                  "5"                     },
-  { "mm_polarisator_14.frames",                        "1"                     },
-  { "mm_polarisator_15",                       "RocksMM.png"           },
-  { "mm_polarisator_15.xpos",                  "14"                    },
-  { "mm_polarisator_15.ypos",                  "5"                     },
-  { "mm_polarisator_15.frames",                        "1"                     },
-  { "mm_polarisator_16",                       "RocksMM.png"           },
-  { "mm_polarisator_16.xpos",                  "15"                    },
-  { "mm_polarisator_16.ypos",                  "5"                     },
-  { "mm_polarisator_16.frames",                        "1"                     },
-
-  { "mm_polarisator_cross_1",                  "RocksMM.png"           },
-  { "mm_polarisator_cross_1.xpos",             "0"                     },
-  { "mm_polarisator_cross_1.ypos",             "6"                     },
-  { "mm_polarisator_cross_1.frames",           "1"                     },
-  { "mm_polarisator_cross_2",                  "RocksMM.png"           },
-  { "mm_polarisator_cross_2.xpos",             "1"                     },
-  { "mm_polarisator_cross_2.ypos",             "6"                     },
-  { "mm_polarisator_cross_2.frames",           "1"                     },
-  { "mm_polarisator_cross_3",                  "RocksMM.png"           },
-  { "mm_polarisator_cross_3.xpos",             "2"                     },
-  { "mm_polarisator_cross_3.ypos",             "6"                     },
-  { "mm_polarisator_cross_3.frames",           "1"                     },
-  { "mm_polarisator_cross_4",                  "RocksMM.png"           },
-  { "mm_polarisator_cross_4.xpos",             "3"                     },
-  { "mm_polarisator_cross_4.ypos",             "6"                     },
-  { "mm_polarisator_cross_4.frames",           "1"                     },
+  { "mm_polarizer_1",                          "RocksMM.png"           },
+  { "mm_polarizer_1.xpos",                     "0"                     },
+  { "mm_polarizer_1.ypos",                     "5"                     },
+  { "mm_polarizer_1.frames",                   "1"                     },
+  { "mm_polarizer_2",                          "RocksMM.png"           },
+  { "mm_polarizer_2.xpos",                     "1"                     },
+  { "mm_polarizer_2.ypos",                     "5"                     },
+  { "mm_polarizer_2.frames",                   "1"                     },
+  { "mm_polarizer_3",                          "RocksMM.png"           },
+  { "mm_polarizer_3.xpos",                     "2"                     },
+  { "mm_polarizer_3.ypos",                     "5"                     },
+  { "mm_polarizer_3.frames",                   "1"                     },
+  { "mm_polarizer_4",                          "RocksMM.png"           },
+  { "mm_polarizer_4.xpos",                     "3"                     },
+  { "mm_polarizer_4.ypos",                     "5"                     },
+  { "mm_polarizer_4.frames",                   "1"                     },
+  { "mm_polarizer_5",                          "RocksMM.png"           },
+  { "mm_polarizer_5.xpos",                     "4"                     },
+  { "mm_polarizer_5.ypos",                     "5"                     },
+  { "mm_polarizer_5.frames",                   "1"                     },
+  { "mm_polarizer_6",                          "RocksMM.png"           },
+  { "mm_polarizer_6.xpos",                     "5"                     },
+  { "mm_polarizer_6.ypos",                     "5"                     },
+  { "mm_polarizer_6.frames",                   "1"                     },
+  { "mm_polarizer_7",                          "RocksMM.png"           },
+  { "mm_polarizer_7.xpos",                     "6"                     },
+  { "mm_polarizer_7.ypos",                     "5"                     },
+  { "mm_polarizer_7.frames",                   "1"                     },
+  { "mm_polarizer_8",                          "RocksMM.png"           },
+  { "mm_polarizer_8.xpos",                     "7"                     },
+  { "mm_polarizer_8.ypos",                     "5"                     },
+  { "mm_polarizer_8.frames",                   "1"                     },
+  { "mm_polarizer_9",                          "RocksMM.png"           },
+  { "mm_polarizer_9.xpos",                     "8"                     },
+  { "mm_polarizer_9.ypos",                     "5"                     },
+  { "mm_polarizer_9.frames",                   "1"                     },
+  { "mm_polarizer_10",                         "RocksMM.png"           },
+  { "mm_polarizer_10.xpos",                    "9"                     },
+  { "mm_polarizer_10.ypos",                    "5"                     },
+  { "mm_polarizer_10.frames",                  "1"                     },
+  { "mm_polarizer_11",                         "RocksMM.png"           },
+  { "mm_polarizer_11.xpos",                    "10"                    },
+  { "mm_polarizer_11.ypos",                    "5"                     },
+  { "mm_polarizer_11.frames",                  "1"                     },
+  { "mm_polarizer_12",                         "RocksMM.png"           },
+  { "mm_polarizer_12.xpos",                    "11"                    },
+  { "mm_polarizer_12.ypos",                    "5"                     },
+  { "mm_polarizer_12.frames",                  "1"                     },
+  { "mm_polarizer_13",                         "RocksMM.png"           },
+  { "mm_polarizer_13.xpos",                    "12"                    },
+  { "mm_polarizer_13.ypos",                    "5"                     },
+  { "mm_polarizer_13.frames",                  "1"                     },
+  { "mm_polarizer_14",                         "RocksMM.png"           },
+  { "mm_polarizer_14.xpos",                    "13"                    },
+  { "mm_polarizer_14.ypos",                    "5"                     },
+  { "mm_polarizer_14.frames",                  "1"                     },
+  { "mm_polarizer_15",                         "RocksMM.png"           },
+  { "mm_polarizer_15.xpos",                    "14"                    },
+  { "mm_polarizer_15.ypos",                    "5"                     },
+  { "mm_polarizer_15.frames",                  "1"                     },
+  { "mm_polarizer_16",                         "RocksMM.png"           },
+  { "mm_polarizer_16.xpos",                    "15"                    },
+  { "mm_polarizer_16.ypos",                    "5"                     },
+  { "mm_polarizer_16.frames",                  "1"                     },
+
+  { "mm_polarizer_cross_1",                    "RocksMM.png"           },
+  { "mm_polarizer_cross_1.xpos",               "0"                     },
+  { "mm_polarizer_cross_1.ypos",               "6"                     },
+  { "mm_polarizer_cross_1.frames",             "1"                     },
+  { "mm_polarizer_cross_2",                    "RocksMM.png"           },
+  { "mm_polarizer_cross_2.xpos",               "1"                     },
+  { "mm_polarizer_cross_2.ypos",               "6"                     },
+  { "mm_polarizer_cross_2.frames",             "1"                     },
+  { "mm_polarizer_cross_3",                    "RocksMM.png"           },
+  { "mm_polarizer_cross_3.xpos",               "2"                     },
+  { "mm_polarizer_cross_3.ypos",               "6"                     },
+  { "mm_polarizer_cross_3.frames",             "1"                     },
+  { "mm_polarizer_cross_4",                    "RocksMM.png"           },
+  { "mm_polarizer_cross_4.xpos",               "3"                     },
+  { "mm_polarizer_cross_4.ypos",               "6"                     },
+  { "mm_polarizer_cross_4.frames",             "1"                     },
 
   { "mm_beamer_1",                             "RocksMM.png"           },
   { "mm_beamer_1.xpos",                                "0"                     },

diff --git a/src/editor.c b/src/editor.c
index bcb57abc861ad5ced43efcc88e490ac57850fa26..f99794b2dd5a37179f7be944b22517ace8977b5f 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -4422,8 +4422,8 @@ static int editor_el_mirror_magic[] =
 
   EL_MM_MIRROR_START,
   EL_MM_MIRROR_FIXED_START,
-  EL_MM_POLARISATOR_START,
-  EL_MM_POLARISATOR_CROSS_START,
+  EL_MM_POLARIZER_START,
+  EL_MM_POLARIZER_CROSS_START,
 
   EL_MM_BEAMER_RED_START,
   EL_MM_BEAMER_YELLOW_START,
@@ -11201,10 +11201,10 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        EL_MM_WOODEN_GRID_FIXED_3
       },
       {
-       EL_MM_POLARISATOR_CROSS_1,
-       EL_MM_POLARISATOR_CROSS_4,
-       EL_MM_POLARISATOR_CROSS_3,
-       EL_MM_POLARISATOR_CROSS_2
+       EL_MM_POLARIZER_CROSS_1,
+       EL_MM_POLARIZER_CROSS_4,
+       EL_MM_POLARIZER_CROSS_3,
+       EL_MM_POLARIZER_CROSS_2
       },
       {
        EL_MM_PACMAN_UP,
@@ -11387,22 +11387,22 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
        EL_MM_BEAMER_BLUE_6
       },
       {
-       EL_MM_POLARISATOR_1,
-       EL_MM_POLARISATOR_16,
-       EL_MM_POLARISATOR_15,
-       EL_MM_POLARISATOR_14,
-       EL_MM_POLARISATOR_13,
-       EL_MM_POLARISATOR_12,
-       EL_MM_POLARISATOR_11,
-       EL_MM_POLARISATOR_10,
-       EL_MM_POLARISATOR_9,
-       EL_MM_POLARISATOR_8,
-       EL_MM_POLARISATOR_7,
-       EL_MM_POLARISATOR_6,
-       EL_MM_POLARISATOR_5,
-       EL_MM_POLARISATOR_4,
-       EL_MM_POLARISATOR_3,
-       EL_MM_POLARISATOR_2
+       EL_MM_POLARIZER_1,
+       EL_MM_POLARIZER_16,
+       EL_MM_POLARIZER_15,
+       EL_MM_POLARIZER_14,
+       EL_MM_POLARIZER_13,
+       EL_MM_POLARIZER_12,
+       EL_MM_POLARIZER_11,
+       EL_MM_POLARIZER_10,
+       EL_MM_POLARIZER_9,
+       EL_MM_POLARIZER_8,
+       EL_MM_POLARIZER_7,
+       EL_MM_POLARIZER_6,
+       EL_MM_POLARIZER_5,
+       EL_MM_POLARIZER_4,
+       EL_MM_POLARIZER_3,
+       EL_MM_POLARIZER_2
       },
       {
        EL_DF_MIRROR_1,

diff --git a/src/game_mm/mm_main.c b/src/game_mm/mm_main.c
index 6af8f484c4e49a47164d370d39f9875e13d81983..0c26ebbda0ad48601748fa6315f896a23d4fad65 100644 (file)
--- a/src/game_mm/mm_main.c
+++ b/src/game_mm/mm_main.c
@@ -112,10 +112,10 @@ char *element_info_mm[] =
   "mirror (146.25\xb0)",
   "mirror (157.5\xb0)",
   "mirror (168.75\xb0)",
-  "fixed steel polarisator (0\xb0)",
-  "fixed steel polarisator (90\xb0)",
-  "fixed steel polarisator (45\xb0)",
-  "fixed steel polarisator (135\xb0)",         /* 20 */
+  "fixed steel polarizer (0\xb0)",
+  "fixed steel polarizer (90\xb0)",
+  "fixed steel polarizer (45\xb0)",
+  "fixed steel polarizer (135\xb0)",           /* 20 */
   "Gregor McDuffin (looking right)",
   "Gregor McDuffin (looking up)",
   "Gregor McDuffin (looking left)",
@@ -214,26 +214,26 @@ char *element_info_mm[] =
   "pac man (starts moving up)",
   "pac man (starts moving left)",
   "pac man (starts moving down)",
-  "polarisator (0\xb0)",
-  "polarisator (11.25\xb0)",                   /* 120 */
-  "polarisator (22.5\xb0)",
-  "polarisator (33.75\xb0)",
-  "polarisator (45\xb0)",
-  "polarisator (56.25\xb0)",
-  "polarisator (67.5\xb0)",
-  "polarisator (78.75\xb0)",
-  "polarisator (90\xb0)",
-  "polarisator (101.25\xb0)",
-  "polarisator (112.5\xb0)",
-  "polarisator (123.75\xb0)",                  /* 130 */
-  "polarisator (135\xb0)",
-  "polarisator (146.25\xb0)",
-  "polarisator (157.5\xb0)",
-  "polarisator (168.75\xb0)",
-  "two-way polarisator (0\xb0)",
-  "two-way polarisator (22.5\xb0)",
-  "two-way polarisator (45\xb0)",
-  "two-way polarisator (67.5\xb0)",
+  "polarizer (0\xb0)",
+  "polarizer (11.25\xb0)",                     /* 120 */
+  "polarizer (22.5\xb0)",
+  "polarizer (33.75\xb0)",
+  "polarizer (45\xb0)",
+  "polarizer (56.25\xb0)",
+  "polarizer (67.5\xb0)",
+  "polarizer (78.75\xb0)",
+  "polarizer (90\xb0)",
+  "polarizer (101.25\xb0)",
+  "polarizer (112.5\xb0)",
+  "polarizer (123.75\xb0)",                    /* 130 */
+  "polarizer (135\xb0)",
+  "polarizer (146.25\xb0)",
+  "polarizer (157.5\xb0)",
+  "polarizer (168.75\xb0)",
+  "two-way polarizer (0\xb0)",
+  "two-way polarizer (22.5\xb0)",
+  "two-way polarizer (45\xb0)",
+  "two-way polarizer (67.5\xb0)",
   "fixed mirror (0\xb0)",
   "fixed mirror (45\xb0)",                     /* 140 */
   "fixed mirror (90\xb0)",
@@ -246,10 +246,10 @@ char *element_info_mm[] =
   "reflecting stone block",
   "wooden lock",
   "extra energy ball (full)",                  /* 150 */
-  "fixed wooden polarisator (0\xb0)",
-  "fixed wooden polarisator (90\xb0)",
-  "fixed wooden polarisator (45\xb0)",
-  "fixed wooden polarisator (135\xb0)",
+  "fixed wooden polarizer (0\xb0)",
+  "fixed wooden polarizer (90\xb0)",
+  "fixed wooden polarizer (45\xb0)",
+  "fixed wooden polarizer (135\xb0)",
   "extra energy ball (empty)",
   "unused",
   "unused",
@@ -351,22 +351,22 @@ char *element_info_mm[] =
   "mirror (146.25\xb0)",
   "mirror (157.5\xb0)",
   "mirror (168.75\xb0)",
-  "fixed wooden polarisator (0\xb0)",
-  "fixed wooden polarisator (22.5\xb0)",
-  "fixed wooden polarisator (45\xb0)",
-  "fixed wooden polarisator (67.5\xb0)",
-  "fixed wooden polarisator (90\xb0)",         /* 260 */
-  "fixed wooden polarisator (112.5\xb0)",
-  "fixed wooden polarisator (135\xb0)",
-  "fixed wooden polarisator (157.5\xb0)",
-  "fixed steel polarisator (0\xb0)",
-  "fixed steel polarisator (22.5\xb0)",
-  "fixed steel polarisator (45\xb0)",
-  "fixed steel polarisator (67.5\xb0)",
-  "fixed steel polarisator (90\xb0)",
-  "fixed steel polarisator (112.5\xb0)",
-  "fixed steel polarisator (135\xb0)",         /* 270 */
-  "fixed steel polarisator (157.5\xb0)",
+  "fixed wooden polarizer (0\xb0)",
+  "fixed wooden polarizer (22.5\xb0)",
+  "fixed wooden polarizer (45\xb0)",
+  "fixed wooden polarizer (67.5\xb0)",
+  "fixed wooden polarizer (90\xb0)",           /* 260 */
+  "fixed wooden polarizer (112.5\xb0)",
+  "fixed wooden polarizer (135\xb0)",
+  "fixed wooden polarizer (157.5\xb0)",
+  "fixed steel polarizer (0\xb0)",
+  "fixed steel polarizer (22.5\xb0)",
+  "fixed steel polarizer (45\xb0)",
+  "fixed steel polarizer (67.5\xb0)",
+  "fixed steel polarizer (90\xb0)",
+  "fixed steel polarizer (112.5\xb0)",
+  "fixed steel polarizer (135\xb0)",           /* 270 */
+  "fixed steel polarizer (157.5\xb0)",
   "deflektor style wooden wall",
   "deflektor style wooden wall",
   "deflektor style wooden wall",
@@ -435,22 +435,22 @@ char *element_info_mm[] =
   "rotating mirror (146.25\xb0)",
   "rotating mirror (157.5\xb0)",
   "rotating mirror (168.75\xb0)",
-  "rotating wooden polarisator (0\xb0)",       /* 340 */
-  "rotating wooden polarisator (22.5\xb0)",
-  "rotating wooden polarisator (45\xb0)",
-  "rotating wooden polarisator (67.5\xb0)",
-  "rotating wooden polarisator (90\xb0)",
-  "rotating wooden polarisator (112.5\xb0)",
-  "rotating wooden polarisator (135\xb0)",
-  "rotating wooden polarisator (157.5\xb0)",
-  "rotating steel polarisator (0\xb0)",
-  "rotating steel polarisator (22.5\xb0)",
-  "rotating steel polarisator (45\xb0)",       /* 350 */
-  "rotating steel polarisator (67.5\xb0)",
-  "rotating steel polarisator (90\xb0)",
-  "rotating steel polarisator (112.5\xb0)",
-  "rotating steel polarisator (135\xb0)",
-  "rotating steel polarisator (157.5\xb0)",
+  "rotating wooden polarizer (0\xb0)",         /* 340 */
+  "rotating wooden polarizer (22.5\xb0)",
+  "rotating wooden polarizer (45\xb0)",
+  "rotating wooden polarizer (67.5\xb0)",
+  "rotating wooden polarizer (90\xb0)",
+  "rotating wooden polarizer (112.5\xb0)",
+  "rotating wooden polarizer (135\xb0)",
+  "rotating wooden polarizer (157.5\xb0)",
+  "rotating steel polarizer (0\xb0)",
+  "rotating steel polarizer (22.5\xb0)",
+  "rotating steel polarizer (45\xb0)",         /* 350 */
+  "rotating steel polarizer (67.5\xb0)",
+  "rotating steel polarizer (90\xb0)",
+  "rotating steel polarizer (112.5\xb0)",
+  "rotating steel polarizer (135\xb0)",
+  "rotating steel polarizer (157.5\xb0)",
   "red beamer (0\xb0)",
   "red beamer (22.5\xb0)",
   "red beamer (45\xb0)",

diff --git a/src/main.c b/src/main.c
index 75818dfc67d0fad777102152de3d377e7b2edbb0..146f060c66622f42077008e9a69047861f6207b7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4518,7 +4518,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_empty_space",
     "empty_space",
-    "empty_space"
+    "empty space"
   },
   {
     "mm_mirror_1",
@@ -4603,22 +4603,22 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_steel_grid_fixed_1",
     "mm_steel_grid_fixed",
-    "fixed steel polarisator (0\xb0)"
+    "fixed steel polarizer (0\xb0)"
   },
   {
     "mm_steel_grid_fixed_2",
     "mm_steel_grid_fixed",
-    "fixed steel polarisator (90\xb0)"
+    "fixed steel polarizer (90\xb0)"
   },
   {
     "mm_steel_grid_fixed_3",
     "mm_steel_grid_fixed",
-    "fixed steel polarisator (45\xb0)"
+    "fixed steel polarizer (45\xb0)"
   },
   {
     "mm_steel_grid_fixed_4",
     "mm_steel_grid_fixed",
-    "fixed steel polarisator (135\xb0)"
+    "fixed steel polarizer (135\xb0)"
   },
   {
     "mm_mcduffin.right",
@@ -5111,104 +5111,104 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "pac man (starts moving down)"
   },
   {
-    "mm_polarisator_1",
-    "mm_polarisator",
-    "polarisator (0\xb0)"
+    "mm_polarizer_1",
+    "mm_polarizer",
+    "polarizer (0\xb0)"
   },
   {
-    "mm_polarisator_2",
-    "mm_polarisator",
-    "polarisator (11.25\xb0)"
+    "mm_polarizer_2",
+    "mm_polarizer",
+    "polarizer (11.25\xb0)"
   },
   {
-    "mm_polarisator_3",
-    "mm_polarisator",
-    "polarisator (22.5\xb0)"
+    "mm_polarizer_3",
+    "mm_polarizer",
+    "polarizer (22.5\xb0)"
   },
   {
-    "mm_polarisator_4",
-    "mm_polarisator",
-    "polarisator (33.75\xb0)"
+    "mm_polarizer_4",
+    "mm_polarizer",
+    "polarizer (33.75\xb0)"
   },
   {
-    "mm_polarisator_5",
-    "mm_polarisator",
-    "polarisator (45\xb0)"
+    "mm_polarizer_5",
+    "mm_polarizer",
+    "polarizer (45\xb0)"
   },
   {
-    "mm_polarisator_6",
-    "mm_polarisator",
-    "polarisator (56.25\xb0)"
+    "mm_polarizer_6",
+    "mm_polarizer",
+    "polarizer (56.25\xb0)"
   },
   {
-    "mm_polarisator_7",
-    "mm_polarisator",
-    "polarisator (67.5\xb0)"
+    "mm_polarizer_7",
+    "mm_polarizer",
+    "polarizer (67.5\xb0)"
   },
   {
-    "mm_polarisator_8",
-    "mm_polarisator",
-    "polarisator (78.75\xb0)"
+    "mm_polarizer_8",
+    "mm_polarizer",
+    "polarizer (78.75\xb0)"
   },
   {
-    "mm_polarisator_9",
-    "mm_polarisator",
-    "polarisator (90\xb0)"
+    "mm_polarizer_9",
+    "mm_polarizer",
+    "polarizer (90\xb0)"
   },
   {
-    "mm_polarisator_10",
-    "mm_polarisator",
-    "polarisator (101.25\xb0)"
+    "mm_polarizer_10",
+    "mm_polarizer",
+    "polarizer (101.25\xb0)"
   },
   {
-    "mm_polarisator_11",
-    "mm_polarisator",
-    "polarisator (112.5\xb0)"
+    "mm_polarizer_11",
+    "mm_polarizer",
+    "polarizer (112.5\xb0)"
   },
   {
-    "mm_polarisator_12",
-    "mm_polarisator",
-    "polarisator (123.75\xb0)"
+    "mm_polarizer_12",
+    "mm_polarizer",
+    "polarizer (123.75\xb0)"
   },
   {
-    "mm_polarisator_13",
-    "mm_polarisator",
-    "polarisator (135\xb0)"
+    "mm_polarizer_13",
+    "mm_polarizer",
+    "polarizer (135\xb0)"
   },
   {
-    "mm_polarisator_14",
-    "mm_polarisator",
-    "polarisator (146.25\xb0)"
+    "mm_polarizer_14",
+    "mm_polarizer",
+    "polarizer (146.25\xb0)"
   },
   {
-    "mm_polarisator_15",
-    "mm_polarisator",
-    "polarisator (157.5\xb0)"
+    "mm_polarizer_15",
+    "mm_polarizer",
+    "polarizer (157.5\xb0)"
   },
   {
-    "mm_polarisator_16",
-    "mm_polarisator",
-    "polarisator (168.75\xb0)"
+    "mm_polarizer_16",
+    "mm_polarizer",
+    "polarizer (168.75\xb0)"
   },
   {
-    "mm_polarisator_cross_1",
-    "mm_polarisator_cross",
-    "two-way polarisator (0\xb0)"
+    "mm_polarizer_cross_1",
+    "mm_polarizer_cross",
+    "two-way polarizer (0\xb0)"
   },
   {
-    "mm_polarisator_cross_2",
-    "mm_polarisator_cross",
-    "two-way polarisator (22.5\xb0)"
+    "mm_polarizer_cross_2",
+    "mm_polarizer_cross",
+    "two-way polarizer (22.5\xb0)"
   },
   {
-    "mm_polarisator_cross_3",
-    "mm_polarisator_cross",
-    "two-way polarisator (45\xb0)"
+    "mm_polarizer_cross_3",
+    "mm_polarizer_cross",
+    "two-way polarizer (45\xb0)"
   },
   {
-    "mm_polarisator_cross_4",
-    "mm_polarisator_cross",
-    "two-way polarisator (67.5\xb0)"
+    "mm_polarizer_cross_4",
+    "mm_polarizer_cross",
+    "two-way polarizer (67.5\xb0)"
   },
   {
     "mm_mirror_fixed_1",
@@ -5273,22 +5273,22 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "mm_wooden_grid_fixed_1",
     "mm_wooden_grid_fixed",
-    "fixed wooden polarisator (0\xb0)"
+    "fixed wooden polarizer (0\xb0)"
   },
   {
     "mm_wooden_grid_fixed_2",
     "mm_wooden_grid_fixed",
-    "fixed wooden polarisator (90\xb0)"
+    "fixed wooden polarizer (90\xb0)"
   },
   {
     "mm_wooden_grid_fixed_3",
     "mm_wooden_grid_fixed",
-    "fixed wooden polarisator (45\xb0)"
+    "fixed wooden polarizer (45\xb0)"
   },
   {
     "mm_wooden_grid_fixed_4",
     "mm_wooden_grid_fixed",
-    "fixed wooden polarisator (135\xb0)"
+    "fixed wooden polarizer (135\xb0)"
   },
   {
     "mm_fuel_empty",
@@ -5398,82 +5398,82 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "df_wooden_grid_fixed_1",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (0\xb0)"
+    "fixed wooden polarizer (0\xb0)"
   },
   {
     "df_wooden_grid_fixed_2",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (22.5\xb0)"
+    "fixed wooden polarizer (22.5\xb0)"
   },
   {
     "df_wooden_grid_fixed_3",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (45\xb0)"
+    "fixed wooden polarizer (45\xb0)"
   },
   {
     "df_wooden_grid_fixed_4",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (67.5\xb0)"
+    "fixed wooden polarizer (67.5\xb0)"
   },
   {
     "df_wooden_grid_fixed_5",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (90\xb0)"
+    "fixed wooden polarizer (90\xb0)"
   },
   {
     "df_wooden_grid_fixed_6",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (112.5\xb0)"
+    "fixed wooden polarizer (112.5\xb0)"
   },
   {
     "df_wooden_grid_fixed_7",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (135\xb0)"
+    "fixed wooden polarizer (135\xb0)"
   },
   {
     "df_wooden_grid_fixed_8",
     "df_wooden_grid_fixed",
-    "fixed wooden polarisator (157.5\xb0)"
+    "fixed wooden polarizer (157.5\xb0)"
   },
   {
     "df_steel_grid_fixed_1",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (0\xb0)"
+    "fixed steel polarizer (0\xb0)"
   },
   {
     "df_steel_grid_fixed_2",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (22.5\xb0)"
+    "fixed steel polarizer (22.5\xb0)"
   },
   {
     "df_steel_grid_fixed_3",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (45\xb0)"
+    "fixed steel polarizer (45\xb0)"
   },
   {
     "df_steel_grid_fixed_4",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (67.5\xb0)"
+    "fixed steel polarizer (67.5\xb0)"
   },
   {
     "df_steel_grid_fixed_5",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (90\xb0)"
+    "fixed steel polarizer (90\xb0)"
   },
   {
     "df_steel_grid_fixed_6",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (112.5\xb0)"
+    "fixed steel polarizer (112.5\xb0)"
   },
   {
     "df_steel_grid_fixed_7",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (135\xb0)"
+    "fixed steel polarizer (135\xb0)"
   },
   {
     "df_steel_grid_fixed_8",
     "df_steel_grid_fixed",
-    "fixed steel polarisator (157.5\xb0)"
+    "fixed steel polarizer (157.5\xb0)"
   },
   {
     "df_wooden_wall_1",
@@ -5818,82 +5818,82 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
   {
     "df_wooden_grid_rotating_1",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (0\xb0)"
+    "rotating wooden polarizer (0\xb0)"
   },
   {
     "df_wooden_grid_rotating_2",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (22.5\xb0)"
+    "rotating wooden polarizer (22.5\xb0)"
   },
   {
     "df_wooden_grid_rotating_3",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (45\xb0)"
+    "rotating wooden polarizer (45\xb0)"
   },
   {
     "df_wooden_grid_rotating_4",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (67.5\xb0)"
+    "rotating wooden polarizer (67.5\xb0)"
   },
   {
     "df_wooden_grid_rotating_5",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (90\xb0)"
+    "rotating wooden polarizer (90\xb0)"
   },
   {
     "df_wooden_grid_rotating_6",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (112.5\xb0)"
+    "rotating wooden polarizer (112.5\xb0)"
   },
   {
     "df_wooden_grid_rotating_7",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (135\xb0)"
+    "rotating wooden polarizer (135\xb0)"
   },
   {
     "df_wooden_grid_rotating_8",
     "df_wooden_grid_rotating",
-    "rotating wooden polarisator (157.5\xb0)"
+    "rotating wooden polarizer (157.5\xb0)"
   },
   {
     "df_steel_grid_rotating_1",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (0\xb0)"
+    "rotating steel polarizer (0\xb0)"
   },
   {
     "df_steel_grid_rotating_2",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (22.5\xb0)"
+    "rotating steel polarizer (22.5\xb0)"
   },
   {
     "df_steel_grid_rotating_3",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (45\xb0)"
+    "rotating steel polarizer (45\xb0)"
   },
   {
     "df_steel_grid_rotating_4",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (67.5\xb0)"
+    "rotating steel polarizer (67.5\xb0)"
   },
   {
     "df_steel_grid_rotating_5",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (90\xb0)"
+    "rotating steel polarizer (90\xb0)"
   },
   {
     "df_steel_grid_rotating_6",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (112.5\xb0)"
+    "rotating steel polarizer (112.5\xb0)"
   },
   {
     "df_steel_grid_rotating_7",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (135\xb0)"
+    "rotating steel polarizer (135\xb0)"
   },
   {
     "df_steel_grid_rotating_8",
     "df_steel_grid_rotating",
-    "rotating steel polarisator (157.5\xb0)"
+    "rotating steel polarizer (157.5\xb0)"
   },
   {
     "mm_beamer_red_1",

diff --git a/src/main.h b/src/main.h
index 33725179f04d35d79bd0d625776c6cf72d81be47..a5f90d7a2173aff463c1d147306987df3f85d2e6 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1617,30 +1617,30 @@
 #define EL_MM_PACMAN_LEFT              (EL_MM_PACMAN_START + 2)
 #define EL_MM_PACMAN_DOWN              (EL_MM_PACMAN_START + 3)
 #define EL_MM_PACMAN_END               EL_MM_PACMAN_DOWN
-#define EL_MM_POLARISATOR_START                (EL_MM_START + 119)
-#define EL_MM_POLARISATOR_1            (EL_MM_POLARISATOR_START + 0)
-#define EL_MM_POLARISATOR_2            (EL_MM_POLARISATOR_START + 1)
-#define EL_MM_POLARISATOR_3            (EL_MM_POLARISATOR_START + 2)
-#define EL_MM_POLARISATOR_4            (EL_MM_POLARISATOR_START + 3)
-#define EL_MM_POLARISATOR_5            (EL_MM_POLARISATOR_START + 4)
-#define EL_MM_POLARISATOR_6            (EL_MM_POLARISATOR_START + 5)
-#define EL_MM_POLARISATOR_7            (EL_MM_POLARISATOR_START + 6)
-#define EL_MM_POLARISATOR_8            (EL_MM_POLARISATOR_START + 7)
-#define EL_MM_POLARISATOR_9            (EL_MM_POLARISATOR_START + 8)
-#define EL_MM_POLARISATOR_10           (EL_MM_POLARISATOR_START + 9)
-#define EL_MM_POLARISATOR_11           (EL_MM_POLARISATOR_START + 10)
-#define EL_MM_POLARISATOR_12           (EL_MM_POLARISATOR_START + 11)
-#define EL_MM_POLARISATOR_13           (EL_MM_POLARISATOR_START + 12)
-#define EL_MM_POLARISATOR_14           (EL_MM_POLARISATOR_START + 13)
-#define EL_MM_POLARISATOR_15           (EL_MM_POLARISATOR_START + 14)
-#define EL_MM_POLARISATOR_16           (EL_MM_POLARISATOR_START + 15)
-#define EL_MM_POLARISATOR_END          EL_MM_POLARISATOR_15
-#define EL_MM_POLARISATOR_CROSS_START  (EL_MM_START + 135)
-#define EL_MM_POLARISATOR_CROSS_1      (EL_MM_POLARISATOR_CROSS_START + 0)
-#define EL_MM_POLARISATOR_CROSS_2      (EL_MM_POLARISATOR_CROSS_START + 1)
-#define EL_MM_POLARISATOR_CROSS_3      (EL_MM_POLARISATOR_CROSS_START + 2)
-#define EL_MM_POLARISATOR_CROSS_4      (EL_MM_POLARISATOR_CROSS_START + 3)
-#define EL_MM_POLARISATOR_CROSS_END    EL_MM_POLARISATOR_CROSS_03
+#define EL_MM_POLARIZER_START          (EL_MM_START + 119)
+#define EL_MM_POLARIZER_1              (EL_MM_POLARIZER_START + 0)
+#define EL_MM_POLARIZER_2              (EL_MM_POLARIZER_START + 1)
+#define EL_MM_POLARIZER_3              (EL_MM_POLARIZER_START + 2)
+#define EL_MM_POLARIZER_4              (EL_MM_POLARIZER_START + 3)
+#define EL_MM_POLARIZER_5              (EL_MM_POLARIZER_START + 4)
+#define EL_MM_POLARIZER_6              (EL_MM_POLARIZER_START + 5)
+#define EL_MM_POLARIZER_7              (EL_MM_POLARIZER_START + 6)
+#define EL_MM_POLARIZER_8              (EL_MM_POLARIZER_START + 7)
+#define EL_MM_POLARIZER_9              (EL_MM_POLARIZER_START + 8)
+#define EL_MM_POLARIZER_10             (EL_MM_POLARIZER_START + 9)
+#define EL_MM_POLARIZER_11             (EL_MM_POLARIZER_START + 10)
+#define EL_MM_POLARIZER_12             (EL_MM_POLARIZER_START + 11)
+#define EL_MM_POLARIZER_13             (EL_MM_POLARIZER_START + 12)
+#define EL_MM_POLARIZER_14             (EL_MM_POLARIZER_START + 13)
+#define EL_MM_POLARIZER_15             (EL_MM_POLARIZER_START + 14)
+#define EL_MM_POLARIZER_16             (EL_MM_POLARIZER_START + 15)
+#define EL_MM_POLARIZER_END            EL_MM_POLARIZER_15
+#define EL_MM_POLARIZER_CROSS_START    (EL_MM_START + 135)
+#define EL_MM_POLARIZER_CROSS_1                (EL_MM_POLARIZER_CROSS_START + 0)
+#define EL_MM_POLARIZER_CROSS_2                (EL_MM_POLARIZER_CROSS_START + 1)
+#define EL_MM_POLARIZER_CROSS_3                (EL_MM_POLARIZER_CROSS_START + 2)
+#define EL_MM_POLARIZER_CROSS_4                (EL_MM_POLARIZER_CROSS_START + 3)
+#define EL_MM_POLARIZER_CROSS_END      EL_MM_POLARIZER_CROSS_03
 #define EL_MM_MIRROR_FIXED_START       (EL_MM_START + 139)
 #define EL_MM_MIRROR_FIXED_1           (EL_MM_MIRROR_FIXED_START + 0)
 #define EL_MM_MIRROR_FIXED_2           (EL_MM_MIRROR_FIXED_START + 1)