diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf
index a5bf09595..548a99abd 100644
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -25727,7 +25727,6 @@ fun harasser_N : N ;
 fun harassment_N : N ;
 fun harbin_PN : PN ;
 fun harbinger_N : N ;
-fun harbor_N : N  ;
 fun harbour_N : N ;
 fun harbour_V : V ;
 fun harbour_V2 : V2 ;
diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf
index 2b40ad847..ceec01e51 100644
--- a/lib/src/translator/DictionaryBul.gf
+++ b/lib/src/translator/DictionaryBul.gf
@@ -25732,7 +25732,6 @@ lin harasser_N = mkN007a "тормозатор" ;
 lin harassment_N = mkN007 "тормоз" ;
 lin harbin_PN = mkPN "Харбин" Masc ;
 lin harbinger_N = mkN014 "предвестник" ;
-lin harbor_N = variants {} ;
 lin harbour_N = mkN066 "пристанище" ;
 lin harbour_V = variants {dualV (mkV186 "затаявам") (mkV175 "затая"); dualV (mkV186 "укривам") (mkV163 "укрия"); singleV (mkV173 "храня")} ; ----
 lin harbour_V2 = dirV2 (variants {dualV (mkV186 "подслонявам") (mkV174 "подслоня") ; singleV (mkV163 "крия")}) ; ----
diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf
index 0b18fee72..4bb5a5d4c 100644
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -25844,8 +25844,7 @@ lin harasser_N = mkN "harasser" ;
 lin harassment_N = mkN "harassment" ;
 lin harbin_PN = mkPN "Harbin";
 lin harbinger_N = mkN "harbinger" "harbingers";
-lin harbor_N = mkN "harbor" ;
-lin harbour_N = mkN "harbour" "harbours";
+lin harbour_N = variants {mkN "harbour" "harbours"; mkN "harbor"};
 lin harbour_V = mkV "harbour" "harbours" "harboured" "harboured" "harbouring";
 lin harbour_V2 = mkV2 (mkV "harbour" "harbours" "harboured" "harboured" "harbouring");
 lin harbourage_N = mkN "harbourage" "harbourages";
diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf
index 3f5127e1e..ce5a827c1 100644
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -10047,7 +10047,6 @@ lin harangue_N = mkN "kõvahäälselt pragama" | mkN "tiraad" | mkN "vastusüüd
 lin harassment_N = mkN "kiusamine" | mkN "mõnitamine" | mkN "vaevatus" ;
 lin harbinger_N = mkN "ette kuulutama" | mkN "kuulutaja" | mkN "majutusülem" ;
 lin harborage_N = mkN "ohutu ankrupaik" ;
-lin harbor_N = mkN "hellitama" | mkN "hoidma" | mkN "sadam" | mkN "varjama" ;
 lin harbourage_N = mkN "ohutu ankrupaik" ;
 lin harbour_N = mkN "hellitama" | mkN "hoidma" | mkN "sadam" | mkN "varjama" ;
 lin hardback_N = mkN "kõvakaaneline" | mkN "kõvas köites raamat" ;
diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf
index b98c57b25..c42956c6b 100644
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -23634,7 +23634,6 @@ lin harasser_N = mkWN (k10 "kiusaaja") ; --UNCHK
 lin harassment_N = mkWN (k2 "ahdistelu") ; --UNCHK
 lin harbin_PN = foreignPN "Harbin" ;
 lin harbinger_N = mkWN (k10 "edeltäjä") ; --UNCHK
-lin harbor_N = mkWN (compoundN "turva" (k9A "paikka")) ; --UNCHK
 lin harbor_V2 = mkWV2 (k67A "elätellä") ; --UNCHK
 lin harborage_N = mkWN (compoundN "turva" (k9A "paikka")) ; --UNCHK
 lin harbour_N = L.harbour_N ;
diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf
index c11f70a93..b6d1c1413 100644
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -25733,7 +25733,6 @@ lin harasser_N = variants {} ;
 lin harassment_N = mkN "Belästigung" feminine ; -- status=guess
 lin harbin_PN = mkPN "Harbin" ; -- src=geonames status=guess
 lin harbinger_N = mkN "Vorbote" masculine | mkN "Omen" neuter ; -- status=guess status=guess
