From 7dbb36186a41428104a04f6e282b69b334622925 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Wed, 18 Jun 2014 08:19:08 +0200
Subject: [PATCH] Minor update of us names/user-words

---
 .gitignore                       |  1 +
 Dictionaries/en_US_names_etc.xml | 27 ++++++++++++++++-----------
 Dictionaries/en_US_user.xml      | 15 ++++++++++-----
 src/Changelog.txt                |  2 +-
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 622e48c29..a78c0d9fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /src/Languages/XmlContentTranslator.exe
 /src/TestResults
 /src/SubtitleEdit.csproj.DotSettings
+/src/Test/Test.csproj.user
diff --git a/Dictionaries/en_US_names_etc.xml b/Dictionaries/en_US_names_etc.xml
index d8c636366..9dfefb7c6 100644
--- a/Dictionaries/en_US_names_etc.xml
+++ b/Dictionaries/en_US_names_etc.xml
@@ -1,7 +1,5 @@
-<!-- This list contains names/words with specific casing - and specific to english only -->
+<!-- This list contains names/words with specific casing - and specific to english only -->
 <ignore_list>
-  <name>Aaden</name>
-  <name>Aarav</name>
   <name>Abbey</name>
   <name>Abbie</name>
   <name>Abbigail</name>
@@ -135,7 +133,6 @@
   <name>Averie</name>
   <name>Aviana</name>
   <name>Avianna</name>
-  <name>Ayaan</name>
   <name>Ayana</name>
   <name>Ayanna</name>
   <name>Aydan</name>
@@ -143,6 +140,7 @@
   <name>Ayla</name>
   <name>Ayleen</name>
   <name>Aylin</name>
+  <name>Ayaan</name>
   <name>Azaria</name>
   <name>Azog</name>
   <name>Bacharach</name>
@@ -208,7 +206,6 @@
   <name>Brysen</name>
   <name>Bucharest</name>
   <name>Buenos Aires</name>
-  <name>CONKLIN</name>
   <name>Cade</name>
   <name>Cadence</name>
   <name>Cahill</name>
@@ -262,6 +259,7 @@
   <name>Clooney</name>
   <name>Coachella</name>
   <name>Coen</name>
+  <name>Coggins</name>
   <name>Colet</name>
   <name>Cologne</name>
   <name>Colombo</name>
@@ -269,6 +267,7 @@
   <name>Colten</name>
   <name>Columbo</name>
   <name>Colvin</name>
+  <name>Conklin</name>
   <name>Cooper</name>
   <name>Corban</name>
   <name>Corbin</name>
@@ -717,7 +716,6 @@
   <name>Kyra</name>
   <name>Kyron</name>
   <name>Kyson</name>
-  <name>L'Hermitage</name>
   <name>Lahore</name>
   <name>Laila</name>
   <name>Lailah</name>
@@ -751,6 +749,7 @@
   <name>Lesly</name>
   <name>Levi</name>
   <name>Leyla</name>
+  <name>L'Hermitage</name>
   <name>Lia</name>
   <name>Liana</name>
   <name>Liberty</name>
@@ -858,6 +857,7 @@
   <name>Maxton</name>
   <name>Maxx</name>
   <name>Mayson</name>
+  <name>McAlister</name>
   <name>Mckayla</name>
   <name>Mckenna</name>
   <name>Mckenzie</name>
@@ -933,8 +933,6 @@
   <name>Nutella</name>
   <name>Nyla</name>
   <name>Nylah</name>
-  <name>O'Regan</name>
-  <name>OMG</name>
   <name>Oakenshield</name>
   <name>Odin</name>
   <name>Oeufcocque Penteano</name>
@@ -943,6 +941,8 @@
   <name>Oleg</name>
   <name>Oliveira</name>
   <name>Omari</name>
+  <name>OMG</name>
+  <name>O'Regan</name>
   <name>Orion</name>
   <name>Osaka</name>
   <name>Oslo</name>
@@ -1029,7 +1029,6 @@
   <name>Ryleigh</name>
   <name>Rylen</name>
   <name>Rylie</name>
-  <name>Saanvi</name>
   <name>Sadie</name>
   <name>Sage</name>
   <name>Saige</name>
@@ -1041,11 +1040,11 @@
   <name>Samiyah</name>
   <name>Samson</name>
   <name>San Francisco</name>
-  <name>Sanaa</name>
   <name>Sandberg</name>
   <name>Saniya</name>
   <name>Saniyah</name>
   <name>Santino</name>
+  <name>Sanaa</name>
   <name>Sao Paulo</name>
   <name>Sarahi</name>
   <name>Sarai</name>
@@ -1055,6 +1054,7 @@
   <name>Sarrazin</name>
   <name>Satnam</name>
   <name>Sauron</name>
