Update for MMMerge 2020-07-12

Placemon translation

.gitignore

@@ -2,7 +2,6 @@
 /2_dev/
 /4_prod/
 /5_postprod/
-/6_finalprod/
 /non_text/sound/
 /non_text/video/
 /note/others/
@@ -145,6 +144,21 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
+# Mac
+.DS_Store
+
+# Windows
+Thumbs.db
+
+# WebStorm
+.idea/
+
+# vi
+*~
+
+# General
+log/
+*.log
 
 # === MicrosoftOffice.gitignore ===
 

0.5_template_without_context/mmmerge/data/10LocLANG.EnglishT/Placemon.txt

@@ -122,5 +122,42 @@
 121	_(TRANS)_
 122	_(TRANS)_
 123	_(TRANS)_
-124	Placeholder
-125	Placeholder
+124	_(TRANS)_
+125	_(TRANS)_
+126	_(TRANS)_
+127	_(TRANS)_
+128	_(TRANS)_
+129	_(TRANS)_
+130	_(TRANS)_
+131	_(TRANS)_
+132	_(TRANS)_
+133	_(TRANS)_
+134	_(TRANS)_
+135	_(TRANS)_
+136	_(TRANS)_
+137	_(TRANS)_
+138	_(TRANS)_
+139	_(TRANS)_
+140	_(TRANS)_
+141	_(TRANS)_
+142	_(TRANS)_
+143	_(TRANS)_
+144	_(TRANS)_
+145	_(TRANS)_
+146	_(TRANS)_
+147	_(TRANS)_
+148	_(TRANS)_
+149	_(TRANS)_
+150	_(TRANS)_
+151	_(TRANS)_
+152	_(TRANS)_
+153	_(TRANS)_
+154	_(TRANS)_
+155	_(TRANS)_
+156	_(TRANS)_
+157	_(TRANS)_
+158	_(TRANS)_
+159	_(TRANS)_
+160	_(TRANS)_
+161	Placeholder
+162	Placeholder

0_source/en/mmmerge/data/10LocLANG.EnglishT/Placemon.txt

@@ -122,5 +122,42 @@
 121	Grognard
 122	Hairbaugh
 123	Q
-124	Placeholder
-125	Placeholder
+124	Queen Spider
+125	Fallen Defender
+126	Snergle
+127	Rogue Leader
+128	Lesser Genie
+129	Ethric
+130	Werewolf Leader
+131	Agar
+132	Slicker Silvertongue
+133	Q
+134	Lich King
+135	Lurch
+136	Sentinel of Varn
+137	Longfang Witherhide
+138	Devil of Baa
+139	Trip Hawkins
+140	Greg Fulton
+141	William Nesemeier
+142	Andy Grumm
+143	Mark  Caldwell
+144	Peter Ryu
+145	Scott McDaniel
+146	 Keith Francart
+147	Bonnie Long-Hemssath
+148	Becky Christel
+149	Rob King
+150	Steve Baca
+151	Rick Sanchez
+152	Helena Wickberg
+153	John Bolton
+154	Anthony Rizo
+155	Bruce Miyake
+156	NWC Employee
+157	Randy Ruckel
+158	Karl Fischer
+159	David Casso
+160	Morcarack
+161	Placeholder
+162	Placeholder

3_i18n/mm678.pot

@@ -2,15 +2,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Might and Magic 6 7 8 Translation\n"
-"POT-Creation-Date: 2020-05-30 01:03+0200\n"
+"POT-Creation-Date: 2020-08-01 18:03+0200\n"
 "PO-Revision-Date: 2020-02-05 19:47+0100\n"
 "Last-Translator: Tom Chen <[email protected]>\n"
 "Language-Team: Might and Magic Unofficial Translation Team\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4\n"
 "X-Poedit-Basepath: ../2_dev\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -83438,6 +83438,7 @@ msgstr ""
 
 #: mm7/DATA/10LocLANG.events/PlaceMon.txt.py:5
 #: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:114
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:161
 msgctxt "placemon"
 msgid "Morcarack"
 msgstr ""
@@ -120906,10 +120907,186 @@ msgid "Super Vampire"
 msgstr ""
 
 #: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:124
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:134
 msgctxt "placemon"
 msgid "Q"
 msgstr ""
 
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:125
+msgctxt "placemon"
+msgid "Queen Spider"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:126
+msgctxt "placemon"
+msgid "Fallen Defender"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:127
+msgctxt "placemon"
+msgid "Snergle"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:128
+msgctxt "placemon"
+msgid "Rogue Leader"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:129
+msgctxt "placemon"
+msgid "Lesser Genie"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:130
+msgctxt "placemon"
+msgid "Ethric"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:131
+msgctxt "placemon"
+msgid "Werewolf Leader"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:132
+msgctxt "placemon"
+msgid "Agar"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:133
+msgctxt "placemon"
+msgid "Slicker Silvertongue"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:135
+msgctxt "placemon"
+msgid "Lich King"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:136
+msgctxt "placemon"
+msgid "Lurch"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:137
+msgctxt "placemon"
+msgid "Sentinel of Varn"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:138
+msgctxt "placemon"
+msgid "Longfang Witherhide"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:139
+msgctxt "placemon"
+msgid "Devil of Baa"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:140
+msgctxt "placemon"
+msgid "Trip Hawkins"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:141
+msgctxt "placemon"
+msgid "Greg Fulton"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:142
+msgctxt "placemon"
+msgid "William Nesemeier"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:143
+msgctxt "placemon"
+msgid "Andy Grumm"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:144
+msgctxt "placemon"
+msgid "Mark  Caldwell"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:145
+msgctxt "placemon"
+msgid "Peter Ryu"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:146
+msgctxt "placemon"
+msgid "Scott McDaniel"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:147
+msgctxt "placemon"
+msgid " Keith Francart"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:148
+msgctxt "placemon"
+msgid "Bonnie Long-Hemssath"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:149
+msgctxt "placemon"
+msgid "Becky Christel"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:150
+msgctxt "placemon"
+msgid "Rob King"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:151
+msgctxt "placemon"
+msgid "Steve Baca"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:152
+msgctxt "placemon"
+msgid "Rick Sanchez"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:153
+msgctxt "placemon"
+msgid "Helena Wickberg"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:154
+msgctxt "placemon"
+msgid "John Bolton"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:155
+msgctxt "placemon"
+msgid "Anthony Rizo"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:156
+msgctxt "placemon"
+msgid "Bruce Miyake"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:157
+msgctxt "placemon"
+msgid "NWC Employee"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:158
+msgctxt "placemon"
+msgid "Randy Ruckel"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:159
+msgctxt "placemon"
+msgid "Karl Fischer"
+msgstr ""
+
+#: mmmerge/Data/10LocLANG.EnglishT/Placemon.txt.py:160
+msgctxt "placemon"
+msgid "David Casso"
+msgstr ""
+
 #: mmmerge/Data/10LocLANG.EnglishT/Quests.txt.py:1713
 msgctxt "quests"
 msgid "Mysterious woman asked you to travel in time and fulfill destinies of other heroes. Well..."