-lin harbor_N = variants {} ;
 lin harbour_N = L.harbour_N ;
 lin harbour_V = variants {} ;
 lin harbour_V2 = variants {} ;
diff --git a/lib/src/translator/DictionaryHin.gf b/lib/src/translator/DictionaryHin.gf
index 90ba8ad53..e8dc655dc 100644
--- a/lib/src/translator/DictionaryHin.gf
+++ b/lib/src/translator/DictionaryHin.gf
@@ -12112,7 +12112,6 @@ lin harangue_V2 = mkV2 (compoundV "उग्र भाषण" (mkV "देना
 lin harass_V2 = mkV2 (compoundV "बार-बार आक्रमण" (mkV "करना")) ; -- tocheck
 lin harassment_N = mkN "कष्ट" ; -- tocheck              
 lin harbinger_N = mkN "अग्रदूत" ; -- tocheck              
-lin harbor_N = mkN "बंदरगाह" ; -- tocheck       
 lin harbour_N = mkN "बंदरगाह" ; -- tocheck              
 lin harbour_V = compoundV "मन में" (mkV "रखना") ; -- tocheck              
 lin harbour_V2 = mkV2 (compoundV "मन में" (mkV "रखना")) ; -- tocheck
diff --git a/lib/src/translator/DictionaryTha.gf b/lib/src/translator/DictionaryTha.gf
index 350b396dd..9b503deb0 100644
--- a/lib/src/translator/DictionaryTha.gf
+++ b/lib/src/translator/DictionaryTha.gf
@@ -17615,8 +17615,7 @@ lin harangue_N = mkN "คําปราศรัยที่ยื่ดยา
 lin harangue_V = mkV "พูดกรอกหู" | mkV "กล่าวคําปราศรัยที่ยื่ดยาดและรุนแรง" ; -- src=panlex
 lin harangue_V2 = mkV2 "พูดกรอกหู" ; ---- | mkV "กล่าวคําปราศรัยที่ยื่ดยาดและรุนแรง" ; -- src=panlex
 lin harbinger_N = mkN "ลาง" | mkN "สมาชิกของกองหน้า" | mkN "ผู้คาดการณ์ล่วงหน้า" | mkN "ผู้สืบข่าวที่ไปล่วงหน้าก่อน" ; -- src=panlex
-lin harbor_N = mkN "ท่าเรือ" | mkN "สถานที่ปลอดภัย" | mkN "ท่า" | mkN "ซ่อน" | mkN "ที่พัก" | mkN "ปิดบัง" | mkN "ท่าเรือ" | mkN "ท่าจอดเรือ" | mkN "จอดเรือในท่า" ; -- src=panlex
-lin harbour_N = placeN (thword "ท่า" "เรือ") | {-pan-} mkN "ท่าเรือ" | mkN "สถานที่ปลอดภัย" | mkN "ท่า" | mkN "ซ่อน" | mkN "ที่พัก" | mkN "ปิดบัง" | mkN "ท่าเรือ" | mkN "ท่าจอดเรือ" | mkN "จอดเรือในท่า" ; -- src=panlex ----?
+lin harbour_N = placeN (thword "ท่า" "เรือ") | mkN "ท่าเรือ" | mkN "สถานที่ปลอดภัย" | mkN "ท่า" | mkN "ซ่อน" | mkN "ที่พัก" | mkN "ปิดบัง" | mkN "ท่าจอดเรือ" | mkN "จอดเรือในท่า" ; -- src=panlex ----?
 lin harbour_V = mkV "เก็บไว้ในใจ" | mkV "ให้ที่กบดาน" | mkV "ให้ที่ซ่อนตัว" | mkV "ซ่อนความรู้สึก" | mkV "เก็บความรู้สึก" | mkV "จอดเรือไว้ที่ท่าเรือ" | mkV "เก็บเรือไว้ในท่าเรือ" ; -- src=panlex
 lin harbour_V2 = mkV2 "เก็บไว้ในใจ" ; ---- | mkV "ให้ที่กบดาน" | mkV "ให้ที่ซ่อนตัว" | mkV "ซ่อนความรู้สึก" | mkV "เก็บความรู้สึก" | mkV "จอดเรือไว้ที่ท่าเรือ" | mkV "เก็บเรือไว้ในท่าเรือ" ; -- src=panlex
 lin hard_1_A = variants {} ; ---- sense to be split