+  <name>Seagrave</name>
   <name>Segway</name>
   <name>Selah</name>
   <name>Semaj</name>
@@ -1067,6 +1067,7 @@
   <name>Shenyang</name>
   <name>Sherlyn</name>
   <name>Shiloh</name>
+  <name>Shumway</name>
   <name>Siena</name>
   <name>Sienna</name>
   <name>Sincere</name>
@@ -1082,16 +1083,17 @@
   <name>Soren</name>
   <name>St. Louis</name>
   <name>St. Lucia</name>
-  <name>StPetersburg</name>
   <name>Stanislaus</name>
   <name>Stanny's</name>
   <name>Star Trek</name>
   <name>Sterling</name>
   <name>Stillman</name>
+  <name>St. Petersburg</name>
   <name>Sturridge</name>
   <name>Suez</name>
   <name>Summer</name>
   <name>Sylas</name>
+  <name>Saanvi</name>
   <name>Taipei</name>
   <name>Talia</name>
   <name>Taliyah</name>
@@ -1155,6 +1157,7 @@
   <name>Warmbrunn</name>
   <name>Warsaw</name>
   <name>Waylon</name>
+  <name>Wembley</name>
   <name>Wes</name>
   <name>Westin</name>
   <name>Weston</name>
@@ -1208,4 +1211,6 @@
   <name>Zion</name>
   <name>Zoie</name>
   <name>Zuri</name>
+  <name>Aaden</name>
+  <name>Aarav</name>
 </ignore_list>
\ No newline at end of file
diff --git a/Dictionaries/en_US_user.xml b/Dictionaries/en_US_user.xml
index cd3607c50..5359b3d28 100644
--- a/Dictionaries/en_US_user.xml
+++ b/Dictionaries/en_US_user.xml
@@ -19,6 +19,8 @@
   <word>arsenic</word>
   <word>arses</word>
   <word>astatine</word>
+  <word>autotrophs</word>
+  <word>axe</word>
   <word>barium</word>
   <word>behaviour</word>
   <word>beheadings</word>
@@ -60,6 +62,7 @@
   <word>clozapine</word>
   <word>cobalt</word>
   <word>collywobbles</word>
+  <word>colonoscopy</word>
   <word>colours</word>
   <word>copernicium</word>
   <word>copper</word>
@@ -91,6 +94,7 @@
   <word>euros</word>
   <word>evaporite</word>
   <word>everything's</word>
+  <word>extradural</word>
   <word>faggot</word>
   <word>fallin'</word>
   <word>favour</word>
@@ -115,6 +119,7 @@
   <word>generationally</word>
   <word>germanium</word>
   <word>giancarlo</word>
+  <word>gigabit</word>
   <word>glowy</word>
   <word>goddamned</word>
   <word>golconda</word>
@@ -138,6 +143,7 @@
   <word>incontinentia</word>
   <word>indium</word>
   <word>intercostal</word>
+  <word>intubate</word>
   <word>iodine</word>
   <word>iridium</word>
   <word>iron</word>
@@ -183,6 +189,7 @@
   <word>neodymium</word>
   <word>neon</word>
   <word>neptunium</word>
+  <word>neurobiologist</word>
   <word>nickel</word>
   <word>niobium</word>
   <word>nitrogen</word>
@@ -207,6 +214,7 @@
   <word>playbook</word>
   <word>plutonium</word>
   <word>pneumothorax</word>
+  <word>polenta</word>
   <word>polonium</word>
   <word>postulator</word>
   <word>potassium</word>
@@ -218,6 +226,7 @@
   <word>radon</word>
   <word>realise</word>
   <word>realised</word>
+  <word>rebar</word>
   <word>recalibrated</word>
   <word>recognise</word>
   <word>recognised</word>
@@ -301,6 +310,7 @@
   <word>vaccinologist</word>
   <word>vanadium</word>
   <word>voila</word>
+  <word>weirding</word>
   <word>what'd</word>
   <word>what're</word>
   <word>when'd</word>
@@ -318,9 +328,4 @@
   <word>yukina</word>
   <word>zinc</word>
   <word>zirconium</word>
-  <word>autotrophs</word>
-  <word>polenta</word>
-  <word>colonoscopy</word>
-  <word>neurobiologist</word>
-  <word>gigabit</word>
 </words>
\ No newline at end of file
diff --git a/src/Changelog.txt b/src/Changelog.txt
index f9e8d6def..91f6aa9e0 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,7 +1,7 @@
 Subtitle Edit Changelog
 
 
-3.4 (xth June 2014)
+3.4.0 (xth June 2014)
 * NEW:
    * Switched to .NET Framework 4.0 (from .NET Framework 2.0)
    * Runs 64-bit on 64-bit operating systems (requires 64-bit codecs!)