[maven-release-plugin] prepare release javafaker-1.0.1

Added hu locale support

.gitignore

@@ -6,3 +6,5 @@ target
 *.iml
 .java-version
 /dependency-reduced-pom.xml
+META-INF/
+bin/

.travis.yml

@@ -3,6 +3,9 @@ dist: trusty
 jdk:
 - oraclejdk8
 - openjdk7
+- openjdk10
+- oraclejdk11
+sudo: true
 script: "mvn verify failsafe:integration-test failsafe:verify"
 branches:
   except:
@@ -11,3 +14,4 @@ notifications:
   email: false
 after_success:
 - mvn clean cobertura:cobertura coveralls:cobertura
+

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+First and foremost thanks to anyone who contributes, very much appreciated.
+
+
+## Guidelines
+- Need to maintain compatibility with Java 1.6 (and Android). Therefore any attempt to migrate to 1.6 JDKs and above will not be merged back in.
+
+- If you add new faker classes like `Address`, `Country`, and `Number` they should be accompanied by a unit test. Where relevant please add more assertions to the `com.github.javafaker.integration.FakerIT` class.
+- If you add a new faker class, update the `README.md`.
+- Submit a PR with your change and if there are no comments, changes will be merged in
+- If you're not sure about the change, raise an issue and have a discussion before spending time coding it up
+- Try and make one logical change per PR. That is not make many changes in one PR. Submit multiple PRs instead
+
+## Building
+
+- Should be as easy as running `mvn clean install` on the root directory

README.md

@@ -17,19 +17,15 @@ In pom.xml, add the following xml stanza between `<dependencies> ... </dependenc
 <dependency>
     <groupId>com.github.javafaker</groupId>
     <artifactId>javafaker</artifactId>
-    <version>0.16</version>
+    <version>1.0.0</version>
 </dependency>
 ```
 
 For gradle users, add the following to your build.gradle file.
 
 ```groovy
-repositories {
-    mavenCentral()
-}
-
 dependencies {
-    testCompile group: 'com.github.javafaker', name: 'javafaker', version: '0.16'
+    implementation 'com.github.javafaker:javafaker:1.0.0'
 }
 
 ```
@@ -46,18 +42,28 @@ String lastName = faker.name().lastName(); // Barton
 String streetAddress = faker.address().streetAddress(); // 60018 Sawayn Brooks Suite 449
 ```
 
+This is a [demo web application](https://java-faker.herokuapp.com/) that uses the library.
+
 Javadoc
 -----
 http://dius.github.io/java-faker/apidocs/index.html
 
 
+Contributions
+-------------
+See [CONTRIBUTING.md](https://github.com/DiUS/java-faker/blob/master/CONTRIBUTING.md)
+
+
 Fakers
 -----
 * Ancient
+* Animal
 * Address
 * App
 * Artist
 * Avatar
+* Back To The Future
+* Aviation
 * Beer
 * Book
 * Bool
@@ -73,6 +79,7 @@ Fakers
 * Demographic
 * Dog
 * DragonBall
+* Dune
 * Educator
 * Esports
 * File
@@ -97,11 +104,14 @@ Fakers
 * Matz
 * Music
 * Name
+* Nation
 * Number
 * Options
 * Overwatch
 * PhoneNumber
 * Pokemon
+* Princess Bride
+* Relationship Terms
 * RickAndMorty
 * Robin
 * RockBand
@@ -182,4 +192,4 @@ TODO
 
 LICENSE
 -------
-Copyright (c) 2018 DiUS Computing Pty Ltd. See the LICENSE file for license rights and limitations.
+Copyright (c) 2019 DiUS Computing Pty Ltd. See the LICENSE file for license rights and limitations.

pom.xml

@@ -3,7 +3,7 @@
     <groupId>com.github.javafaker</groupId>
     <artifactId>javafaker</artifactId>
     <packaging>jar</packaging>
-    <version>0.17-SNAPSHOT</version>
+    <version>1.0.1</version>
     <name>Java Faker</name>
     <description>
     	This library is a port of Ruby's stympy/faker gem (as well as Perl's Data::Faker library) that generates fake data.
@@ -13,6 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <additionalparam>-Xdoclint:none</additionalparam>
     </properties>
     <licenses>
         <license>

src/main/java/com/github/javafaker/Address.java

@@ -35,7 +35,13 @@ public class Address {
         return faker.bothify(faker.fakeValuesService().resolve("address.postcode", this,faker));
     }
 
-    public String zipCodeByState(String stateAbbr) { return faker.fakeValuesService().resolve("address.postcode_by_state." + stateAbbr, this, faker); }
+    public String zipCodeByState(String stateAbbr) {
+        return faker.fakeValuesService().resolve("address.postcode_by_state." + stateAbbr, this, faker);
+    }
+
+    public String countyByZipCode(String postCode) {
+        return faker.fakeValuesService().resolve("address.county_by_postcode." + postCode, this, faker);
+    }
 
     public String streetSuffix() {
         return faker.fakeValuesService().resolve("address.street_suffix", this, faker);

src/main/java/com/github/javafaker/Animal.java

@@ -0,0 +1,13 @@
+package com.github.javafaker;
+
+public class Animal {
+    private final Faker faker;
+
+    protected Animal(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String name() {
+        return faker.fakeValuesService().resolve("creature.animal.name", this, faker);
+    }
+}

src/main/java/com/github/javafaker/Aviation.java

@@ -0,0 +1,36 @@
+package com.github.javafaker;
+
+/**
+ * Generates aviation related strings.
+ */
+public class Aviation {
+
+    private final Faker faker;
+
+    protected Aviation(Faker faker) {
+        this.faker = faker;
+    }
+
+    /**
+     * @return some aircraft name/model/make e.g. "An-2".
+     */
+    public String aircraft() {
+        return faker.fakeValuesService().fetchString("aviation.aircraft");
+    }
+
+    /**
+     * Returns an airport ICAO code.
+     * See also: https://en.wikipedia.org/wiki/List_of_airports_by_ICAO_code:_A
+     */
+    public String airport() {
+        return faker.fakeValuesService().fetchString("aviation.airport");
+    }
+
+    /**
+     * Provides a METAR weather report.
+     * Have a look at https://en.wikipedia.org/wiki/METAR
+     */
+    public String METAR() {
+        return faker.fakeValuesService().fetchString("aviation.metar");
+    }
+}

src/main/java/com/github/javafaker/BackToTheFuture.java

@@ -0,0 +1,21 @@
+package com.github.javafaker;
+
+public class BackToTheFuture {
+    private final Faker faker;
+
+    protected BackToTheFuture(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String character() {
+        return faker.resolve("back_to_the_future.characters");
+    }
+
+    public String date() {
+        return faker.resolve("back_to_the_future.dates");
+    }
+
+    public String quote() {
+        return faker.resolve("back_to_the_future.quotes");
+    }
+}

src/main/java/com/github/javafaker/Buffy.java

@@ -0,0 +1,30 @@
+package com.github.javafaker;
+
+public class Buffy {
+    private final Faker faker;
+
+    protected Buffy(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String characters() {
+        return faker.fakeValuesService().resolve("buffy.characters", this, faker);
+    }
+
+    public String quotes() {
+        return faker.fakeValuesService().resolve("buffy.quotes", this, faker);
+    }
+
+    public String celebrities() {
+        return faker.fakeValuesService().resolve("buffy.celebrities", this, faker);
+    }
+
+    public String bigBads() {
+        return faker.fakeValuesService().resolve("buffy.big_bads", this, faker);
+    }
+
+    public String episodes() {
+        return faker.fakeValuesService().resolve("buffy.episodes", this, faker);
+    }
+
+}

src/main/java/com/github/javafaker/Color.java

@@ -10,4 +10,15 @@ public class Color {
     public String name() {
         return faker.fakeValuesService().resolve("color.name", this, faker);
     }
+
+    public String hex() {
+        return hex(true);
+    }
+
+    public String hex(boolean includeHashSign) {
+        String hexString = faker.random().hex(6);
+        if(includeHashSign)
+            return "#" + hexString;
+        return hexString;
+    }
 }

src/main/java/com/github/javafaker/Company.java

@@ -69,13 +69,13 @@ public class Company {
     }
 
     public String url() {
-        return join(new Object[]{
+        return join(
                 "www",
                 ".",
                 FakerIDN.toASCII(domainName()),
                 ".",
                 domainSuffix()
-        });
+        );
     }
 
     private String domainName(){

src/main/java/com/github/javafaker/Country.java

@@ -0,0 +1,40 @@
+package com.github.javafaker;
+
+public class Country {
+    private final Faker faker;
+    private final String flagUrl;
+
+    protected Country(Faker faker) {
+        this.faker = faker;
+        this.flagUrl = "http://flags.fmcdn.net/data/flags/w580/";
+    }
+
+    public String flag() {
+        return flagUrl + faker.fakeValuesService().resolve("country.code2", this, faker) + ".png";
+    }
+
+    public String countryCode2() {
+        return faker.fakeValuesService().resolve("country.code2", this, faker);
+    }
+
+    public String countryCode3() {
+        return faker.fakeValuesService().resolve("country.code3", this, faker);
+    }
+
+    public String capital() {
+        return faker.fakeValuesService().resolve("country.capital", this, faker);
+    }
+
+    public String currency() {
+        return faker.fakeValuesService().resolve("country.currency", this, faker);
+    }
+
+    public String currencyCode() {
+        return faker.fakeValuesService().resolve("country.currency_code", this, faker);
+    }
+
+    public String name() {
+        return faker.fakeValuesService().resolve("country.name", this, faker);
+    }
+
+}

src/main/java/com/github/javafaker/Dune.java

@@ -0,0 +1,80 @@
+package com.github.javafaker;
+
+public class Dune {
+
+    private final Faker faker;
+
+    protected Dune(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String character() {
+        return faker.fakeValuesService().resolve("dune.characters", this, faker);
+    }
+
+    public String title() {
+        return faker.fakeValuesService().resolve("dune.titles", this, faker);
+    }
+
+    public String planet() {
+        return faker.fakeValuesService().resolve("dune.planets", this, faker);
+    }
+
+    public String quote() {
+        return quote(faker.options().option(Dune.Quote.class));
+    }
+
+    public String quote(Quote quote) {
+        return faker.fakeValuesService().resolve("dune.quotes." + quote.yamlKey, this, faker);
+    }
+
+    public String saying() {
+        return saying(faker.options().option(Dune.Saying.class));
+    }
+
+    public String saying(Saying saying) {
+        return faker.fakeValuesService().resolve("dune.sayings." + saying.yamlKey, this, faker);
+    }
+
+    public enum Quote {
+        GUILD_NAIVGATOR("guild_navigator"),
+        EMPEROR("emperor"),
+        PAUL("paul"),
+        THUFIR("thufir"),
+        JESSICA("jessica"),
+        IRULAN("irulan"),
+        MOHIAM("mohiam"),
+        GURNEY("gurney"),
+        LETO("leto"),
+        STILGAR("stilgar"),
+        LIET_KYNES("liet_kynes"),
+        PARDOT_KYNES("pardot_kynes"),
+        BARON_HARKONNEN("baron_harkonnen"),
+        PITER("piter"),
+        ALIA("alia"),
+        MAPES("mapes"),
+        DUNCAN("duncan"),
+        YUEH("yueh");
+
+        private final String yamlKey;
+
+        Quote(String yamlKey) {
+            this.yamlKey = yamlKey;
+        }
+    }
+
+    public enum Saying {
+        BENE_GESSERIT("bene_gesserit"),
+        FREMEN("fremen"),
+        MENTAT("mentat"),
+        MUADDIB("muaddib"),
+        ORANGE_CATHOLIC_BIBLE("orange_catholic_bible");
+
+        private final String yamlKey;
+
+        Saying(String yamlKey) {
+            this.yamlKey = yamlKey;
+        }
+    }
+
+}

src/main/java/com/github/javafaker/ElderScrolls.java

@@ -0,0 +1,41 @@
+package com.github.javafaker;
+
+public class ElderScrolls {
+
+    private final Faker faker;
+
+    protected ElderScrolls(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String race() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.race", this, faker);
+    }
+
+    public String creature() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.creature", this, faker);
+    }
+
+    public String region() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.region", this, faker);
+    }
+
+    public String dragon() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.dragon", this, faker);
+    }
+
+    public String city() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.city", this, faker);
+    }
+
+    public String firstName() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.first_name", this, faker);
+    }
+
+    public String lastName() {
+        return faker.fakeValuesService().resolve("games.elder_scrolls.last_name", this, faker);
+    }
+
+    public String quote() {return faker.fakeValuesService().resolve("games.elder_scrolls.quote", this, faker);
+    }
+}

src/main/java/com/github/javafaker/Faker.java

@@ -20,6 +20,7 @@ public class Faker {
     private final App app;
     private final Artist artist;
     private final Avatar avatar;
+    private final Aviation aviation;
     private final Lorem lorem;
     private final Music music;
     private final Name name;
@@ -33,6 +34,7 @@ public class Faker {
     private final ChuckNorris chuckNorris;
     private final Color color;
     private final Commerce commerce;
+    private final Country country;
     private final Currency currency;
     private final Company company;
     private final Crypto crypto;
@@ -47,6 +49,7 @@ public class Faker {
     private final Demographic demographic;
     private final Dog dog;
     private final Educator educator;
+    private final ElderScrolls elderScrolls;
     private final Shakespeare shakespeare;
     private final SlackEmoji slackEmoji;
     private final Space space;
@@ -83,6 +86,13 @@ public class Faker {
     private final Weather weather;
     private final Lebowski lebowski;
     private final Medical medical;
+    private final Animal animal;
+    private final BackToTheFuture backToTheFuture;
+    private final PrincessBride princessBride;
+    private final Buffy buffy;
+    private final Relationships relationships;
+    private final Nation nation;
+    private final Dune dune;
 
     public Faker() {
         this(Locale.ENGLISH);
@@ -104,6 +114,7 @@ public class Faker {
         this.app = new App(this);
         this.artist = new Artist(this);
         this.avatar = new Avatar(this);
+        this.aviation = new Aviation(this);
         this.lorem = new Lorem(this);
         this.music = new Music(this);
         this.name = new Name(this);
@@ -120,6 +131,7 @@ public class Faker {
         this.hacker = new Hacker(this);
         this.company = new Company(this);
         this.crypto = new Crypto(this);
+        this.elderScrolls = new ElderScrolls(this);
         this.commerce = new Commerce(this);
         this.currency = new Currency(this);
         this.options = new Options(this);
@@ -167,6 +179,14 @@ public class Faker {
         this.weather = new Weather(this);
         this.lebowski = new Lebowski(this);
         this.medical = new Medical(this);
+        this.country = new Country(this);
+        this.animal = new Animal(this);
+        this.backToTheFuture = new BackToTheFuture(this);
+        this.princessBride = new PrincessBride(this);
+        this.buffy = new Buffy(this);
+        this.relationships = new Relationships(this);
+        this.nation = new Nation(this);
+        this.dune = new Dune(this);
     }
 
     /**
@@ -307,6 +327,10 @@ public class Faker {
         return avatar;
     }
 
+    public Aviation aviation() {
+        return aviation;
+    }
+
     public Music music() {
         return music;
     }
@@ -343,6 +367,10 @@ public class Faker {
         return book;
     }
 
+    public Buffy buffy() {
+        return buffy;
+    }
+
     public Business business() {
         return business;
     }
@@ -395,6 +423,10 @@ public class Faker {
         return food;
     }
 
+    public ElderScrolls elderScrolls() {
+        return elderScrolls;
+    }
+
     public GameOfThrones gameOfThrones() {
         return gameOfThrones;
     }
@@ -553,6 +585,30 @@ public class Faker {
 
     public Medical medical(){return medical;}
 
+    public Country country(){ return country;}
+
+    public Animal animal(){ return animal; }
+
+    public BackToTheFuture backToTheFuture() {
+        return  backToTheFuture;
+    }
+
+    public PrincessBride princessBride() {
+        return princessBride;
+    }
+
+    public Relationships relationships() {
+        return relationships;
+    }
+
+    public Nation nation() {
+        return nation;
+    }
+
+    public Dune dune() {
+        return dune;
+    }
+    
     public String resolve(String key) {
         return this.fakeValuesService.resolve(key, this, this);
     }

src/main/java/com/github/javafaker/File.java

@@ -24,6 +24,6 @@ public class File {
         final String dir = dirOrNull == null ? faker.internet().slug() : dirOrNull;
         final String name = nameOrNull == null ? faker.lorem().word().toLowerCase() : nameOrNull;
         final String ext = extensionOrNull == null ? extension() : extensionOrNull;
-        return new StringBuilder(dir).append(sep).append(name).append(".").append(ext).toString();
+        return dir + sep + name + "." + ext;
     }
 }

src/main/java/com/github/javafaker/Food.java

@@ -16,6 +16,22 @@ public class Food {
         return faker.fakeValuesService().resolve("food.spices", this, faker);
     }
 
+    public String dish() {
+        return faker.fakeValuesService().resolve("food.dish", this, faker);
+    }
+
+    public String fruit() {
+        return faker.fakeValuesService().resolve("food.fruits", this, faker);
+    }
+
+    public String vegetable() {
+        return faker.fakeValuesService().resolve("food.vegetables", this, faker);
+    }
+
+    public String sushi() {
+        return faker.fakeValuesService().resolve("food.sushi", this, faker);
+    }
+
     public String measurement() {
         return faker.fakeValuesService().resolve("food.measurement_sizes", this, faker) +
             " " + faker.fakeValuesService().resolve("food.measurements", this, faker);

src/main/java/com/github/javafaker/Internet.java

@@ -51,7 +51,7 @@ public class Internet {
     }
 
     public String url() {
-        return join(new Object[]{
+        return join(
                 "www",
                 ".",
                 FakerIDN.toASCII(
@@ -61,7 +61,7 @@ public class Internet {
                 ),
                 ".",
                 domainSuffix()
-        });
+        );
     }
 
     /**
@@ -110,6 +110,10 @@ public class Internet {
         return password(8, 16);
     }
 
+    public String password(boolean includeDigit) {
+        return password(8, 16, false, false, includeDigit);
+    }
+
     public String password(int minimumLength, int maximumLength) {
         return password(minimumLength, maximumLength, false);
     }
@@ -119,15 +123,19 @@ public class Internet {
     }
 
     public String password(int minimumLength, int maximumLength, boolean includeUppercase, boolean includeSpecial) {
+        return password(minimumLength, maximumLength, includeUppercase, includeSpecial, true);
+    }
+
+    public String password(int minimumLength, int maximumLength, boolean includeUppercase, boolean includeSpecial, boolean includeDigit) {
         if (includeSpecial) {
-            char[] password = faker.lorem().characters(minimumLength, maximumLength, includeUppercase).toCharArray();
+            char[] password = faker.lorem().characters(minimumLength, maximumLength, includeUppercase, includeDigit).toCharArray();
             char[] special = new char[]{'!', '@', '#', '$', '%', '^', '&', '*'};
             for (int i = 0; i < faker.random().nextInt(minimumLength); i++) {
                 password[faker.random().nextInt(password.length)] = special[faker.random().nextInt(special.length)];
             }
             return new String(password);
         } else {
-            return faker.lorem().characters(minimumLength, maximumLength, includeUppercase);
+            return faker.lorem().characters(minimumLength, maximumLength, includeUppercase, includeDigit);
         }
     }
     
@@ -297,4 +305,47 @@ public class Internet {
     private <T> T random(T[] src) {
         return src[faker.random().nextInt(src.length)];
     }
+
+    public String userAgent(UserAgent userAgent) {
+        UserAgent agent = userAgent;
+
+        if(agent == null) {
+            agent = UserAgent.any();
+        }
+
+        String userAgentKey = "internet.user_agent." + agent.toString();
+        return faker.fakeValuesService().resolve(userAgentKey, this, faker);
+    }
+
+    public String userAgentAny() {
+        return userAgent(null);
+    }
+
+    public enum UserAgent {
+        AOL("aol"),
+        CHROME("chrome"),
+        FIREFOX("firefox"),
+        INTERNET_EXPLORER("internet_explorer"),
+        NETSCAPE("netscape"),
+        OPERA("opera"),
+        SAFARI("safari");
+
+        //Browser's name in corresponding yaml (internet.yml) file.
+        private String browserName;
+
+        UserAgent(String browserName) {
+            this.browserName = browserName;
+        }
+
+        private static UserAgent any() {
+            UserAgent[] agents = UserAgent.values();
+            int randomIndex = (int)(Math.random() * agents.length);
+            return agents[randomIndex];
+        }
+
+        @Override
+        public String toString() {
+            return browserName;
+        }
+    }
 }

src/main/java/com/github/javafaker/Lorem.java

@@ -20,7 +20,7 @@ public class Lorem {
     }
 
     public char character(boolean includeUppercase) {
-        return characters(1).charAt(0);
+        return characters(1, includeUppercase).charAt(0);
     }
 
     public String characters() {
@@ -28,7 +28,7 @@ public class Lorem {
     }
 
     public String characters(boolean includeUppercase) {
-        return characters(255, false);
+        return characters(255, includeUppercase);
     }
 
     public String characters(int minimumLength, int maximumLength) {
@@ -39,17 +39,32 @@ public class Lorem {
         return characters(faker.random().nextInt(maximumLength - minimumLength) + minimumLength, includeUppercase);
     }
 
+    public String characters(int minimumLength, int maximumLength, boolean includeUppercase, boolean includeDigit) {
+        return characters(faker.random().nextInt(maximumLength - minimumLength) + minimumLength, includeUppercase, includeDigit);
+    }
+
     public String characters(int fixedNumberOfCharacters) {
         return characters(fixedNumberOfCharacters, false);
     }
 
     public String characters(int fixedNumberOfCharacters, boolean includeUppercase) {
+        return characters(fixedNumberOfCharacters, includeUppercase, true);
+    }
+
+    public String characters(int fixedNumberOfCharacters, boolean includeUppercase, boolean includeDigit) {
         if (fixedNumberOfCharacters < 1) {
             return "";
         }
         char[] buffer = new char[fixedNumberOfCharacters];
         for (int i = 0; i < buffer.length; i++) {
-            char randomCharacter = characters[faker.random().nextInt(characters.length)];
+            char randomCharacter;
+
+            if (includeDigit) {
+                randomCharacter = characters[faker.random().nextInt(characters.length)];
+            } else {
+                randomCharacter = letters[faker.random().nextInt(letters.length)];
+            }
+
             if (includeUppercase && faker.bool().bool()) {
                 randomCharacter = Character.toUpperCase(randomCharacter);
             }
@@ -145,15 +160,17 @@ public class Lorem {
 
     static {
         StringBuilder builder = new StringBuilder(36);
-        for (char number = '0'; number <= '9'; number++) {
-            builder.append(number);
-        }
         for (char character = 'a'; character <= 'z'; character++) {
             builder.append(character);
         }
+        letters = builder.toString().toCharArray();
+        for (char number = '0'; number <= '9'; number++) {
+            builder.append(number);
+        }
         characters = builder.toString().toCharArray();
     }
 
+    private static final char[] letters;
     private static final char[] characters;
 
 }

src/main/java/com/github/javafaker/Name.java

@@ -121,12 +121,20 @@ public class Name {
      */
     public String username() {
 
-        String username = StringUtils.join(new String[]{
+        String username = StringUtils.join(
                 firstName().replaceAll("'", "").toLowerCase(),
                 ".",
-                lastName().replaceAll("'", "").toLowerCase()}
+                lastName().replaceAll("'", "").toLowerCase()
         );
 
         return StringUtils.deleteWhitespace(username);
     }
+    
+    /**
+     * <p>Returns a blood group such as O−, O+, A-, A+, B-, B+, AB-, AB+</p>
+     * @return a blood group such as O−, O+, A-, A+, B-, B+, AB-, AB+
+     */
+    public String bloodGroup() {
+        return faker.fakeValuesService().resolve("name.blood_group", this, faker);
+    }
 }

src/main/java/com/github/javafaker/Nation.java

@@ -0,0 +1,43 @@
+package com.github.javafaker;
+
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.charset.Charset;
+import java.util.List;
+
+public class Nation {
+
+    private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
+
+    private final Faker faker;
+
+    protected Nation(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String nationality() {
+        return faker.fakeValuesService().resolve("nation.nationality", this, faker);
+    }
+
+    public String language() {
+        return faker.fakeValuesService().resolve("nation.language", this, faker);
+    }
+
+    public String capitalCity() {
+        return faker.fakeValuesService().resolve("nation.capital_city", this, faker);
+    }
+
+    public String flag() {
+        @SuppressWarnings("unchecked")
+        List<Integer> flagInts = (List<Integer>) faker.fakeValuesService().fetch("nation.flag");
+
+        ByteBuffer byteBuffer = MappedByteBuffer.allocate(flagInts.size());
+
+        for (Integer flagInt : flagInts) {
+            byteBuffer.put(flagInt.byteValue());
+        }
+
+        return new String(byteBuffer.array(), UTF8_CHARSET);
+    }
+
+}

src/main/java/com/github/javafaker/Number.java

@@ -27,7 +27,10 @@ public class Number {
      * @see Number#numberBetween(long, long) 
      */
     public int numberBetween(int min, int max) {
-        return decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
+        if (min == max) return min;
+
+        int value = decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
+        return value == max ? value - 1 : value;
     }
 
     /**
@@ -39,7 +42,10 @@ public class Number {
      * @param max exclusive (unless min == max)
      */
     public long numberBetween(long min, long max) {
-        return decimalBetween(min,max).longValue();
+        if (min == max) return min;
+
+        long value = decimalBetween(min, max).setScale(0, BigDecimal.ROUND_HALF_DOWN).longValue();
+        return value == max ? value - 1 : value;
     }
     
     /**

src/main/java/com/github/javafaker/PhoneNumber.java

@@ -14,4 +14,20 @@ public class PhoneNumber {
     public String phoneNumber() {
         return faker.numerify(faker.fakeValuesService().resolve("phone_number.formats", this, faker));
     }
+
+    public String extension() {
+        return subscriberNumber();
+    }
+
+    public String subscriberNumber(int length) {
+        StringBuilder subscriberNumber = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            subscriberNumber.append("#");
+        }
+        return faker.numerify(subscriberNumber.toString());
+    }
+
+    public String subscriberNumber() {
+        return subscriberNumber(4);
+    }
 }

src/main/java/com/github/javafaker/PrincessBride.java

@@ -0,0 +1,17 @@
+package com.github.javafaker;
+
+public class PrincessBride {
+    private final Faker faker;
+
+    protected PrincessBride(Faker faker) {
+        this.faker = faker;
+    }
+
+    public String character() {
+        return faker.resolve("princess_bride.characters");
+    }
+
+    public String quote() {
+        return faker.resolve("princess_bride.quotes");
+    }
+}

src/main/java/com/github/javafaker/Relationships.java

@@ -0,0 +1,60 @@
+package com.github.javafaker;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.commons.lang3.ArrayUtils;
+
+public class Relationships {
+    private final Faker faker;
+
+    protected Relationships(final Faker faker) {
+        this.faker = faker;
+    }
+
+    public String direct() {
+        return faker.resolve("relationship.familial.direct");
+    }
+    
+    public String extended() {
+        return faker.resolve("relationship.familial.extended");
+    }
+    
+    public String inLaw() {
+        return faker.resolve("relationship.in_law");
+    }
+
+    public String spouse() {
+        return faker.resolve("relationship.spouse");
+    }
+    
+    public String parent() {
+        return faker.resolve("relationship.parent");
+    }
+    
+    public String sibling() {
+        return faker.resolve("relationship.sibling");
+    }
+    
+    public String any() {
+        Method currentMethod = getClass().getEnclosingMethod();
+
+        try {
+            Method[] methods = Relationships.class.getDeclaredMethods();
+            methods = ArrayUtils.removeElement(methods, currentMethod);
+            int indx = faker.random().nextInt(methods.length);
+            Method runMethod = methods[indx];
+            Relationships relationships = new Relationships(faker);
+            return (String)runMethod.invoke(relationships);
+        } catch (SecurityException e) {
+            throw new RuntimeException("SecurityException: " + e.getMessage());
+        } catch (IllegalArgumentException e) {
+            throw new RuntimeException("IllegalArgumentException: " + e.getMessage());
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException("IllegalAccessException: " + e.getMessage());
+        } catch (InvocationTargetException e) {
+            throw new RuntimeException("InvocationTargetException: " + e.getMessage());
+        }
+    }
+    
+}

src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java

@@ -14,8 +14,8 @@ public class EnIdNumber {
         String ssn = f.regexify("[0-8]\\d{2}-\\d{2}-\\d{4}");
 
         boolean isValid = true;
-        for (int i = 0; i < invalidSSNPatterns.length; i++) {
-            if (ssn.matches(invalidSSNPatterns[i])) {
+        for (String invalidSSNPattern : invalidSSNPatterns) {
+            if (ssn.matches(invalidSSNPattern)) {
                 isValid = false;
                 break;
             }

src/main/java/com/github/javafaker/service/FakeValues.java

@@ -0,0 +1,92 @@
+package com.github.javafaker.service;
+
+import org.yaml.snakeyaml.Yaml;
+
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public class FakeValues implements FakeValuesInterface {
+    private final Locale locale;
+    private final String filename;
+    private final String path;
+    private Map values;
+
+    FakeValues(Locale locale) {
+        this(locale, getFilename(locale), getFilename(locale));
+    }
+
+    private static String getFilename(Locale locale) {
+        final StringBuilder filename = new StringBuilder(language(locale));
+        if (!"".equals(locale.getCountry())) {
+            filename.append("-").append(locale.getCountry());
+        }
+        return filename.toString();
+    }
+
+    /**
+     * If you new up a locale with "he", it gets converted to "iw" which is old.
+     * This addresses that unfortunate condition.
+     */
+    private static String language(Locale l) {
+        if (l.getLanguage().equals("iw")) {
+            return "he";
+        }
+        return l.getLanguage();
+    }
+
+    FakeValues(Locale locale, String filename, String path) {
+        this.locale = locale;
+        this.filename = filename;
+        this.path = path;
+    }
+
+    @Override
+    public Map get(String key) {
+        if (values == null) {
+            values = loadValues();
+        }
+
+        return values == null ? null : (Map) values.get(key);
+    }
+
+    private Map loadValues() {
+        String pathWithLocaleAndFilename = "/" + locale.getLanguage() + "/" + this.filename;
+        String pathWithFilename = "/" + filename + ".yml";
+        String pathWithLocale = "/" + locale.getLanguage() + ".yml";
+
+        List<String> paths = Arrays.asList(pathWithLocaleAndFilename, pathWithFilename, pathWithLocale);
+        InputStream stream = null;
+        for (String path : paths) {
+            stream = findStream(path);
+            if (stream != null) {
+                break;
+            }
+        }
+
+        if (stream == null) {
+            return null;
+        }
+
+        final Map valuesMap = new Yaml().loadAs(stream, Map.class);
+        Map localeBased = (Map) valuesMap.get(locale.getLanguage());
+        if (localeBased == null) {
+            localeBased = (Map) valuesMap.get(filename);
+        }
+        return (Map) localeBased.get("faker");
+    }
+
+    private InputStream findStream(String filename) {
+        InputStream streamOnClass = getClass().getResourceAsStream(filename);
+        if (streamOnClass != null) {
+            return streamOnClass;
+        }
+        return getClass().getClassLoader().getResourceAsStream(filename);
+    }
+
+    boolean supportsPath(String path) {
+        return this.path.equals(path);
+    }
+}

src/main/java/com/github/javafaker/service/FakeValuesGrouping.java

@@ -0,0 +1,31 @@
+package com.github.javafaker.service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class FakeValuesGrouping implements FakeValuesInterface {
+
+    private List<FakeValues> fakeValuesList = new ArrayList<FakeValues>();
+
+    public void add(FakeValues fakeValues) {
+        fakeValuesList.add(fakeValues);
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public Map get(String key) {
+        Map result = null;
+        for (FakeValues fakeValues : fakeValuesList) {
+            if (fakeValues.supportsPath(key)) {
+                if (result != null) {
+                    final Map newResult = fakeValues.get(key);
+                    result.putAll(newResult);
+                } else {
+                    result = fakeValues.get(key);
+                }
+            }
+        }
+        return result;
+    }
+}

src/main/java/com/github/javafaker/service/FakeValuesInterface.java

@@ -0,0 +1,7 @@
+package com.github.javafaker.service;
+
+import java.util.Map;
+
+public interface FakeValuesInterface {
+    Map get(String key);
+}

src/main/java/com/github/javafaker/service/FakeValuesService.java

@@ -3,49 +3,50 @@ package com.github.javafaker.service;
 import com.github.javafaker.Address;
 import com.github.javafaker.Faker;
 import com.github.javafaker.Name;
+import com.github.javafaker.service.files.EnFile;
 import com.mifmif.common.regex.Generex;
 import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.yaml.snakeyaml.Yaml;
 
-import java.io.File;
-import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class FakeValuesService {
-    private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?(?:'([^']+)')?(?:,'([^']+)')*\\}");
+    private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?(?:'([^']+)')?(?:,'([^']+)')*}");
 
     private final Logger log = Logger.getLogger("faker");
-    
-    private final List<Map<String, Object>> fakeValuesMaps;
-    
+
+    private final List<FakeValuesInterface> fakeValuesList;
     private final RandomService randomService;
 
     /**
      * <p>
-     *     Resolves YAML file using the most specific path first based on language and country code.
-     *      'en_US' would resolve in the following order:
-     *      <ol>
-     *          <li>/en-US.yml</li>
-     *          <li>/en.yml</li>
-     *      </ol>
-     *      The search is case-insensitive, so the following will all resolve correctly.  Also, either a hyphen or
-     *      an underscore can be used when constructing a {@link Locale} instance.  This is legacy behavior and not
-     *      condoned, but it will work.
-     *      <ul>
-     *          <li>EN_US</li>
-     *          <li>En-Us</li>
-     *          <li>eN_uS</li>
-     *      </ul>
+     * Resolves YAML file using the most specific path first based on language and country code.
+     * 'en_US' would resolve in the following order:
+     * <ol>
+     * <li>/en-US.yml</li>
+     * <li>/en.yml</li>
+     * </ol>
+     * The search is case-insensitive, so the following will all resolve correctly.  Also, either a hyphen or
+     * an underscore can be used when constructing a {@link Locale} instance.  This is legacy behavior and not
+     * condoned, but it will work.
+     * <ul>
+     * <li>EN_US</li>
+     * <li>En-Us</li>
+     * <li>eN_uS</li>
+     * </ul>
      * </p>
+     *
      * @param locale
      * @param randomService
      */
@@ -58,80 +59,29 @@ public class FakeValuesService {
         locale = normalizeLocale(locale);
 
         final List<Locale> locales = localeChain(locale);
-        final List<Map<String,Object>> all = new ArrayList(locales.size());
-        final Set<Locale> loadedLocales = new HashSet<Locale>();
+        final List<FakeValuesInterface> all = new ArrayList(locales.size());
 
         for (final Locale l : locales) {
-            final StringBuilder filename = new StringBuilder(language(l));
-            if (!"".equals(l.getCountry())) {
-                filename.append("-").append(l.getCountry());
-            }
-
-
-            // list the files on the classpath... so if we pass in "en"
-            // it will look for a folder "en" and list all the files underneath it
-            File[] files = listFilesInDirectoryOnClasspath(filename.toString());
-            for (File resourceFolderFile : files) {
-                String fileToLoad = filename + "/"  + resourceFolderFile.getName();
-                final InputStream stream = getClass().getClassLoader().getResourceAsStream(fileToLoad);
-                if (stream != null) {
-                    Map map = fakerFromStream(stream, filename.toString());
-                    all.add(map);
-                    loadedLocales.add(l);
+            boolean isEnglish = l.equals(Locale.ENGLISH);
+            if (isEnglish) {
+                FakeValuesGrouping fakeValuesGrouping = new FakeValuesGrouping();
+                for (EnFile file : EnFile.getFiles()) {
+                    fakeValuesGrouping.add(new FakeValues(l, file.getFile(), file.getPath()));
                 }
-            }
-
-            final InputStream stream = findStream(filename.toString());
-            if (stream != null) {
-                all.add(fakerFromStream(stream, filename.toString()));
-                loadedLocales.add(l);
+                all.add(fakeValuesGrouping);
+            } else {
+                all.add(new FakeValues(locale));
             }
         }
 
-        if (loadedLocales.size() == 1 && loadedLocales.contains(Locale.ENGLISH) && !locale.equals(Locale.ENGLISH)) {
-            // if we have only successfully loaded ENGLISH and the requested locale
-            // wasn't english that means we were unable to load the requested locale
-            // in that case we vomit.
-            // If someone requests FRANCE ("fr","FR") and we can't load fr_FR but we
-            // load "fr", then that's ok. we picked up a variant. only if we ONLY pick up
-            // the default do we throw that exception.
-            throw new LocaleDoesNotExistException(locale.toString() + " does not exist");
-        }
-
-        this.fakeValuesMaps = Collections.unmodifiableList(all);
-    }
-
-    private File[] listFilesInDirectoryOnClasspath(String dir) {
-        ClassLoader loader = getClass().getClassLoader();
-        URL url = loader.getResource(dir);
-        return (url != null) ? new File(url.getPath()).listFiles() : new File[0];
-    }
-
-    /**
-     * If you new up a locale with "he", it gets converted to "iw" which is old.
-     * This addresses that unfortunate condition.
-     */
-    private String language(Locale l) {
-        if (l.getLanguage().equals("iw")) {
-            return "he";
-        }
-        return l.getLanguage();
-    }
-
-    /**
-     * @return the embedded faker: clause from the loaded Yml by the localeName, so .yml > en-us: > faker: 
-     */
-    protected Map fakerFromStream(InputStream stream, String localeName) {
-        final Map valuesMap = new Yaml().loadAs(stream, Map.class);
-        final Map localeBased = (Map) valuesMap.get(localeName);
-        return (Map) localeBased.get("faker");
+        this.fakeValuesList = Collections.unmodifiableList(all);
     }
 
     /**
      * Convert the specified locale into a chain of locales used for message resolution. For example:
-     * 
-     * {@link Locale#FRANCE} (fr_FR) -> [ fr_FR, fr, en ]
-     * 
+     * <p>
+     * {@link Locale#FRANCE} (fr_FR) -> [ fr_FR, anotherTest, en ]
+     *
      * @return a list of {@link Locale} instances
      */
     protected List<Locale> localeChain(Locale from) {
@@ -149,31 +99,22 @@ public class FakeValuesService {
         chain.add(Locale.ENGLISH); // default
         return chain;
     }
-   
+
     /**
      * @return a proper {@link Locale} instance with language and country code set regardless of how
-     *         it was instantiated.  new Locale("pt-br") will be normalized to a locale constructed
-     *         with new Locale("pt","BR").
+     * it was instantiated.  new Locale("pt-br") will be normalized to a locale constructed
+     * with new Locale("pt","BR").
      */
     private Locale normalizeLocale(Locale locale) {
-        final String[] parts = locale.toString().split("[-\\_]");
-        
+        final String[] parts = locale.toString().split("[-_]");
+
         if (parts.length == 1) {
             return new Locale(parts[0]);
         } else {
-            return new Locale(parts[0],parts[1]);
+            return new Locale(parts[0], parts[1]);
         }
     }
 
-    private InputStream findStream(String filename) {
-        String filenameWithExtension =  "/" + filename + ".yml";
-        InputStream streamOnClass = getClass().getResourceAsStream(filenameWithExtension);
-        if (streamOnClass != null) {
-            return streamOnClass;
-        }
-        return getClass().getClassLoader().getResourceAsStream(filenameWithExtension);
-    }
-
     /**
      * Fetch a random value from an array item specified by the key
      *
@@ -240,10 +181,15 @@ public class FakeValuesService {
         String[] path = key.split("\\.");
 
         Object result = null;
-        for (Map<String, Object> fakeValuesMap : fakeValuesMaps) {
-            Object currentValue = fakeValuesMap;
+        for (FakeValuesInterface fakeValuesInterface : fakeValuesList) {
+            Object currentValue = fakeValuesInterface;
             for (int p = 0; currentValue != null && p < path.length; p++) {
-                currentValue = ((Map<String, Object>) currentValue).get(path[p]);
+                String currentPath = path[p];
+                if (currentValue instanceof Map) {
+                    currentValue = ((Map) currentValue).get(currentPath);
+                } else  {
+                    currentValue = ((FakeValuesInterface) currentValue).get(currentPath);
+                }
             }
             result = currentValue;
             if (result != null) {
@@ -286,7 +232,7 @@ public class FakeValuesService {
     }
 
     /**
-     * Applies both a {@link #numerify(String)} and a {@link #letterify(String,boolean)}
+     * Applies both a {@link #numerify(String)} and a {@link #letterify(String, boolean)}
      * over the incoming string.
      *
      * @param string
@@ -326,7 +272,7 @@ public class FakeValuesService {
      * For example, the string "12??34" could be replaced with a string like "12AB34".
      *
      * @param letterString
-     * @param isUpper specifies whether or not letters should be upper case
+     * @param isUpper      specifies whether or not letters should be upper case
      * @return
      */
     public String letterify(String letterString, boolean isUpper) {
@@ -348,14 +294,14 @@ public class FakeValuesService {
 
     /**
      * Resolves a key to a method on an object.
-     *
+     * <p>
      * #{hello} with result in a method call to current.hello();
-     *
+     * <p>
      * #{Person.hello_someone} will result in a method call to person.helloSomeone();
-     *
      */
     public String resolve(String key, Object current, Faker root) {
         final String expression = safeFetch(key, null);
+
         if (expression == null) {
             throw new RuntimeException(key + " resulted in null expression");
         }
@@ -365,6 +311,7 @@ public class FakeValuesService {
 
     /**
      * resolves an expression using the current faker.
+     *
      * @param expression
      * @param faker
      * @return
@@ -372,22 +319,23 @@ public class FakeValuesService {
     public String expression(String expression, Faker faker) {
         return resolveExpression(expression, null, faker);
     }
+
     /**
      * <p>processes a expression in the style #{X.y} using the current objects as the 'current' location
      * within the yml file (or the {@link Faker} object hierarchy as it were).
      * </p>
      * <p>
-     *     #{Address.streetName} would get resolved to {@link Faker#address()}'s {@link Address#streetName()}
+     * #{Address.streetName} would get resolved to {@link Faker#address()}'s {@link Address#streetName()}
      * </p>
      * <p>
-     *     #{address.street} would get resolved to the YAML > locale: faker: address: street:
+     * #{address.street} would get resolved to the YAML > locale: faker: address: street:
      * </p>
      * <p>
-     *     Combinations are supported as well: "#{x} #{y}"
+     * Combinations are supported as well: "#{x} #{y}"
      * </p>
      * <p>
-     *     Recursive templates are supported.  if "#{x}" resolves to "#{Address.streetName}" then "#{x}" resolves to
-     *     {@link Faker#address()}'s {@link Address#streetName()}.
+     * Recursive templates are supported.  if "#{x}" resolves to "#{Address.streetName}" then "#{x}" resolves to
+     * {@link Faker#address()}'s {@link Address#streetName()}.
      * </p>
      */
     protected String resolveExpression(String expression, Object current, Faker root) {
@@ -398,10 +346,10 @@ public class FakeValuesService {
             final String escapedDirective = matcher.group(0);
             final String directive = matcher.group(1);
             List<String> args = new ArrayList<String>();
-            for (int i=2;i < matcher.groupCount()+1 && matcher.group(i) != null;i++) {
+            for (int i = 2; i < matcher.groupCount() + 1 && matcher.group(i) != null; i++) {
                 args.add(matcher.group(i));
             }
-            
+
             // resolve the expression and reprocess it to handle recursive templates
             String resolved = resolveExpression(directive, args, current, root);
             if (resolved == null) {
@@ -417,20 +365,21 @@ public class FakeValuesService {
     /**
      * <h1>Search Order</h1>
      * <ul>
-     *     <li>Search for methods on the current object</li>
-     *     <li>local keys in Yaml File</li>
-     *     <li>Search for methods on faker child objects</li>
-     *     <li>Search for keys in yaml file by transforming object reference to yaml reference</li>
+     * <li>Search for methods on the current object</li>
+     * <li>local keys in Yaml File</li>
+     * <li>Search for methods on faker child objects</li>
+     * <li>Search for keys in yaml file by transforming object reference to yaml reference</li>
      * </ul>
+     *
      * @return null if unable to resolve
      */
     private String resolveExpression(String directive, List<String> args, Object current, Faker root) {
         // name.name (resolve locally)
         // Name.first_name (resolve to faker.name().firstName())
-        final String simpleDirective = (isDotDirective(directive) || current == null) 
-                ? directive 
+        final String simpleDirective = (isDotDirective(directive) || current == null)
+                ? directive
                 : classNameToYamlName(current) + "." + directive;
-        
+
         String resolved = null;
         // resolve method references on CURRENT object like #{number_between '1','10'} on Number or
         // #{ssn_valid} on IdNumber
@@ -439,7 +388,7 @@ public class FakeValuesService {
         }
 
         // simple fetch of a value from the yaml file. the directive may have been mutated
-        // such that if the current yml object is car: and directive is #{wheel} then 
+        // such that if the current yml object is car: and directive is #{wheel} then
         // car.wheel will be looked up in the YAML file.
         if (resolved == null) {
             resolved = safeFetch(simpleDirective, null);
@@ -454,16 +403,16 @@ public class FakeValuesService {
         if (resolved == null && isDotDirective(directive)) {
             resolved = resolveFakerObjectAndMethod(root, directive, args);
         }
-        
+
         // last ditch effort.  Due to Ruby's dynamic nature, something like 'Address.street_title' will resolve
-        // because 'street_title' is a dynamic method on the Address object.  We can't do this in Java so we go 
+        // because 'street_title' is a dynamic method on the Address object.  We can't do this in Java so we go
         // thru the normal resolution above, but if we will can't resolve it, we once again do a 'safeFetch' as we
         // did first but FIRST we change the Object reference Class.method_name with a yml style internal refernce ->
         // class.method_name (lowercase)
         if (resolved == null && isDotDirective(directive)) {
             resolved = safeFetch(javaNameToYamlName(simpleDirective), null);
         }
-        
+
         return resolved;
     }
 
@@ -478,6 +427,7 @@ public class FakeValuesService {
 
     /**
      * Given a {@code slashDelimitedRegex} such as {@code /[ab]/}, removes the slashes and returns only {@code [ab]}
+     *
      * @param slashDelimitedRegex a non null slash delimited regex (ex. {@code /[ab]/})
      * @return the regex without the slashes (ex. {@code [ab]})
      */
@@ -490,14 +440,14 @@ public class FakeValuesService {
     }
 
     /**
-     * @return a yaml style name from the classname of the supplied object (PhoneNumber => phone_number) 
+     * @return a yaml style name from the classname of the supplied object (PhoneNumber => phone_number)
      */
     private String classNameToYamlName(Object current) {
         return javaNameToYamlName(current.getClass().getSimpleName());
     }
 
     /**
-     * @return a yaml style name like 'phone_number' from a java style name like 'PhoneNumber' 
+     * @return a yaml style name like 'phone_number' from a java style name like 'PhoneNumber'
      */
     private String javaNameToYamlName(String expression) {
         return expression.replaceAll("([A-Z])", "_$1")
@@ -506,7 +456,6 @@ public class FakeValuesService {
     }
 
 
-
     /**
      * Given a directive like 'firstName', attempts to resolve it to a method.  For example if obj is an instance of
      * {@link Name} then this method would return {@link Name#firstName()}.  Returns null if the directive is nested
@@ -526,15 +475,16 @@ public class FakeValuesService {
             return null;
         }
     }
-    
+
     /**
      * Accepts a {@link Faker} instance and a name.firstName style 'key' which is resolved to the return value of:
      * {@link Faker#name()}'s {@link Name#firstName()} method.
+     *
      * @throws RuntimeException if there's a problem invoking the method or it doesn't exist.
      */
     private String resolveFakerObjectAndMethod(Faker faker, String key, List<String> args) {
         final String[] classAndMethod = key.split("\\.", 2);
-        
+
         try {
             String fakerMethodName = classAndMethod[0].replaceAll("_", "");
             MethodAndCoercedArgs fakerAccessor = accessor(faker, fakerMethodName, Collections.<String>emptyList());
@@ -558,15 +508,15 @@ public class FakeValuesService {
         }
     }
 
-    
+
     /**
      * Find an accessor by name ignoring case.
      */
     private MethodAndCoercedArgs accessor(Object onObject, String name, List<String> args) {
         log.log(Level.FINE, "Find accessor named " + name + " on " + onObject.getClass().getSimpleName() + " with args " + args);
-        
+
         for (Method m : onObject.getClass().getMethods()) {
-            if (m.getName().equalsIgnoreCase(name) 
+            if (m.getName().equalsIgnoreCase(name)
                     && m.getParameterTypes().length == args.size()) {
                 final List<Object> coercedArguments = coerceArguments(m, args);
                 if (coercedArguments != null) {
@@ -584,6 +534,7 @@ public class FakeValuesService {
     /**
      * Coerce arguments in <em>args</em> into the appropriate types (if possible) for the parameter arguments
      * to <em>accessor</em>.
+     *
      * @return array of coerced values if successful, null otherwise
      * @throws Exception if unable to coerce
      */
@@ -593,10 +544,16 @@ public class FakeValuesService {
 
             Class<?> toType = ClassUtils.primitiveToWrapper(accessor.getParameterTypes()[i]);
             try {
-                final Constructor<?> ctor = toType.getConstructor(String.class);
-                final Object coercedArgument = ctor.newInstance(args.get(i));
-
-                coerced.add(coercedArgument);
+                if (toType.isEnum()) {
+                    Method method = toType.getMethod( "valueOf", String.class );
+                    String enumArg = args.get( i ).substring( args.get( i ).indexOf( "." ) + 1 );
+                    Object coercedArg = method.invoke( null, enumArg );
+                    coerced.add( coercedArg );
+                } else {
+                    final Constructor<?> ctor = toType.getConstructor(String.class);
+                    final Object coercedArgument = ctor.newInstance(args.get(i));
+                    coerced.add(coercedArgument);
+                }
             } catch (Exception e) {
                 log.fine("Unable to coerce " + args.get(i) + " to " + toType.getSimpleName() + " via " + toType.getSimpleName() + "(String) constructor.");
                 return null;
@@ -604,7 +561,7 @@ public class FakeValuesService {
         }
         return coerced;
     }
-    
+
     private String string(Object obj) {
         return (obj == null) ? null : obj.toString();
     }
@@ -614,17 +571,17 @@ public class FakeValuesService {
      * this is useful as we get to find the method and coerce the arguments in one
      * shot, returning both when successful.  This saves us from doing it more than once (coercing args).
      */
-    private class MethodAndCoercedArgs {
+    private static class MethodAndCoercedArgs {
 
         private final Method method;
-        
+
         private final List<Object> coerced;
 
         private MethodAndCoercedArgs(Method m, List<Object> coerced) {
             this.method = requireNonNull(m, "method cannot be null");
             this.coerced = requireNonNull(coerced, "coerced arguments cannot be null");
         }
-        
+
         private Object invoke(Object on) throws InvocationTargetException, IllegalAccessException {
             return method.invoke(on, coerced.toArray());
         }

src/main/java/com/github/javafaker/service/LocaleDoesNotExistException.java

@@ -1,7 +0,0 @@
-package com.github.javafaker.service;
-
-public class LocaleDoesNotExistException extends RuntimeException {
-    public LocaleDoesNotExistException(String message) {
-        super(message);
-    }
-}

src/main/java/com/github/javafaker/service/RandomService.java

@@ -54,4 +54,17 @@ public class RandomService {
     public Integer nextInt(int min, int max) {
         return random.nextInt((max - min) + 1) + min;
     }
+
+    public String hex() {
+        return hex(8);
+    }
+
+    public String hex(int length) {
+        char[] hexValues = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+        StringBuilder hexString = new StringBuilder();
+        for(int i = 0; i < length; i++) {
+            hexString.append(hexValues[nextInt(hexValues.length)]);
+        }
+        return hexString.toString();
+    }
 }

src/main/java/com/github/javafaker/service/files/EnFile.java

@@ -0,0 +1,201 @@
+package com.github.javafaker.service.files;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class EnFile {
+    private final String file;
+    private final String path;
+
+    private EnFile(String file) {
+        this(file, file.replaceFirst(".yml", ""));
+    }
+
+    private EnFile(String file, String path) {
+        this.file = file;
+        this.path = path;
+    }
+
+
+    public String getFile() {
+        return file;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    private static List<String> FILES = Arrays.asList("address.yml",
+            "ancient.yml",
+            "animal.yml",
+            "app.yml",
+            "appliance.yml",
+            "aqua_teen_hunger_force.yml",
+            "artist.yml",
+            "aviation.yml",
+            "back_to_the_future.yml",
+            "bank.yml",
+            "beer.yml",
+            "bojack_horseman.yml",
+            "book.yml",
+            "bossa_nova.yml",
+            "breaking_bad.yml",
+            "buffy.yml",
+            "business.yml",
+            "cannabis.yml",
+            "chuck_norris.yml",
+            "code.yml",
+            "coffee.yml",
+            "coin.yml",
+            "color.yml",
+            "commerce.yml",
+            "community.yml",
+            "company.yml",
+            "compass.yml",
+            "construction.yml",
+            "cosmere.yml",
+            "country.yml",
+            "crypto_coin.yml",
+            "currency.yml",
+            "dc_comics.yml",
+            "demographic.yml",
+            "dessert.yml",
+            "device.yml",
+            "dota.yml",
+            "dr_who.yml",
+            "dragon_ball.yml",
+            "dumb_and_dumber.yml",
+            "dune.yml",
+            "educator.yml",
+            "elder_scrolls.yml",
+            "electrical_components.yml",
+            "esport.yml",
+            "fallout.yml",
+            "family_guy.yml",
+            "famous_last_words.yml",
+            "file.yml",
+            "finance.yml",
+            "food.yml",
+            "football.yml",
+            "fresh_prince_of_bel_air.yml",
+            "friends.yml",
+            "funny_name.yml",
+            "game_of_thrones.yml",
+            "gender.yml",
+            "ghostbusters.yml",
+            "grateful_dead.yml",
+            "greek_philosophers.yml",
+            "hacker.yml",
+            "half_life.yml",
+            "harry_potter.yml",
+            "heroes.yml",
+            "heroes_of_the_storm.yml",
+            "hey_arnold.yml",
+            "hipster.yml",
+            "hitchhikers_guide_to_the_galaxy.yml",
+            "hobbit.yml",
+            "house.yml",
+            "how_i_met_your_mother.yml",
+            "id_number.yml",
+            "industry_segments.yml",
+            "internet.yml",
+            "invoice.yml",
+            "job.yml",
+            "kpop.yml",
+            "lebowski.yml",
+            "lord_of_the_rings.yml",
+            "lorem.yml",
+            "lovecraft.yml",
+            "markdown.yml",
+            "marketing.yml",
+            "matz.yml",
+            "measurement.yml",
+            "medical.yml",
+            "michael_scott.yml",
+            "military.yml",
+            "most_interesting_man_in_the_world.yml",
+            "movie.yml",
+            "music.yml",
+            "myst.yml",
+            "name.yml",
+            "nation.yml",
+            "nato_phonetic_alphabet.yml",
+            "new_girl.yml",
+            "one_piece.yml",
+            "overwatch.yml",
+            "parks_and_rec.yml",
+            "phish.yml",
+            "phone_number.yml",
+            "pokemon.yml",
+            "princess_bride.yml",
+            "programming_language.yml",
+            "relationship.yml",
+            "restaurant.yml",
+            "rick_and_morty.yml",
+            "robin.yml",
+            "rock_band.yml",
+            "rupaul.yml",
+            "science.yml",
+            "seinfeld.yml",
+            "shakespeare.yml",
+            "silicon_valley.yml",
+            "simpsons.yml",
+            "singular_siegler.yml",
+            "slack_emoji.yml",
+            "sonic_the_hedgehog.yml",
+            "source.yml",
+            "south_park.yml",
+            "space.yml",
+            "star_trek.yml",
+            "star_wars.yml",
+            "stargate.yml",
+            "stock.yml",
+            "stranger_thing.yml",
+            "stripe.yml",
+            "subscription.yml",
+            "super_smash_bros.yml",
+            "superhero.yml",
+            "sword_art_online.yml",
+            "team.yml",
+            "the_expanse.yml",
+            "the_it_crowd.yml",
+            "the_thick_of_it.yml",
+            "twin_peaks.yml",
+            "umphreys_mcgee.yml",
+            "university.yml",
+            "v_for_vendetta.yml",
+            "vehicle.yml",
+            "venture_bros.yml",
+            "verbs.yml",
+            "weather.yml",
+            "witcher.yml",
+            "world_cup.yml",
+            "world_of_warcraft.yml",
+            "yoda.yml",
+            "zelda.yml");
+
+    // files where the search path can't be derived from the filename
+    private static List<EnFile> FILES_WITH_A_DIFFERENT_PATH = Arrays.asList(
+            new EnFile("animal.yml", "creature"),
+            new EnFile("cat.yml", "creature"),
+            new EnFile("dog.yml", "creature"),
+            new EnFile("league_of_legends.yml", "games"),
+            new EnFile("overwatch.yml", "games"),
+            new EnFile("pokemon.yml", "games"),
+            new EnFile("witcher.yml", "games"),
+            new EnFile("zelda.yml", "games"),
+            new EnFile("elder_scrolls.yml", "games"),
+            new EnFile("phone_number.yml", "cell_phone")); // load phone number again with a differen path
+
+
+    public static List<EnFile> getFiles() {
+        List<EnFile> files = new ArrayList<EnFile>();
+        for (String file : FILES) {
+            files.add(new EnFile(file));
+        }
+        files.addAll(FILES_WITH_A_DIFFERENT_PATH);
+
+        return files;
+    }
+}

src/main/resources/bg.yml

@@ -27,6 +27,9 @@ bg:
       female_first_name: [Мария, Иванка, Елена, Йорданка, Пенка, Маргарита, Виолета, Лиляна, Цветанка, Радка, Надежда, Марийка, Румяна, Тодорка, Стефка, Стоянка, Василка, Росица, Станка, Емилия, Донка, Милка, Величка, Райна, Анка, Красимира, Снежана, Мариана, Валентина, Янка, Христина, Катя, Николина, Даниела, Татяна, Светла, Галина, Златка, Лилия, Екатерина, Цветана, Недялка, Диана, Антоанета, Павлина, Анна, Веселина, Славка, Марияна, Юлия]
       female_middle_name: [Александрова, Адрианова, Ангелова, Аспарухова, Алексиева, Марианов, Бисерова, Благовестова, Боримирова, Викториева, Владимирова, Валентинова, Венциславова, Георгиева, Григорова, Грозданова, Димитрова, Даниелова, Денисова, Дамянова, Добромирова, Евгениева, Петрова, Иванова, Павлова]
       female_last_name: [Иванова, Георгиева, Димитрова, Петрова, Николова, Стоянова, Христова, Тодорова, Илиева, Василева, Атанасова, Петкова, Ангелова, Колева, Йорданова, Маринова, Стефанова, Попова, Михайлова, Кръстева, Костова, Димова, Павлова, Костадинова, Митева, Симеонова, цветкова, Александрова, Маркова, Спасова, Лазарова, Добрева, Младенова, Андреева, Янева, Радева, Русева, Янкова, Пенева, Вълчева, Григорова, Кирова, Найденова, Станчева, Алексиева, Стойчева, Борисова, Славова, Станева, Панайотова]
+      first_name:
+        - "#{male_first_name}"
+        - "#{female_first_name}"
       name:
         - "#{male_first_name} #{male_last_name}"
         - "#{male_last_name} #{male_first_name}"

src/main/resources/ca-CAT.yml

@@ -9,7 +9,7 @@ ca-CAT:
       secondary_address: ['Esc. ###', 'Porta ###']
       postcode: ['#####']
       province: [Barcelona, Girona, Lleida, Tarragona]
-      state: [l''Alt Camp, l''Alt Empordà, l''Alt Penedès, l''Alt Urgell, l''Alta Ribagorça, l''Anoia, el Bages, el Baix Camp, el Baix Ebre, el Baix Empordà, el Baix Llobregat, el Baix Penedès, el Barcelonès, el Berguedà, la Cerdanya, la Conca de Barberà, el Garraf, les Garrigues, la Garrotxa, el Gironès, el Maresme, el Moianès, el Montsià, la Noguera, Osona, el Pallars Jussà, el Pallars Sobirà, el Pla d''Urgell, el Pla de l''Estany, el Priorat, la Ribera d''Ebre, el Ripollès, la Segarra, el Segrià, la Selva, el Solsonès, el Tarragonès, la Terra Alta, l''Urgell, la Val d''Aran, el Vallès Occidental, el Vallès Oriental]
+      state: [l''Alt Camp, l''Alt Empordà, l''Alt Penedès, l''Alt Urgell, l''Alta Ribagorça, l''Anoia, el Bages, el Baix Camp, el Baix Ebre, el Baix Empordà, el Baix Llobregat, el Baix Penedès, el Barcelonès, el Berguedà, la Cerdanya, la Conca de Barberà, el Garraf, les Garrigues, la Garrotxa, el Gironès, el Maresme, el Moianès, el Montsià, la Noguera, Osona, el Pallars Jussà, el Pallars Sobirà, el Pla d''Urgell, el Pla de l''Estany, el Priorat, la Ribera d''Ebre, el Ripollès, la Segarra, el Segrià, la Selva, el Solsonès, el Tarragonès, la Terra Alta, l''Urgell, la Val d''Aran, el Vallès Occidental, el Vallès Oriental]
       street_name:
         - "#{street_suffix} #{Name.first_name}"
         - "#{street_suffix} #{Name.first_name} #{Name.last_name}"

src/main/resources/ca.yml

@@ -21,5 +21,11 @@ ca:
         - "#{male_first_name} #{last_name} #{last_name}"
         - "#{male_first_name} #{last_name} #{last_name}"
         - "#{male_first_name} #{last_name} #{last_name}"
+      name_with_middle:
+        - "#{prefix} #{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
     color:
       name: [aiguamarina, albercoc, amarant, ambre, ametista, atzur, beix, bistre, blanc, blat, blau, blau cel, blau fosc, blau marí, blau reial, blauet, bronze, camussa, canyella, caqui, cardenal, carmesí, carmí, carnació, castany rogenc, celadont, ceruli, chartreuse, cian, cirera, corall, coure, crema, escarlata, granat, gris, gris fosc, groc, lavanda, lila, llima, magenta, malva, marró, morat, ocre, or, orquídia, panotxa, plata, porpra, préssec, pruna, verd, verd maragda, verd oliva, verd veronès, vermell, vermell fosc, vermelló, vinca, violat, vori]

src/main/resources/da-DK.yml

@@ -4,12 +4,12 @@ da-DK:
       city_prefix: [Nord, Birke, Ny, Frederiks, Lille, Vær, Ring, Støv, Sven, Munke, Kerte, Horn, Aa, Bør, Otte, Had, Vi, Rud, Bro, Vide, Jyde, Lange]
       city_suffix: [by, hus, borg, holm, bjerg, lund, bro, bæk, løse, slev, rød, å, sør, skov, slet, værk, strup, købing, sted, sten, kro, toft, ring, vig, bo]
       country: [Rusland, Canada, Kina, USA, Brasilien, Australien, Indien, Argentina, Kasakhstan, Algeriet, Den Demokratiske Republik Congo, Danmark, Færøerne, Grønland, Saudi-Arabien, Mexico, Indonesien, Sudan, Libyen, Iran, Mongoliet, Peru, Chad, Niger, Angola, Mali, Sydafrika, Colombia, Etiopien, Bolivia, Mauretanien, Egypten, Tanzania, Nigeria, Venezuela, Namibia, Pakistan, Mocambique, Tyrkiet, Chile, Zambia, Marokko, Vestsahara, Burma, Afghanistan, Somalia, Den Centralafrikanske Republik, Sydsudan, Ukraine, Botswana, Madagaskar, Kenya, Frankrig, Fransk Guyana, Yemen, Thailand, Spanien, Turkmenistan, Cameroun, Papua Ny Guinea, Sverige, Usbekistan, Irak, Paraguay, Zimbabwe, Japan, Tyskland, Congo, Finland, Malaysia, Vietnam, Norge, Svalbard, Jan Mayen, Elfenbenskysten, Polen, Italien, Filippinerne, Ecuador, Burkina Faso, Nya Zealand, Gabon, Guinea, Storbritannien, Ghana, Rumænien, Laos, Uganda, Guyana, Oman, Hviderusland, Kirgisistan, Senegal, Syrien, Cambodja, Uruguay, Tunesien, Surinam, Nepal, Bangladesh, Tadsjikistan, Grækenland, Nicaragua, Eritrea, Nordkorea, Malawi, Benin, Honduras, Liberia, Bulgarien, Cuba, Guatemala, Island, Sydkorea, Ungarn, Portugal, Jordan, Serbien, Aserbajdsjan, Østrig, De Forenede Arabiske Emirater, Tjekkiet, Panama, Sierra Leone, Irland, Georgien, Sri Lanka, Litauen, Letland, Togo, Kroatien, Bosnien og Hercegovina, Costa Rica, Slovakiet, Den Dominikanske republik, Bhutan, Estland, Danmark, Færøerne, Grønland, Nederlænderne, Schweiz, Guinea-Bissau, Taiwan, Moldova, Belgien, Lesotho, Armenien, Albanien, Salomonøerne, Ækvatorialguinea, Burundi, Haiti, Rwanda, Makedonien, Djibouti, Belize, Israel, El Salvador, Slovenien, Fiji, Kuwait, Swaziland, Østtimor, Montenegro, Bahamas, Vanuatu, Qatar, Gambia, Jamaica, Kosovo, Libanon, Cypern, Brunei, Trinidad og Tobago, Kap Verde, Samoa, Luxembourg, Comorerne, Mauritius, São Tomé og Principe, Kiribati, Dominica, Tonga, Mikronesien, Singapore, Bahrain, Saint Lucia, Andorra, Palau, Seychellerne, Antigua og Barbuda, Barbados, Saint Vincent og Grenadinerne, Grenada, Malta, Maldiverne, Saint Kitts og Nevis, Marshalløerne, Liechtenstein, San Marino, Tuvalu, Nauru, Monaco, Vatikanstaten]
+      country_code: ['DK']
       common_street_suffix: [vej, gade]
       street_prefix: [Vester, Øster, Nørre, Over, Under]
       street_root: [Lærke, Birke, Vinkel, Vibe, Mølle, Ring, Skole, Skov, Ny, Ege, Sol, Industri, Kirke, Park, Strand, Eng]
       street_suffix: [vej, gade, gyde, allé]
       state: [Region Nordjylland, Region Midtjylland, Region Syddanmark, Region Hovedstaden, Region Sjælland]
-
       city:
         - "#{city_prefix}#{city_suffix}"
       street_name:
@@ -38,7 +38,6 @@ da-DK:
       first_name: [Peter, Jens, Lars, Michael, Henrik, Thomas, Søren, Jan, Christian, Niels, Anne, Kirsten, Hanne, Mette, Anna, Helle, Susanne, Lene, Maria, Marianne]
       last_name: [Nielsen, Jensen, Hansen, Pedersen, Andersen, Christensen, Larsen, Sørensen, Rasmussen, Jørgensen]
       prefix: ["Dr.", "Prof.", "Cand.mag.", "Cand.jur."]
-
       title:
         descriptor: [Leder, Senior, Fremtid, Produkt, National, Regional, Distrikt, Central, Global, Kunde, Investor, Dynamic, International, Legacy, Forward, Intern, HR, Direktør, Rektor]
         level: [Solutions, Program, Brand, Sikkerhed, Research, Marketing, Directives, Implementering, Integration, Funktionalitet, Respons, Paradigme, Taktik, Identitet, Markeder, Gruppe, Division, Applikationer, Optimering, Operationer, Infrastruktur, Intranet, Kommunikation, Web, Branding, Kvalitet, Kontrol, Mobilitet, Regnskab, Data, Kreativ, Konfiguration, Interaktioner, Faktorer, Anvendelighed, Metrik]
@@ -46,6 +45,12 @@ da-DK:
       name:
         - "#{first_name} #{last_name}"
         - "#{prefix} #{first_name} #{last_name}"
+      name_with_middle:
+        - "#{prefix} #{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
 
     phone_number:
       formats:
@@ -64,6 +69,5 @@ da-DK:
         adjective: [Lille, Ergonomisk, Robust, Intelligent, Sød, Utrolig, Fantastisk, Praktisk, Slank, Fed, Enorm, Enkel, Tung, Let, Multianvendelig, Udholdende]
         material: [Stål, Metal, Træ, Beton, Plastic, Bomuld, Granit, Gummi, Latex, Læder, Silke, Uld, Ruskind, Linned, Marmor, Jern, Bronze, Kobber, Messing, Aluminium, Papir]
         product: [Stol, Bil, Computer, Buks, Trøje, Bord, Hat, Tallerken, Kniv, Flaske, Jakke, Lampe, Tastatur, Taske, Bænk, Ur, Pung]
-
       name:
         - "#{Address.city} #{suffix}"

src/main/resources/ee.yml

@@ -0,0 +1,61 @@
+ee:
+  faker:
+    invoice:
+      reference:
+        # '#' means the place where check digit is placed
+        # Source: http://www.pangaliit.ee/en/settlements-and-standards/reference-number-of-the-invoice
+        check_digit_method: method_731
+        pattern: '\d{1,19}#'
+    address:
+      postcode: ["#####"]
+      building_number: ["####", "###", "##"]
+      street_suffix: ["tee", "maantee", "tänav", "põik"]
+      state: [Harjumaa, Tartumaa, Ida-Virumaa, Pärnumaa, Lääne-Virumaa, Viljandimaa, Raplamaa, Võrumaa, Saaremaa, Jõgevamaa, Järvamaa, Valgamaa, Põlvamaa, Läänemaa, Hiiumaa]
+      city_name: [Tallinn, Tartu, Narva, Pärnu, Kohtla-Järve, Viljandi, Rakvere, Maardu, Sillamäe, Kuressaare, Valga, Võru, Haapsalu, Jõhvi, Keila, Põlva, Rapla, Türi, Paide, Tapa, Saue, Elva, Kehra, Kiviõli, Suure-Jaani, Jõgeva, Räpina, Kärdla, Põltsamaa, Otepää, Kilingi-Nõmme, Sindi, Paldiski, Tamsalu, Antsla, Karksi-Nuia, Kunda, Püssi, Narva-Jõesuu, Tõrva, Loksa, Lihula, Abja-Paluoja, Võhma, Mustvee, Kallaste, Mõisaküla]
+      city:
+        - "#{city_name}"
+      street_name:
+        - "#{Name.last_name} #{street_suffix}"
+      street_address:
+        - "#{Name.last_name} #{street_suffix} #{building_number}"
+
+    company:
+      suffix: [AS, OÜ]
+      # Buzzword wordlist from http://www.1728.com/buzzword.htm
+      buzzwords:
+        - ["Adaptive", "Advanced", "Ameliorated", "Assimilated", "Automated", "Balanced", "Business-focused", "Centralized", "Cloned", "Compatible", "Configurable", "Cross-group", "Cross-platform", "Customer-focused", "Customizable", "Decentralized", "De-engineered", "Devolved", "Digitized", "Distributed", "Diverse", "Down-sized", "Enhanced", "Enterprise-wide", "Ergonomic", "Exclusive", "Expanded", "Extended", "Face to face", "Focused", "Front-line", "Fully-configurable", "Function-based", "Fundamental", "Future-proofed", "Grass-roots", "Horizontal", "Implemented", "Innovative", "Integrated", "Intuitive", "Inverse", "Managed", "Mandatory", "Monitored", "Multi-channelled", "Multi-lateral", "Multi-layered", "Multi-tiered", "Networked", "Object-based", "Open-architected", "Open-source", "Operative", "Optimized", "Optional", "Organic", "Organized", "Persevering", "Persistent", "Phased", "Polarised", "Pre-emptive", "Proactive", "Profit-focused", "Profound", "Programmable", "Progressive", "Public-key", "Quality-focused", "Reactive", "Realigned", "Re-contextualized", "Re-engineered", "Reduced", "Reverse-engineered", "Right-sized", "Robust", "Seamless", "Secured", "Self-enabling", "Sharable", "Stand-alone", "Streamlined", "Switchable", "Synchronised", "Synergistic", "Synergized", "Team-oriented", "Total", "Triple-buffered", "Universal", "Up-sized", "Upgradable", "User-centric", "User-friendly", "Versatile", "Virtual", "Visionary", "Vision-oriented"]
+        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "asymmetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
+        - ["ability", "access", "adapter", "algorithm", "alliance", "analyzer", "application", "approach", "architecture", "archive", "artificial intelligence", "array", "attitude", "benchmark", "budgetary management", "capability", "capacity", "challenge", "circuit", "collaboration", "complexity", "concept", "conglomeration", "contingency", "core", "customer loyalty", "database", "data-warehouse", "definition", "emulation", "encoding", "encryption", "extranet", "firmware", "flexibility", "focus group", "forecast", "frame", "framework", "function", "functionalities", "Graphic Interface", "groupware", "Graphical User Interface", "hardware", "help-desk", "hierarchy", "hub", "implementation", "info-mediaries", "infrastructure", "initiative", "installation", "instruction set", "interface", "internet solution", "intranet", "knowledge user", "knowledge base", "local area network", "leverage", "matrices", "matrix", "methodology", "middleware", "migration", "model", "moderator", "monitoring", "moratorium", "neural-net", "open architecture", "open system", "orchestration", "paradigm", "parallelism", "policy", "portal", "pricing structure", "process improvement", "product", "productivity", "project", "projection", "protocol", "secured line", "service-desk", "software", "solution", "standardization", "strategy", "structure", "success", "superstructure", "support", "synergy", "system engine", "task-force", "throughput", "time-frame", "toolset", "utilisation", "website", "workforce"]
+      # BS wordlist from http://dack.com/web/bullshit.html
+      bs:
+        - ["implement", "utilize", "integrate", "streamline", "optimize", "evolve", "transform", "embrace", "enable", "orchestrate", "leverage", "reinvent", "aggregate", "architect", "enhance", "incentivize", "morph", "empower", "envisioneer", "monetize", "harness", "facilitate", "seize", "disintermediate", "synergize", "strategize", "deploy", "brand", "grow", "target", "syndicate", "synthesize", "deliver", "mesh", "incubate", "engage", "maximize", "benchmark", "expedite", "reintermediate", "whiteboard", "visualize", "repurpose", "innovate", "scale", "unleash", "drive", "extend", "engineer", "revolutionize", "generate", "exploit", "transition", "e-enable", "iterate", "cultivate", "matrix", "productize", "redefine", "recontextualize"]
+        - ["clicks-and-mortar", "value-added", "vertical", "proactive", "robust", "revolutionary", "scalable", "leading-edge", "innovative", "intuitive", "strategic", "e-business", "mission-critical", "sticky", "one-to-one", "24/7", "end-to-end", "global", "B2B", "B2C", "granular", "frictionless", "virtual", "viral", "dynamic", "24/365", "best-of-breed", "killer", "magnetic", "bleeding-edge", "web-enabled", "interactive", "dot-com", "sexy", "back-end", "real-time", "efficient", "front-end", "distributed", "seamless", "extensible", "turn-key", "world-class", "open-source", "cross-platform", "cross-media", "synergistic", "bricks-and-clicks", "out-of-the-box", "enterprise", "integrated", "impactful", "wireless", "transparent", "next-generation", "cutting-edge", "user-centric", "visionary", "customized", "ubiquitous", "plug-and-play", "collaborative", "compelling", "holistic", "rich"]
+        - ["synergies", "web-readiness", "paradigms", "markets", "partnerships", "infrastructures", "platforms", "initiatives", "channels", "eyeballs", "communities", "ROI", "solutions", "e-tailers", "e-services", "action-items", "portals", "niches", "technologies", "content", "vortals", "supply-chains", "convergence", "relationships", "architectures", "interfaces", "e-markets", "e-commerce", "systems", "bandwidth", "infomediaries", "models", "mindshare", "deliverables", "users", "schemas", "networks", "applications", "metrics", "e-business", "functionalities", "experiences", "web services", "methodologies"]
+      name:
+        - "#{Name.last_name} #{suffix}"
+        - "#{suffix} #{Name.last_name}"
+
+    internet:
+      free_email: [gmail.com, yahoo.com, hotmail.com]
+      domain_suffix: [com, com.ee, ee, net, org]
+
+    name:
+      first_name: [Aabel, Aabraham, Aadu, Aare, Aarne, Aaron, Aavo, Ago, Agu, Ahti, Ahto, Aigar, Ain, Aivar, Aivo, Aksel, Alar, Alari, Albert, Aleks, Aleksander, Allan, Allar, Alo, Alvar, Ando, Andre, Andreas, Andres, Andrus, Anti, Anton, Ants, Ardi, Ardo, Arno, Arnold, Arti, Artur, Arved, Arvi, Arvo, Asko, August, Edgar, Eduard, Eedo, Eedu, Eerik, Eero, Egert, Egon, Einar, Eino, Elias, Elmar, Elmo, Endel, Endrik, Enn, Enno, Ergo, Erik, Erki, Erko, Erlend, Ermo, Evald, Evert, Feliks, Georg, Gert, Gunnar, Gustav, Hannes, Hans, Hardi, Harri, Heigo, Heiki, Heino, Heiti, Hendrik, Henn, Henri, Hillar, Iisak, Illar, Illimar, Ilmar, Ilmo, Imre, Indrek, Innar, Ivar, Ivari, Ivo, Jaagup, Jaak, Jaakob, Jaan, Jaanus, Jakob, Janar, Janek, Janno, Jass, Joel, Johannes, Joona, Joonas, Joonatan, Joosep, Juhan, Juho, Jukk, Juss, Jürgen, Jüri, Jürjo, Kaarel, Kaido, Kajar, Kalev, Kaljo, Kalju, Kalle, Kardo, Karl, Kaspar, Kaupo, Kaur, Kauri, Ken, Kermo, Kert, Kevin, Koit, Kristen, Kristian, Kristjan, Kristo, Kristofer, Kuldar, Kunnar, Kusta, Kustas, Kustav, Küllo, Laur, Lauri, Leevi, Leho, Lembit, Lennart, Luukas, Maanus, Maarjo, Madi, Madis, Magnus, Maido, Mairo, Mait, Marek, Margo, Margus, Mario, Mark, Marko, Markus, Marten, Marti, Martin, Mati, Matteus, Mattias, Meelis, Meeme, Mehis, Mihkel, Miikael, Mikk, Märt, Neeme, Nigul, Nigulas, Niilo, Nuut, Olari, Olavi, Olev, Oliver, Oskar, Ott, Otto, Paavo, Paul, Paulus, Peep, Aada, Aasa, Aet, Age, Agnes, Aile, Aili, Aino, Ainu, Aire, Airi, Aita, Aive, Aleksandra, Alina, Andra, Anete, Angela, Angelika, Ann, Anna, Anne, Anneli, Anni, Annika, Anu, Asta, Astrid, Auli, Aune, Aurelia, Ave, Berit, Birgit, Brita, Dagmar, Diana, Ebe, Eda, Eeva, Eevi, Egle, Eha, Eili, Eliisa, Eliisabet, Eliise, Elina, Elis, Elle, Ellen, Elo, Elvi, Emma, Endla, Ene, Eneli, Epp, Ere, Erika, Esta, Ester, Eva, Eve, Evelin, Gerli, Greete, Grete, Hanna, Hedi, Heidi, Heili, Helbe, Hele, Helen, Helena, Heleri, Helga, Helgi, Heli, Helina, Helju, Helle, Helmi, Helve, Hiie, Hilda, Hilja, Hille, Iiris, Ille, Ilme, Ilona, Imbi, Ines, Inga, Inge, Ingel, Ingrid, Inna, Irene, Iris, Irja, Irma, Ivi, Ivika, Jaana, Jaanika, Jana, Jane, Janne, Johanna, Juta, Kaarin, Kadi, Kadri, Kai, Kaia, Kaidi, Kaie, Kaili, Kairi, Kaisa, Kaja, Karin, Karina, Karmen, Karoliina, Karoliine, Karolin, Katariina, Kati, Katre, Katri, Katriin, Katrin, Keiu, Kelli, Kerli, Kersti, Kerstin, Kertu, Kirke, Koidu, Krista, Kristel, Kristen, Kristi, Kristiina, Kristin, Kristina, Kärt, Kätlin, Külli, Küllike, Lagle, Laine, Laura, Lea, Leelo, Lehte, Leida, Leili, Lembi, Lemme, Lii, Liia, Liidia, Liilia, Liina, Liis, Liisa, Liisbet, Liisi, Liivi, Lilian, Lilli, Linda, Luule, Lüüdia, Maarika, Maarja, Made, Madli, Mai, Maia, Maie, Maila, Maimu, Maire, Malle, Mare, Maret, Margareeta, Margaret, Marge, Margit, Margot, Mari, Mari-Liis]
+      last_name: [Aare, Aasmäe, Aavik, Allik, Alver, Antson, Eenpalu, Eskola, Härma, Hõbe, Ilves, Ivask, Jänes, Järvekülg, Jääger, Jõgi, Kaasik, Kaljurand, Kangur, Kasak, Kask, Kesküla, Kivi, Koppel, Korjus, Kross, Kukk, Kuuse, Kuusik, Kuusk, Käbin, Kärner, Kõiv, Kütt, Laar, Laur, Leok, Lepik, Levandi, Linna, Luik, Lõhmus, Lõoke, Made, Mark, Masing, Meri, Mädamürk, Mägi, Männik, Naissoo, Nurme, Nurmsalu, Nõmmik, Olesk, Orav, Poska, Puhvel, Pärn, Pääsuke, Raag, Raud, Rebane, Reinsalu, Rootare, Rüütli, Saar, Salumäe, Savisaar, Sepp, Sisask, Soosaar, Taaramae, Tamm, Tammik, Toome, Tätte, Vaher, Vaino, Valdma, Valk, Vesik, Viiding, Vitsut, Välbe, Väljas, Västrik, Võsu, Wahl, Õunapuu, Öpik]
+      title:
+        descriptor: [Lead, Senior, Direct, Corporate, Dynamic, Future, Product, National, Regional, District, Central, Global, Customer, Investor, Dynamic, International, Legacy, Forward, Internal, Human, Chief, Principal]
+        level: [Solutions, Program, Brand, Security, Research, Marketing, Directives, Implementation, Integration, Functionality, Response, Paradigm, Tactics, Identity, Markets, Group, Division, Applications, Optimization, Operations, Infrastructure, Intranet, Communications, Web, Branding, Quality, Assurance, Mobility, Accounts, Data, Creative, Configuration, Accountability, Interactions, Factors, Usability, Metrics]
+        job: [Supervisor, Associate, Executive, Liaison, Officer, Manager, Engineer, Specialist, Director, Coordinator, Administrator, Architect, Analyst, Designer, Planner, Orchestrator, Technician, Developer, Producer, Consultant, Assistant, Facilitator, Agent, Representative, Strategist]
+      name:
+        - "#{first_name} #{last_name}"
+        - "#{first_name} #{last_name}"
+        - "#{first_name} #{last_name}"
+        - "#{first_name} #{last_name}"
+        - "#{first_name} #{last_name}"
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
+
+    phone_number:
+      formats: ["32# ####", "33# ####", "35# ####", "38# ####", "39# ####", "43# ####", "44# ####", "45# ####", "46# ####", "47# ####", "48# ####", "61# ####", "62# ####", "63# ####", "64# ####", "65# ####", "66# ####", "67# ####", "68# ####", "69# ####", "7## ####", "71# ####", "72# ####", "73# ####", "74# ####", "75# ####", "76# ####", "77# ####", "78# ####", "79# ####",  "88# ####"]
+    cell_phone:
+      formats: ["5### ####", "5## ####", "81## ####", "82## ####", "83## ####", "84## ####"]

src/main/resources/en-AU.yml

@@ -7,6 +7,8 @@ en-AU:
     name:
       first_name: [William, Jack, Oliver, Joshua, Thomas, Lachlan, Cooper, Noah, Ethan, Lucas, James, Samuel, Jacob, Liam, Alexander, Benjamin, Max, Isaac, Daniel, Riley, Ryan, Charlie, Tyler, Jake, Matthew, Xavier, Harry, Jayden, Nicholas, Harrison, Levi, Luke, Adam, Henry, Aiden, Dylan, Oscar, Michael, Jackson, Logan, Joseph, Blake, Nathan, Connor, Elijah, Nate, Archie, Bailey, Marcus, Cameron, Jordan, Zachary, Caleb, Hunter, Ashton, Toby, Aidan, Hayden, Mason, Hamish, Edward, Angus, Eli, Sebastian, Christian, Patrick, Andrew, Anthony, Luca, Kai, Beau, Alex, George, Callum, Finn, Zac, Mitchell, Jett, Jesse, Gabriel, Leo, Declan, Charles, Jasper, Jonathan, Aaron, Hugo, David, Christopher, Chase, Owen, Justin, Ali, Darcy, Lincoln, Cody, Phoenix, Sam, John, Joel, Isabella, Ruby, Chloe, Olivia, Charlotte, Mia, Lily, Emily, Ella, Sienna, Sophie, Amelia, Grace, Ava, Zoe, Emma, Sophia, Matilda, Hannah, Jessica, Lucy, Georgia, Sarah, Abigail, Zara, Eva, Scarlett, Jasmine, Chelsea, Lilly, Ivy, Isla, Evie, Isabelle, Maddison, Layla, Summer, Annabelle, Alexis, Elizabeth, Bella, Holly, Lara, Madison, Alyssa, Maya, Tahlia, Claire, Hayley, Imogen, Jade, Ellie, Sofia, Addison, Molly, Phoebe, Alice, Savannah, Gabriella, Kayla, Mikayla, Abbey, Eliza, Willow, Alexandra, Poppy, Samantha, Stella, Amy, Amelie, Anna, Piper, Gemma, Isabel, Victoria, Stephanie, Caitlin, Heidi, Paige, Rose, Amber, Audrey, Claudia, Taylor, Madeline, Angelina, Natalie, Charli, Lauren, Ashley, Violet, Mackenzie, Abby, Skye, Lillian, Alana, Lola, Leah, Eve, Kiara]
       last_name: [Smith, Jones, Williams, Brown, Wilson, Taylor, Johnson, White, Martin, Anderson, Thompson, Nguyen, Thomas, Walker, Harris, Lee, Ryan, Robinson, Kelly, King, Davis, Wright, Evans, Roberts, Green, Hall, Wood, Jackson, Clarke, Patel, Khan, Lewis, James, Phillips, Mason, Mitchell, Rose, Davies, Rodriguez, Cox, Alexander, Garden, Campbell, Johnston, Moore, Smyth, O'neill, Doherty, Stewart, Quinn, Murphy, Graham, Mclaughlin, Hamilton, Murray, Hughes, Robertson, Thomson, Scott, Macdonald, Reid, Clark, Ross, Young, Watson, Paterson, Morrison, Morgan, Griffiths, Edwards, Rees, Jenkins, Owen, Price, Moss, Richards, Abbott, Adams, Armstrong, Bahringer, Bailey, Barrows, Bartell, Bartoletti, Barton, Bauch, Baumbach, Bayer, Beahan, Beatty, Becker, Beier, Berge, Bergstrom, Bode, Bogan, Borer, Bosco, Botsford, Boyer, Boyle, Braun, Bruen, Carroll, Carter, Cartwright, Casper, Cassin, Champlin, Christiansen, Cole, Collier, Collins, Connelly, Conroy, Corkery, Cormier, Corwin, Cronin, Crooks, Cruickshank, Cummings, D'amore, Daniel, Dare, Daugherty, Dickens, Dickinson, Dietrich, Donnelly, Dooley, Douglas, Doyle, Durgan, Ebert, Emard, Emmerich, Erdman, Ernser, Fadel, Fahey, Farrell, Fay, Feeney, Feil, Ferry, Fisher, Flatley, Gibson, Gleason, Glover, Goldner, Goodwin, Grady, Grant, Greenfelder, Greenholt, Grimes, Gutmann, Hackett, Hahn, Haley, Hammes, Hand, Hane, Hansen, Harber, Hartmann, Harvey, Hayes, Heaney, Heathcote, Heller, Hermann, Hermiston, Hessel, Hettinger, Hickle, Hill, Hills, Hoppe, Howe, Howell, Hudson, Huel, Hyatt, Jacobi, Jacobs, Jacobson, Jerde, Johns, Keeling, Kemmer, Kessler, Kiehn, Kirlin, Klein, Koch, Koelpin, Kohler, Koss, Kovacek, Kreiger, Kris, Kuhlman, Kuhn, Kulas, Kunde, Kutch, Lakin, Lang, Langworth, Larkin, Larson, Leannon, Leffler, Little, Lockman, Lowe, Lynch, Mann, Marks, Marvin, Mayer, Mccullough, Mcdermott, Mckenzie, Miller, Mills, Monahan, Morissette, Mueller, Muller, Nader, Nicolas, Nolan, O'connell, O'conner, O'hara, O'keefe, Olson, O'reilly, Parisian, Parker, Quigley, Reilly, Reynolds, Rice, Ritchie, Rohan, Rolfson, Rowe, Russel, Rutherford, Sanford, Sauer, Schmidt, Schmitt, Schneider, Schroeder, Schultz, Shields, Smitham, Spencer, Stanton, Stark, Stokes, Swift, Tillman, Towne, Tremblay, Tromp, Turcotte, Turner, Walsh, Walter, Ward, Waters, Weber, Welch, West, Wilderman, Wilkinson, Williamson, Windler, Wolf]
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
     company:
       suffix: [Pty Ltd, and Sons, Corp, Group, Brothers, Partners]
     internet:

src/main/resources/en-CA.yml

@@ -11,4 +11,26 @@ en-CA:
       domain_suffix: [ca, com, biz, info, name, net, org]
 
     phone_number:
-      formats: ['###-###-####', '(###)###-####', '###.###.####', '1-###-###-####', '###-###-#### x###', '(###)###-#### x###', '1-###-###-#### x###', '###.###.#### x###', '###-###-#### x####', '(###)###-#### x####', '1-###-###-#### x####', '###.###.#### x####', '###-###-#### x#####', '(###)###-#### x#####', '1-###-###-#### x#####', '###.###.#### x#####']
+      area_code: ["204", "226", "236", "249", "250", "289", "306", "343", "365", "403", "416", "418", "431", "437", "438", "450", "506", "514", "519", "579", "581", "587", "604", "613", "639", "647", "705", "709", "778", "780", "807", "819", "867", "873", "902", "905"]
+      exchange_code: ["201", "202", "203", "205", "206", "207", "208", "209", "210", "212", "213", "214", "215", "216", "217", "218", "219", "224", "225", "227", "228", "229", "231", "234", "239", "240", "248", "251", "252", "253", "254", "256", "260", "262", "267", "269", "270", "276", "281", "283", "301", "302", "303", "304", "305", "307", "308", "309", "310", "312", "313", "314", "315", "316", "317", "318", "319", "320", "321", "323", "330", "331", "334", "336", "337", "339", "347", "351", "352", "360", "361", "386", "401", "402", "404", "405", "406", "407", "408", "409", "410", "412", "413", "414", "415", "417", "419", "423", "424", "425", "434", "435", "440", "443", "445", "464", "469", "470", "475", "478", "479", "480", "484", "501", "502", "503", "504", "505", "507", "508", "509", "510", "512", "513", "515", "516", "517", "518", "520", "530", "540", "541", "551", "557", "559", "561", "562", "563", "564", "567", "570", "571", "573", "574", "580", "585", "586", "601", "602", "603", "605", "606", "607", "608", "609", "610", "612", "614", "615", "616", "617", "618", "619", "620", "623", "626", "630", "631", "636", "641", "646", "650", "651", "660", "661", "662", "667", "678", "682", "701", "702", "703", "704", "706", "707", "708", "712", "713", "714", "715", "716", "717", "718", "719", "720", "724", "727", "731", "732", "734", "737", "740", "754", "757", "760", "763", "765", "770", "772", "773", "774", "775", "781", "785", "786", "801", "802", "803", "804", "805", "806", "808", "810", "812", "813", "814", "815", "816", "817", "818", "828", "830", "831", "832", "835", "843", "845", "847", "848", "850", "856", "857", "858", "859", "860", "862", "863", "864", "865", "870", "872", "878", "901", "903", "904", "906", "907", "908", "909", "910", "912", "913", "914", "915", "916", "917", "918", "919", "920", "925", "928", "931", "936", "937", "940", "941", "947", "949", "952", "954", "956", "959", "970", "971", "972", "973", "975", "978", "979", "980", "984", "985", "989"]
+      formats:
+        - "#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number}"
+        - "(#{PhoneNumber.area_code}) #{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number}"
+        - "1-#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number}"
+        - "#{PhoneNumber.area_code}.#{PhoneNumber.exchange_code}.#{PhoneNumber.subscriber_number}"
+        - "#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number}"
+        - "(#{PhoneNumber.area_code}) #{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number}"
+        - "1-#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number}"
+        - "#{PhoneNumber.area_code}.#{PhoneNumber.exchange_code}.#{PhoneNumber.subscriber_number}"
+        - "#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "(#{PhoneNumber.area_code}) #{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "1-#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "#{PhoneNumber.area_code}.#{PhoneNumber.exchange_code}.#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "(#{PhoneNumber.area_code}) #{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "1-#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "#{PhoneNumber.area_code}.#{PhoneNumber.exchange_code}.#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "(#{PhoneNumber.area_code}) #{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "1-#{PhoneNumber.area_code}-#{PhoneNumber.exchange_code}-#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"
+        - "#{PhoneNumber.area_code}.#{PhoneNumber.exchange_code}.#{PhoneNumber.subscriber_number} x#{PhoneNumber.extension}"

src/main/resources/en-GB.yml

@@ -4,6 +4,7 @@ en-GB:
       postcode: /[A-PR-UWYZ]([A-HK-Y][0-9][ABEHMNPRVWXY0-9]?|[0-9][ABCDEFGHJKPSTUW0-9]?) [0-9][ABD-HJLNP-UW-Z]{2}/
       county: [Avon, Bedfordshire, Berkshire, Borders, Buckinghamshire, Cambridgeshire, Central, Cheshire, Cleveland, Clwyd, Cornwall, County Antrim, County Armagh, County Down, County Fermanagh, County Londonderry, County Tyrone, Cumbria, Derbyshire, Devon, Dorset, Dumfries and Galloway, Durham, Dyfed, East Sussex, Essex, Fife, Gloucestershire, Grampian, Greater Manchester, Gwent, Gwynedd County, Hampshire, Herefordshire, Hertfordshire, Highlands and Islands, Humberside, Isle of Wight, Kent, Lancashire, Leicestershire, Lincolnshire, Lothian, Merseyside, Mid Glamorgan, Norfolk, North Yorkshire, Northamptonshire, Northumberland, Nottinghamshire, Oxfordshire, Powys, Rutland, Shropshire, Somerset, South Glamorgan, South Yorkshire, Staffordshire, Strathclyde, Suffolk, Surrey, Tayside, Tyne and Wear, Warwickshire, West Glamorgan, West Midlands, West Sussex, West Yorkshire, Wiltshire, Worcestershire]
       uk_country: [England, Scotland, Wales, Northern Ireland]
+      country_code: ['GB']
       default_country: [England, Scotland, Wales, Northern Ireland]
     internet:
       domain_suffix: [co.uk, com, biz, info, name]

src/main/resources/en-MS.yml

@@ -7,6 +7,12 @@ en-MS:
       chinese_male_first_name: [Jin Quan, Wen Jun, Jun Jie, Cheng Han, Tze-Kwang, Jin Leong, Zi Liang, Zhi Ren, Jin Quan, Wen Jun, Chee Hin, Guo Jun, Kai Jie, Kun Qiang,Jun Kiat, Yong Zheng, Yong Jun, Chit Boon, You Ren, Wen Zhong, Yang Shun, Qi Guang, Kang Soon, Wee Heng, Kah Yang, Siew Beng, Jia Woei, Chean Meng, Wai Kay, Keng Hua, Yew Meng, Cheng Wen, Jiun Wei, Yee Sian, Shao Hong, Bin Shen, Wing Yiu, Ee Hong, Yu Pyn, Yong Sheng, Jun Peng, Jia Jie, Guang Yi, Si Heng, Wei Hou, Kang Sheng, Hong Ern, Jia Liang, Wei Lip, Wee Chen, Wee Leng, Yu Xi, Ming Yang, Wen Hao, Siang Meng, Mong Li, Ghim Huat, Jun Yi, Jie Kai, Zhiming, Wei Jie, Teng Qing, Wei Jian, Wei Kwan, Chee Chin]
       chinese_male_last_name: [Tan, Lim, Lee, Ng, Ong, Wong, Goh, Chua, Chan, Koh, Teo, Ang, Yeo, Tay, Ho, Low]
       chinese_female_first_name: [Xiu Yi, Wai Teng, Sing Yee, Jing Yi, Jia Yee, Jia Xuan, Shu En, Pei Ying, Pei Yu, Pih Foung, Li-ann, Shi Xuan, Yi Xuan, Shu En, Yi Xin, Hui Juan, Yu En, Yihui, Xin Yi, Yun Xuan, Xuan Xuan]
+      male_first_name:
+        - "#{malay_male_first_name}"
+        - "#{chinese_male_first_name}"
+      female_first_name:
+        - "#{malay_female_first_name}"
+        - "#{chinese_female_first_name}"
       first_name:
         - "#{malay_male_first_name}"
         - "#{malay_female_first_name}"

src/main/resources/en-NEP.yml

@@ -25,6 +25,8 @@ en-NEP:
         - "#{male_first_name} #{middle_name} #{last_name}"
         - "#{female_first_name} #{last_name}"
         - "#{first_name} #{last_name}"
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
     address:
       default_time_zone: ["Asia/Kathmandu"]
       default_country_code: ["NP"]
@@ -45,5 +47,3 @@ en-NEP:
       suffix: ['Pvt Ltd', 'Group', 'Ltd', 'Limited']
     phone_number:
       formats: ['##-#######', '+977-#-#######', '+977########']
-
-

src/main/resources/en-NG.yml

@@ -29,6 +29,8 @@ en-NG:
                     Gbadamosi, Saheed, Opeyemi, Jimoh, Jamiu, Babatunde, Motalo, Omobolanle, Sarah, Okunola, Oluwashina, Olasunkanmi-fasayo, Wasiu, Ayobami, Busari,
                     Segunmaru, Aderonke, Hanifat, Balogun, Sulaimon, Oladimeji, Oluwakemi
                   ]
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
     internet:
       domain_suffix: [com.ng, com, ng, net, edu.ng, org, gov.ng, org.ng, biz, co]
     address:

src/main/resources/en-NZ.yml

@@ -8,13 +8,16 @@
 # Using popular New Zealand Sport & National Team Names
 
 en-NZ:
-
   faker:
-
     name:
       first_name: [Nikau, Ari, Manaia, Wiremu, Kauri, Mikaere, Rawiri, Ihaia, Kai, Manaaki, Tai, Tane, Tamati, Taika, Kahurangi, Tangaroa, Manawa, Ihaka, Tama, Tawhiri, Oliver, Jack, William, James, Benjamin, Mason, Hunter, Charlie, Liam, Jacob, Noah, Thomas, Max, Lucas, George, Samuel, Ryan, Alexander, Ethan, Cooper, Maia, Manaia, Anahera, Ana, Aroha, Kaia, Hana, Ataahua, Tia, Kora, Amaia, Tui, Te Aroha, Kahurangi, Awhina, Manawa, Kara, Aaria, Rui, Te Ao, Olivia, Charlotte, Harper, Sophie, Emily, Ella, Isla, Mia, Amelia, Isabella, Ruby, Grace, Emma, Chloe, Ava, Lucy, Zoe, Mila, Sophia, Lily]
       last_name: [Smith, Jones, Williams, Brown, Wilson, Taylor, Johnson, White, Martin, Anderson, Thompson, Nguyen, Thomas, Walker, Harris, Lee, Ryan, Robinson, Kelly, King, Davis, Wright, Evans, Roberts, Green, Hall, Wood, Jackson, Clarke, Patel, Khan, Lewis, James, Phillips, Mason, Mitchell, Rose, Davies, Rodriguez, Cox, Alexander, Garden, Campbell, Johnston, Moore, Smyth, Oneill, Doherty, Stewart, Quinn, Murphy, Graham, Mclaughlin, Hamilton, Murray, Hughes, Robertson, Thomson, Scott, Macdonald, Reid, Clark, Ross, Young, Watson, Paterson, Morrison, Morgan, Griffiths, Edwards, Rees, Jenkins, Owen, Price, Moss, Richards, Abbott, Adams, Armstrong, Bahringer, Bailey, Barrows, Bartell, Bartoletti, Barton, Bauch, Baumbach, Bayer, Beahan, Beatty, Becker, Beier, Berge, Bergstrom, Bode, Bogan, Borer, Bosco, Botsford, Boyer, Boyle, Braun, Bruen, Carroll, Carter, Cartwright, Casper, Cassin, Champlin, Christiansen, Cole, Collier, Collins, Connelly, Conroy, Corkery, Cormier, Corwin, Cronin, Crooks, Cruickshank, Cummings, Damore, Daniel, Dare, Daugherty, Dickens, Dickinson, Dietrich, Donnelly, Dooley, Douglas, Doyle, Durgan, Ebert, Emard, Emmerich, Erdman, Ernser, Fadel, Fahey, Farrell, Fay, Feeney, Feil, Ferry, Fisher, Flatley, Gibson, Gleason, Glover, Goldner, Goodwin, Grady, Grant, Greenfelder, Greenholt, Grimes, Gutmann, Hackett, Hahn, Haley, Hammes, Hand, Hane, Hansen, Harber, Hartmann, Harvey, Hayes, Heaney, Heathcote, Heller, Hermann, Hermiston, Hessel, Hettinger, Hickle, Hill, Hills, Hoppe, Howe, Howell, Hudson, Huel, Hyatt, Jacobi, Jacobs, Jacobson, Jerde, Johns, Keeling, Kemmer, Kessler, Kiehn, Kirlin, Klein, Koch, Koelpin, Kohler, Koss, Kovacek, Kreiger, Kris, Kuhlman, Kuhn, Kulas, Kunde, Kutch, Lakin, Lang, Langworth, Larkin, Larson, Leannon, Leffler, Little, Lockman, Lowe, Lynch, Mann, Marks, Marvin, Mayer, Mccullough, Mcdermott, Mckenzie, Miller, Mills, Monahan, Morissette, Mueller, Muller, Nader, Nicolas, Nolan, O''connell, O''conner, O''hara, O''keefe, Olson, O''reilly, Parisian, Parker, Quigley, Reilly, Reynolds, Rice, Ritchie, Rohan, Rolfson, Rowe, Russel, Rutherford, Sanford, Sauer, Schmidt, Schmitt, Schneider, Schroeder, Schultz, Shields, Smitham, Spencer, Stanton, Stark, Stokes, Swift, Tillman, Towne, Tremblay, Tromp, Turcotte, Turner, Walsh, Walter, Ward, Waters, Weber, Welch, West, Wilderman, Wilkinson, Williamson, Windler, Wolf]
-
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
+    company:
+      suffix: [Ltd, Ltc, and Sons, Group, Brothers, Partners]
+    internet:
+      domain_suffix: [co.nz, com, net.nz, net, org.nz, org, govt.nz, iwi.nz]
     address:
       region_abbr: [NTL, AUK, WKO, BOP, GIS, HKB, TKI, MWT, WGN, TAS, NSN, MBH, WTC, CAN, OTA, STL]
       region: [Northland, Auckland, Waikato, Bay of Plenty, Gisborne, Hawkes Bay, Taranaki, Manawatu, Wellington, Tasman, Nelson, Marlborough, West Coast, Canterbury, Otago, Southland]
@@ -31,12 +34,6 @@ en-NZ:
     university:
       name: [Auckland University of Technology, Lincoln University, Massey University, University of Auckland, University of Canterbury, University of Otago, University of Waikato, Victoria University of Wellington]
 
-    company:
-      suffix: [Ltd, Ltc, and Sons, Group, Brothers, Partners]
-
-    internet:
-      domain_suffix: [co.nz, com, net.nz, net, org.nz, org, govt.nz, iwi.nz, nz, io, co]
-
     team:
       sport: [basketball, football, rugby league, netball, rugby union, hockey, cricket, golf, boxing, rowing, motorsport, tennis, athletics, sailing, surf life saving, squash]
       name: [Tall Blacks, All Whites, Warriors, Silver Ferns, All Blacks, Black Sticks, Black Caps]

src/main/resources/en-PAK.yml

@@ -3,7 +3,8 @@ en-PAK:
     name:
       first_name: [ Hamza, Harris, Raees, Ehtisham, Zohair, Zuhaib, Aslam, Nadeem, Younas, Danish, Zahoor, Abdul , Nizam, Taimur, Iftikhar, Kashif, Naseer, Zohaib, Mazhar, Saeed, Jawad, Wakeel Khan, Quddus, Nasir, Tabraiz, Shahbaz, Wasi, Rahim, Suleman, Akbar, Maqbool Ahmed, Sajjad, Akif, Sarmad, Zarar, Zulqarnain, Sunny, Nawaz, Sattar, Humayun, Khurshid, Abid, Ahmed, Ijaz, Tariq, Sarim Hayat, Syed Najum, Rashid, Umair, Zubair, Salim, Sultan, Nauman, Waqar, Imran, Fazal, Usman, Adam, Ilyas, Saghar, Azeem, Ali, Akram, Dawood, Sohrab, Zeeshan, Amjad, Majid, Naveed, Yousaf, Safeer, Akhtar, Muzaffar, Saqlain, Afzal, Maqsood, Hassan, Moheem, Zaighum, Amir, Saqib, Vazir, Vakeel, Qadir, Malik, Jafar, Sikandar, Ismail, Junaid, Mehr, Idrees Khan, Jamal, Shafqat, Taufeeq, Rasheed, Shakoor, Wasim, Saadat, Siddiq, Shabbir, Umair, Shams, Habib, Salahuddin, Fayaz, Faiz, Zaeem, Yasir, Shan, Wasif, Khan, Adnan, Arsalan, Shamsher, Nafees, Mumtaz, Javid, Yahya, Uzaif, Ayub, Noman, Zameer, Mian, Mushtaq, Aleem, Ghayoor, Khalid, Taj, Parvez, Zahid, Aziz, Tanvir, Musharraf, Shakir, Sohail, Arif, Sabir, Zain, Tauseef, Saif, Rahman, Aqib, Zulfiqar, Salman, Sibtain, Hamid, Sohaib, Najib, Sadaqat, Inzamam, Haroon, Danial, Imran, Fahid, Aqeel, Subhan, Shakeel, Rana, Hammad, Faizan, Muhammad, Ahmer, Jabbar, Aamir Saleem, Kaleem, Tauqeer, Bilal, Razzaq, Zafar, Shahzad, Latif, Mohammed, Raja Zohaib, Munawar, Karim, Waheed, Mustafa, Sameer, Sarwar, Sarfraz, Jaleel, Jamal, Salman, Sagheer, Qasim, Mustansar, Umar, Mohammad, Waheed, Sadiq, Taha, Amin, Mujtaba, Mahmood, Hameed, Zareef, Fahad, Irfan, Yawar, Waqas, Ishaq, Arshad, Mustafa, Khushal, Murtaza, Qaiser, Farrukh, Naeem, Abbas, Qais, Idrees, Masood, Aon, Daniyal , Zaman, Zia, Obaid, Mubashar, Wasay, Yasin, Zakir, Shoaib, Bashir, Azhar, Jarrar, Waseem, Yar, Zain, Naeem, Zakaria, Jameel, Sahir, Ibrahim, Ahsan, Shafiq, Haji, Babar, Shahid, Sheraz, Saad, Ghous, Tajammul, Saif, Mohsin, Azad, Zaheer, Farooq, Rauf, Ghafoor, Babar, Sajid, Abrar, Haider, Shaukat, Omar, Sohail, Irfan, Wakeel, Wazir, Mohammad, Hadier, Shuja, Chaudhary, Adeel, Asad, Saad, Afzaal, Mudassar, Nabeel, Fazal, Altaf, Wajid, Ayaaz, Wahid, Usman, Fawad, Ajmal, Ibrahim, Raza, Danial, Rizwan, Wali]
       last_name: [Jutt, Khan, Butt, Mughal, Bhatti, Sindho, Virk, Dar, Nambardar, Qazi, Gujjar, Iqbal, Adil, Ali Raza, Azam, Zarnosh Khan, Riaz, Farid, Asim, Uzair, Tahir, Saud, Hasan, Muhammad, Tehsin, Sher, Ahmed, Tufail, Faisal, Shujaat, Shehzad, Sharjeel, A Haq Ansari, Kabir, Sheharyar, Safdar, Talat, Jalal, Hussain, Anwar, Hafeez, Ash, Rameez, Badar, Javed]
-
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
     address:
       postcode: ['####0']
       state: [Balochistan, Khyber Pakhtunkhwa, Punjab, Sindh, Islamabad Capital Territory, Federally Administered Tribal Areas, Azad Jammu and Kashmir, Gilgit-Baltistan]

src/main/resources/en-SG.yml

@@ -16,6 +16,8 @@ en-SG:
         - "#{male_english_name} #{last_name} #{male_first_name}"
         - "#{last_name} #{female_first_name}"
         - "#{female_english_name} #{last_name} #{female_first_name}"
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
     address:
       postcode: ['######']
       building_number: ['#', '##', '###']
@@ -29,3 +31,5 @@ en-SG:
       default_country: [Singapore]
     phone_number:
       formats: ['+65 6### ####', '+65 9### ####', '+65 8### ####']
+    vehicle:
+      license_plate: 'S??####'

src/main/resources/en.yml

@@ -0,0 +1,8 @@
+en:
+  time:
+    formats:
+      us: "%m/%d/%Y %I:%M %p"
+    am: "AM"
+    pm: "PM"
+  faker:
+    separator: ' & '

src/main/resources/en/address.yml

@@ -19,6 +19,7 @@ en:
         AW: "Aruba"
         AU: "Australia"
         AT: "Austria"
+        AX: "Aland Islands"
         AZ: "Azerbaijan"
         BS: "Bahamas"
         BH: "Bahrain"
@@ -31,6 +32,7 @@ en:
         BM: "Bermuda"
         BT: "Bhutan"
         BO: "Bolivia"
+        BQ: 'Bonaire'
         BA: "Bosnia And Herzegovina"
         BW: "Botswana"
         BV: "Bouvet Island"
@@ -60,6 +62,7 @@ en:
         CI: "Cote D'ivoire"
         HR: "Croatia"
         CU: "Cuba"
+        CW: "Curacao"
         CY: "Cyprus"
         CZ: "Czech Republic"
         DK: "Denmark"
@@ -94,6 +97,7 @@ en:
         GP: "Guadeloupe"
         GU: "Guam"
         GT: "Guatemala"
+        GG: 'Guernsey'
         GN: "Guinea"
         GW: "Guinea-bissau"
         GY: "Guyana"
@@ -109,10 +113,12 @@ en:
         IR: "Iran, Islamic Republic Of"
         IQ: "Iraq"
         IE: "Ireland"
+        IM: "Isle of Man"
         IL: "Israel"
         IT: "Italy"
         JM: "Jamaica"
         JP: "Japan"
+        JE: "Jersey"
         JO: "Jordan"
         KZ: "Kazakstan"
         KE: "Kenya"
@@ -167,7 +173,7 @@ en:
         NU: "Niue"
         NF: "Norfolk Island"
         MP: "Northern Mariana Islands"
-        NO: "Norway"
+        'NO': "Norway"
         OM: "Oman"
         PK: "Pakistan"
         PW: "Palau"
@@ -186,9 +192,11 @@ en:
         RO: "Romania"
         RU: "Russian Federation"
         RW: "Rwanda"
+        BL: "Saint Barthelemy"
         SH: "Saint Helena"
         KN: "Saint Kitts And Nevis"
         LC: "Saint Lucia"
+        MF: "Saint Martin"
         PM: "Saint Pierre And Miquelon"
         VC: "Saint Vincent And The Grenadines"
         WS: "Samoa"
@@ -200,12 +208,14 @@ en:
         SC: "Seychelles"
         SL: "Sierra Leone"
         SG: "Singapore"
+        SX: "Sint Maarten"
         SK: "Slovakia"
         SI: "Slovenia"
         SB: "Solomon Islands"
         SO: "Somalia"
         ZA: "South Africa"
         GS: "South Georgia And The South Sandwich Islands"
+        SS: "South Sudan"
         ES: "Spain"
         LK: "Sri Lanka"
         SD: "Sudan"
@@ -219,6 +229,7 @@ en:
         TJ: "Tajikistan"
         TZ: "Tanzania, United Republic Of"
         TH: "Thailand"
+        TL: "Timor-Leste"
         TG: "Togo"
         TK: "Tokelau"
         TO: "Tonga"
@@ -386,7 +397,6 @@ en:
         mauritania: "MR"
         mauritius: "MU"
         mayotte: "YT"
-        mexicoMX: ""
         micronesia_federated_states_of: "FM"
         moldova_republic_of: "MD"
         monaco: "MC"
@@ -409,7 +419,7 @@ en:
         niue: "NU"
         norfolk_island: "NF"
         northern_mariana_islands: "NP"
-        norway: "NP"
+        norway: "NO"
         oman: "OM"
         pakistan: "PK"
         palau: "PW"
@@ -494,7 +504,7 @@ en:
       community_prefix: [Park, Summer, Autumn, Paradise, Eagle, Pine, Royal, University, Willow]
       community_suffix: [Village, Creek, Place, Pointe, Square, Oaks, Gardens, Crossing, Court, Acres, Estates, Heights]
       community:
-      - "#{community_prefix} #{community_suffix}"
+        - "#{community_prefix} #{community_suffix}"
       street_suffix: [Alley, Avenue, Branch, Bridge, Brook, Brooks, Burg, Burgs, Bypass, Camp, Canyon, Cape, Causeway, Center, Centers, Circle, Circles, Cliff, Cliffs, Club, Common, Corner, Corners, Course, Court, Courts, Cove, Coves, Creek, Crescent, Crest, Crossing, Crossroad, Curve, Dale, Dam, Divide, Drive, Drive, Drives, Estate, Estates, Expressway, Extension, Extensions, Fall, Falls, Ferry, Field, Fields, Flat, Flats, Ford, Fords, Forest, Forge, Forges, Fork, Forks, Fort, Freeway, Garden, Gardens, Gateway, Glen, Glens, Green, Greens, Grove, Groves, Harbor, Harbors, Haven, Heights, Highway, Hill, Hills, Hollow, Inlet, Inlet, Island, Island, Islands, Islands, Isle, Isle, Junction, Junctions, Key, Keys, Knoll, Knolls, Lake, Lakes, Land, Landing, Lane, Light, Lights, Loaf, Lock, Locks, Locks, Lodge, Lodge, Loop, Mall, Manor, Manors, Meadow, Meadows, Mews, Mill, Mills, Mission, Mission, Motorway, Mount, Mountain, Mountain, Mountains, Mountains, Neck, Orchard, Oval, Overpass, Park, Parks, Parkway, Parkways, Pass, Passage, Path, Pike, Pine, Pines, Place, Plain, Plains, Plains, Plaza, Plaza, Point, Points, Port, Port, Ports, Ports, Prairie, Prairie, Radial, Ramp, Ranch, Rapid, Rapids, Rest, Ridge, Ridges, River, Road, Road, Roads, Roads, Route, Row, Rue, Run, Shoal, Shoals, Shore, Shores, Skyway, Spring, Springs, Springs, Spur, Spurs, Square, Square, Squares, Squares, Station, Station, Stravenue, Stravenue, Stream, Stream, Street, Street, Streets, Summit, Summit, Terrace, Throughway, Trace, Track, Trafficway, Trail, Trail, Tunnel, Tunnel, Turnpike, Turnpike, Underpass, Union, Unions, Valley, Valleys, Via, Viaduct, View, Views, Village, Village, Villages, Ville, Vista, Vista, Walk, Walks, Wall, Way, Ways, Well, Wells]
       secondary_address: ['Apt. ###', 'Suite ###']
       # Though these are US-specific, they are here (in the default locale) for backwards compatibility
@@ -556,20 +566,19 @@ en:
       state_abbr: [AL, AK, AZ, AR, CA, CO, CT, DE, FL, GA, HI, ID, IL, IN, IA, KS, KY, LA, ME, MD, MA, MI, MN, MS, MO, MT, NE, NV, NH, NJ, NM, NY, NC, ND, OH, OK, OR, PA, RI, SC, SD, TN, TX, UT, VT, VA, WA, WV, WI, WY]
       time_zone: [Pacific/Midway, Pacific/Pago_Pago, Pacific/Honolulu, America/Juneau, America/Los_Angeles, America/Tijuana, America/Denver, America/Phoenix, America/Chihuahua, America/Mazatlan, America/Chicago, America/Regina, America/Mexico_City, America/Mexico_City, America/Monterrey, America/Guatemala, America/New_York, America/Indiana/Indianapolis, America/Bogota, America/Lima, America/Lima, America/Halifax, America/Caracas, America/La_Paz, America/Santiago, America/St_Johns, America/Sao_Paulo, America/Argentina/Buenos_Aires, America/Guyana, America/Godthab, Atlantic/South_Georgia, Atlantic/Azores, Atlantic/Cape_Verde, Europe/Dublin, Europe/London, Europe/Lisbon, Europe/London, Africa/Casablanca, Africa/Monrovia, Etc/UTC, Europe/Belgrade, Europe/Bratislava, Europe/Budapest, Europe/Ljubljana, Europe/Prague, Europe/Sarajevo, Europe/Skopje, Europe/Warsaw, Europe/Zagreb, Europe/Brussels, Europe/Copenhagen, Europe/Madrid, Europe/Paris, Europe/Amsterdam, Europe/Berlin, Europe/Berlin, Europe/Rome, Europe/Stockholm, Europe/Vienna, Africa/Algiers, Europe/Bucharest, Africa/Cairo, Europe/Helsinki, Europe/Kiev, Europe/Riga, Europe/Sofia, Europe/Tallinn, Europe/Vilnius, Europe/Athens, Europe/Istanbul, Europe/Minsk, Asia/Jerusalem, Africa/Harare, Africa/Johannesburg, Europe/Moscow, Europe/Moscow, Europe/Moscow, Asia/Kuwait, Asia/Riyadh, Africa/Nairobi, Asia/Baghdad, Asia/Tehran, Asia/Muscat, Asia/Muscat, Asia/Baku, Asia/Tbilisi, Asia/Yerevan, Asia/Kabul, Asia/Yekaterinburg, Asia/Karachi, Asia/Karachi, Asia/Tashkent, Asia/Kolkata, Asia/Kolkata, Asia/Kolkata, Asia/Kolkata, Asia/Kathmandu, Asia/Dhaka, Asia/Dhaka, Asia/Colombo, Asia/Almaty, Asia/Novosibirsk, Asia/Rangoon, Asia/Bangkok, Asia/Bangkok, Asia/Jakarta, Asia/Krasnoyarsk, Asia/Shanghai, Asia/Chongqing, Asia/Hong_Kong, Asia/Urumqi, Asia/Kuala_Lumpur, Asia/Singapore, Asia/Taipei, Australia/Perth, Asia/Irkutsk, Asia/Ulaanbaatar, Asia/Seoul, Asia/Tokyo, Asia/Tokyo, Asia/Tokyo, Asia/Yakutsk, Australia/Darwin, Australia/Adelaide, Australia/Melbourne, Australia/Melbourne, Australia/Sydney, Australia/Brisbane, Australia/Hobart, Asia/Vladivostok, Pacific/Guam, Pacific/Port_Moresby, Asia/Magadan, Asia/Magadan, Pacific/Noumea, Pacific/Fiji, Asia/Kamchatka, Pacific/Majuro, Pacific/Auckland, Pacific/Auckland, Pacific/Tongatapu, Pacific/Fakaofo, Pacific/Apia]
       city_name:
-      - "#{city}"
+        - "#{city}"
       city:
-      - "#{city_prefix} #{Name.first_name}#{city_suffix}"
-      - "#{city_prefix} #{Name.first_name}"
-      - "#{Name.first_name}#{city_suffix}"
-      - "#{Name.last_name}#{city_suffix}"
+        - "#{city_prefix} #{Name.first_name}#{city_suffix}"
+        - "#{city_prefix} #{Name.first_name}"
+        - "#{Name.first_name}#{city_suffix}"
+        - "#{Name.last_name}#{city_suffix}"
       street_prefix: "xx"
       street_name:
-      - "#{Name.first_name} #{street_suffix}"
-      - "#{Name.last_name} #{street_suffix}"
+        - "#{Name.first_name} #{street_suffix}"
+        - "#{Name.last_name} #{street_suffix}"
       street_address:
-      - "#{building_number} #{street_name}"
+        - "#{building_number} #{street_name}"
       full_address:
-      - "#{street_address}, #{city}, #{state_abbr} #{zip_code}"
-      - "#{secondary_address} #{street_address}, #{city}, #{state_abbr} #{zip_code}"
+        - "#{street_address}, #{city}, #{state_abbr} #{zip_code}"
+        - "#{secondary_address} #{street_address}, #{city}, #{state_abbr} #{zip_code}"
       default_country: [United States of America]
-

src/main/resources/en/animal.yml

@@ -2,5 +2,5 @@ en:
   faker:
     creature:
       animal:
-        name: ["alligator", "crocodile", "alpaca", "ant", "antelope", "ape", "armadillo", "donkey", "baboon", "badger", "bat", "bear", "beaver", "bee", "beetle", "buffalo", "butterfly", "camel", "water buffalo", "caribou", "cat", "cattle", "cheetah", "chimpanzee", "chinchilla", "cicada", "clam", "cockroach", "cod", "coyote", "crab", "cricket", "crow",  "raven", "deer", "dinosaur", "dog", "dolphin", "porpoise", "duck", "eagle", "eel", "elephant", "elk", "ferret", "fish", "fly", "fox", "frog", "toad", "gerbil", "giraffe", "gnat", "gnu ", "wildebeest", "goat", "goldfish", "goose", "gorilla", "grasshopper", "guinea pig", "hamster", "hare", "hedgehog", "herring", "hippopotamus", "hornet", "horse", "hound", "hyena", "impala", "jackal", "jellyfish", "kangaroo ", "wallaby", "koala", "leopard", "lion", "lizard", "llama", "locust", "louse", "macaw", "mallard", "mammoth", "manatee", "marten", "mink", "minnow", "mole", "monkey", "moose", "mosquito", "mouse", "rat", "mule", "muskrat", "otter", "ox", "oyster", "panda", "pig", "platypus", "porcupine", "prairie dog", "pug", "rabbit", "raccoon", "reindeer", "rhinoceros", "salmon", "sardine", "scorpion", "seal ", "sea lion", "serval", "shark", "sheep", "skunk", "snail", "snake", "spider", "squirrel", "swan", "termite", "tiger", "trout", "turtle ", "tortoise", "walrus", "wasp", "weasel", "whale", "wolf", "wombat", "woodchuck", "worm", "yak", "yellowjacket", "zebra"]
-        
+        name: ["alligator", "crocodile", "alpaca", "ant", "antelope", "ape", "armadillo", "donkey", "baboon", "badger", "bat", "bear", "beaver", "bee", "beetle", "buffalo", "butterfly", "camel", "water buffalo", "caribou", "cat", "cattle", "cheetah", "chimpanzee", "chinchilla", "cicada", "clam", "cockroach", "cod", "coyote", "crab", "cricket", "crow",  "raven", "deer", "dinosaur", "dog", "dolphin", "porpoise", "duck", "eagle", "eel", "elephant", "elk", "ferret", "fish", "fly", "fox", "frog", "toad", "gerbil", "giraffe", "gnat", "gnu", "wildebeest", "goat", "goldfish", "goose", "gorilla", "grasshopper", "guinea pig", "hamster", "hare", "hedgehog", "herring", "hippopotamus", "hornet", "horse", "hound", "hyena", "impala", "jackal", "jellyfish", "kangaroo", "wallaby", "koala", "leopard", "lion", "lizard", "llama", "locust", "louse", "macaw", "mallard", "mammoth", "manatee", "marten", "mink", "minnow", "mole", "monkey", "moose", "mosquito", "mouse", "rat", "mule", "muskrat", "otter", "ox", "oyster", "panda", "pig", "platypus", "porcupine", "prairie dog", "pug", "rabbit", "raccoon", "reindeer", "rhinoceros", "salmon", "sardine", "scorpion", "seal", "sea lion", "serval", "shark", "sheep", "skunk", "snail", "snake", "spider", "squirrel", "swan", "termite", "tiger", "trout", "turtle ", "tortoise", "walrus", "wasp", "weasel", "whale", "wolf", "wombat", "woodchuck", "worm", "yak", "yellowjacket", "zebra"]
+

src/main/resources/en/aviation.yml

@@ -0,0 +1,45 @@
+en:
+  faker:
+    aviation:
+      aircraft: ["An-2", "An-3", "An-8", "An-10", "An-12", "An-24", "An-26", "An-32", "An-38", "An-70", "An-72", "An-74TK", "An-124", "An-225", "Tu-2", "Tu-4", "Tu-16", "Tu-95", "Tu-104", "Tu-114", "Tu-128", "Tu-134", "Tu-144", "Tu-154", "Tu-154M", "Tu-160", "Tu-204", "Tu-214", "Tu-334", "Il-2", "Il-4", "DB-3", "Il-28","Il-38", "Il-76", "Il-86", "Il-96", "Il-112", "Il-114", "Li-2", "Yak-1", "Yak-3", "Yak-9", "Yak-12", "Yak-18A", "Yak-18T", "Yak-52", "Yak-55", "Yak-36", "Yak-38", "Yak-130", "Yak-141", "Yak-152", "Su-2", "Su-7", "Su-7B", "Su-15", "Su-17", "Su-20", "Su-22", "Su-24", "Su-25", "Su-26", "Su-27", "Su-29", "Su-30", "Su-30MK", "Su-30MKI", "Su-32FN", "Su-34", "Su-35", "Su-37", "Su-57", "MiG-1", "MiG-3", "MiG-9", "MiG-15", "MiG-17", "MiG-19", "MiG-21", "MiG-23", "MiG-25", "MiG-29", "MiG-35", "LaGG-3", "La-5", "La-5FN", "La-7", "La-9", "Be-12", "Be-200", "VVA-14", "Cessna-172", "Cessna-182", "Cessna-152", "Cessna-120", "Cessna-140", "Cessna-208", "Mi-8", "Mi-24", "Mi-35", "Mi-17", "Mi-28", "Ka-25", "Ka-27", "Ka-50", "Ka-52", "Po-2", "U-2", "SSJ", "MS-21", "Airbus 300", "Airbus 319", "Airbus 320", "Airbus 321", "Airbus 330", "Airbus 340", "Airbus 350", "Airbus 380", "Boeing 707", "Boeing 727", "Boeing 737", "Boeing 747", "Boeing 757", "Boeing 767", "Boeing 777", "Boeing 787", "C-47", "C-130", "de Havilland Canada DHC-2 Beaver", "de Havilland Canada DHC-6 Twin Otter", "de Havilland Comet", "de Havilland Dragon", "de Havilland Sea Venom", "Piper PA-28 Cherokee", "Piper J-3 Cub", "L-410", "L-29", "L-39", "Zenith STOL CH 701", "Zenair CH 640", "Zmaj Fizir FN", "Zlín Z-50", "Beechcraft Baron", "Beechcraft Queen Air", "Saab 35 Draken", "Saab JAS 39 Gripen", "Dassault Rafale", "Dassault Mirage F1", "Dassault Mirage III", "T-38", "F-4", "F-104", "F-5", "F-105", "F-101", "F-111", "F-15", "F-16", "F-18", "F-117", "F-22", "F-35", "PC-21", "P-39", "P-40", "P-63", "A-5", "A-7", "A-9", "B-25", "B-12", "B-2", "B-52", "Catalina", "Ju-87", "Ju-88", "He-111", "Fw-190", "Bf-109", "Bf-110", "Spitfire", "Hurricane", "Harrier", "Tornado"]
+      airport: ["AGAF", "AGAT", "AYLA", "AYKY", "BGGD", "ULAA", "BIIS", "UEEE", "URWW", "SGAS", "SBSP", "SVMI", "SCRM", "VABB", "ZSPD", "YPPH", "KSFO", "MMLT", "UWKI", "UWWW", "UUBB", "UUOO", "USRR", "USDB", "UELL", "BIBA", "BIPA", "CYAB", "CYBA", "CYKA", "DAAD", "DIBU", "EBAW", "EBBR", "EBCI", "EBKT", "EBLG", "EBOS", "ELLZ", "ELUS", "ENAL", "ENAN", "ENAS", "FAMG", "FAMO", "FAPA", "FAPH", "FAPG", "FAMW", "GANR", "GCLA", "GCHI", "GASK", "GAYE", "GBYD", "GCFV", "HADD", "HADR", "KAAA", "KAPA", "LBIA", "LBPD", "LBPS", "MHAM", "MHCA", "MHCC", "MHCG", "NFCI", "NFCS", "NFFA", "OIBB", "OIAW", "OIAJ", "OIAA", "PAAK", "PAAL", "PAAM", "PAAN", "RJAA", "RJAF", "SAAC", "SAAG", "SAAJ", "TDCF", "TDPD", "TFFA", "VEAP", "VEBT", "VEAB", "VEAN", "WA44", "WAAA", "WAAB", "YABA", "YAGD", "YALA", "ZBAA", "ZBAD", "ZBAL", "ZBAR", "ZBBB", "RJAH"]
+      metar: ["METAR: ULAA 011400Z 17004MPS 120V220 9999 SCT030 18/06 Q1002 R08/190068 NOSIG RMK QFE750/1001",
+              "METAR: BIIS 101100Z 05007KT 9999 FEW025 07/M01 Q1018",
+              "METAR: UEEE 151700Z 18003MPS CAVOK 19/11 Q1006 R23L/09//60 NOSIG RMK QFE746",
+              "METAR: URWW 230800Z 02007MPS 9999 BKN050CB 21/08 Q1010 R06/010070 TEMPO -TSRA BKN030CB",
+              "METAR: VABB 302100Z 02007KT 2100 -RA SCT010 SCT015 FEW030CB OVC080 26/25 Q1002 TEMPO 1500 +RA",
+              "METAR: ZSPD 311400Z 12002MPS 080V190 9999 -SHRA NSC 23/22 Q1008 NOSIG",
+              "METAR: YPPH 011730Z 01004KT CAVOK 09/08 Q1021 NOSIG",
+              "METAR: KSFO 011356Z 25007KT 10SM FEW008 SCT013 SCT200 13/11 A3006 RMK AO2 SLP180 T01330106",
+              "METAR: MMLT 031340Z 16006KT 8SM FEW040 SCT100 28/26 A2984 RMK 8/130 HZY",
+              "METAR: NTAA 140330Z 11004KT 9999 FEW023 SCT300 22/17 Q1014 NOSIG",
+              "METAR: NCRG 130400Z AUTO 10011G23KT 070V160 9999 -RA FEW012/// SCT021/// BKN043/// 20/17 Q1020",
+              "METAR: PTSA 120350Z 25009KT 10SM SCT022 SCT130 BKN300 31/25 A2976 RMK LAST",
+              "METAR: YSSY 110700Z 14009KT 9999 VCSH FEW018 SCT022 BKN034 14/13 Q1035 NOSIG",
+              "METAR: AGGH 102330Z 11002KT 9999 FEW014 23/23 Q1011",
+              "METAR: WSSS 092200Z 15008KT 130V190 9999 FEW020 BKN300 29/24 Q1009 NOSIG",
+              "METAR: UIAA 082000Z AUTO 32002MPS 9999 NCD 16/10 Q1009 RMK QFE698/0931",
+              "METAR: ZSPD 071300Z 13004MPS CAVOK 23/22 Q1001 NOSIG",
+              "METAR: ZYHB 061600Z 20002MPS 4000 BR SCT033 23/20 Q0999 BECMG TL1420 23008MPS -TSRA",
+              "METAR: VVNB 310100Z 13008KT 9999 FEW030 32/25 Q1000 NOSIG",
+              "METAR: OIII 300500Z 18006KT CAVOK 38/02 Q1006 A2973 NOSIG",
+              "METAR: VNKT 291250Z 36004KT 7000 FEW010 SCT030 BKN100 25/22 Q1003 NOSIG",
+              "METAR: ZGKL 280600Z 32002MPS 290V350 9999 SCT043 OVC066 26/25 Q1002 RERA NOSIG",
+              "METAR: UAAA 271730Z 03003MPS 9999 FEW050 30/10 Q1007 R88/CLRD65 NOSIG",
+              "METAR: HECA 261900Z 34008KT CAVOK 33/17 Q1007 NOSIG",
+              "METAR: GOOY 251100Z 24008KT 9999 BKN011 27/22 Q1014",
+              "METAR: OSDI 241330Z 20012KT CAVOK 37/07 Q1006",
+              "METAR: ORBI 231400Z 30016KT CAVOK 45/08 Q0997 NOSIG",
+              "METAR: DAAG 221300Z 02012KT 360V070 6000 FEW026 SCT200 34/24 Q1015",
+              "METAR: DNIB 210500Z 26004KT 9999 SCT009 24/23 Q1013",
+              "METAR: FKYS 202140Z 26005KT 230V300 9999 BKN013 26/22 Q1018 BECMG BKN016",
+              "METAR: FACT 190900Z 01008KT 340V050 CAVOK 17/08 Q1024 NOSIG",
+              "METAR: DIAP 181230Z 22009KT 8000 SCT012 BKN040 27/24 Q1014 TEMPO BKN012",
+              "METAR: SCRM 171300Z 34008KT 0100 FZFG OVC003 M03/M03 Q1006",
+              "METAR: SBSP 161800Z 18008KT 4000 -RA BKN007 SCT015 OVC100 13/11 Q1019",
+              "METAR: SVMI 151204Z 14003KT 9999 SCT016 26/23 Q1013",
+              "METAR: SCIP 011500Z 33009KT 9999 SCT020 20/17 Q1016 NOSIG",
+              "METAR: SKBO 021200Z 05007KT 9999 FEW020 SCT200 11/08 A3037 NOSIG",
+              "METAR: SGAS 031230Z 19007KT 130V220 CAVOK 11/03 Q1028",
+              "METAR: MMCU 041040Z 00000KT 10SM SCT030 BKN080 BKN200 20/15 A3016 RMK 8/572 RTS",
+              "METAR: MMTJ 051141Z 00000KT 5SM OVC013 16/14 A3000 RMK SLP161 54000 918 8/5// HZY"]

src/main/resources/en/basketball.yml

@@ -0,0 +1,99 @@
+en:
+  faker:
+    basketball:
+      teams:
+        - Atlanta Hawks
+        - Boston Celtics
+        - Brooklyn Nets
+        - Charlotte Hornets
+        - Chicago Bulls
+        - Cleveland Cavaliers
+        - Dallas Mavericks
+        - Denver Nuggets
+        - Detroit Pistons
+        - Golden State Warriors
+        - Houston Rockets
+        - Indiana Pacers
+        - Los Angeles Clippers
+        - Los Angeles Lakers
+        - Memphis Grizzlies
+        - Miami Heat
+        - Milwaukee Bucks
+        - Minnesota Timberwolves
+        - New Orleans Pelicans
+        - New York Knicks
+        - Oklahoma City Thunder
+        - Orlando Magic
+        - Philadelphia 76ers
+        - Phoenix Suns
+        - Portland Trail Blazers
+        - Sacramento Kings
+        - San Antonio Spurs
+        - Toronto Raptors
+        - Utah Jazz
+        - Washington Wizards
+      players:
+        - Kemba Walker
+        - Kyrie Irving
+        - Kawhi Leonard
+        - Giannis Antetokounmpo
+        - Joel Embiid
+        - Kyle Lowry
+        - Victor Oladipo
+        - Khris Middleton
+        - Bradley Beal
+        - Ben Simmons
+        - Blake Griffin
+        - Nikola Vučević
+        - Dwayne Wade
+        - D'Angelo Russell
+        - Stephen Curry
+        - James Harden
+        - Kevin Durant
+        - Paul George
+        - LeBron James
+        - Russell Westbrook
+        - Damian Lillard
+        - Klay Thompson
+        - Anthony Davis
+        - LaMarcus Aldridge
+        - Nikola Jokić
+        - Karl-Anthony Towns
+        - Dirk Nowitzki
+      coaches:
+        - Kenny Atkinson
+        - J.B. Bickerstaff
+        - James Borrego
+        - Jim Boylen
+        - Scott Brooks
+        - Brett Brown
+        - Mike Budenholzer
+        - Rick Carlisle
+        - Dwane Casey
+        - Steve Clifford
+        - Mike D'Antoni
+        - Billy Donovan
+        - Larry Drew
+        - David Fizdale
+        - Alvin Gentry
+        - Dave Joerger
+        - Steve Kerr
+        - Igor Kokoškov
+        - Michael Malone
+        - Nate McMillan
+        - Nick Nurse
+        - Lloyd Pierce
+        - Gregg Popovich
+        - Doc Rivers
+        - Ryan Saunders
+        - Quin Snyder
+        - Erik Spoelstra
+        - Brad Stevens
+        - Terry Stotts
+        - Luke Walton
+      positions:
+        - Point Guard
+        - Shooting Guard
+        - Small Forward
+        - Power Forward
+        - Center

src/main/resources/en/beer.yml

@@ -1,8 +1,8 @@
 en:
   faker:
     beer:
-      brand: ['Corona Extra', 'Heineken', 'Budweiser', 'Becks', 'BudLight', 'Pabst Blue Ribbon', 'Dos Equis', 'Blue Moon', 'Stella Artois', 'Miller Draft', 'Coors lite' , 'Amstel', 'Guinness', 'Kirin Inchiban', 'Tsingtao', 'Sierra Nevada', 'Rolling Rock', 'Red Stripe', 'Paulaner', 'Patagonia', 'Delirium Tremens', 'Delirium Noctorum', 'Samuel Adams', 'Sapporo Premium', 'Carlsberg', 'Pacifico', 'Quimes', 'Murphys', 'Birra Moretti', 'Harp', 'Fosters', 'Hoegaarden', 'Leffe', 'Lowenbrau']
-      name: ['Pliny The Elder', 'Founders Kentucky Breakfast', 'Trappistes Rochefort 10', 'HopSlam Ale', 'Stone Imperial Russian Stout', 'St. Bernardus Abt 12', 'Founders Breakfast Stout', 'Weihenstephaner Hefeweissbier', 'Péché Mortel', 'Celebrator Doppelbock', 'Duvel', 'Dreadnaught IPA', 'Nugget Nectar', 'La Fin Du Monde', 'Bourbon County Stout', 'Old Rasputin Russian Imperial Stout', 'Two Hearted Ale', 'Ruination IPA', 'Schneider Aventinus', 'Double Bastard Ale', '90 Minute IPA', 'Hop Rod Rye', 'Trappistes Rochefort 8', 'Chimay Grande Réserve', 'Stone IPA', 'Arrogant Bastard Ale', 'Edmund Fitzgerald Porter', 'Chocolate St', 'Oak Aged Yeti Imperial Stout', 'Ten FIDY', 'Storm King Stout', 'Shakespeare Oatmeal', 'Alpha King Pale Ale', 'Westmalle Trappist Tripel', 'Samuel Smith’s Imperial IPA', 'Yeti Imperial Stout', 'Hennepin', 'Samuel Smith’s Oatmeal Stout', 'Brooklyn Black', 'Oaked Arrogant Bastard Ale', 'Sublimely Self-Righteous Ale', 'Trois Pistoles', 'Bell’s Expedition', 'Sierra Nevada Celebration Ale', 'Sierra Nevada Bigfoot Barleywine Style Ale', 'Racer 5 India Pale Ale, Bear Republic Bre', 'Orval Trappist Ale', 'Hercules Double IPA', 'Maharaj', 'Maudite']
+      brand: ['Corona Extra', 'Heineken', 'Budweiser', 'Becks', 'BudLight', 'Pabst Blue Ribbon', 'Dos Equis', 'Blue Moon', 'Stella Artois', 'Miller Draft', 'Coors lite' , 'Amstel', 'Guinness', 'Kirin', 'Tsingtao', 'Sierra Nevada', 'Rolling Rock', 'Red Stripe', 'Paulaner', 'Patagonia', 'Delirium', 'Samuel Adams', 'Sapporo', 'Carlsberg', 'Pacifico', 'Quimes', 'Murphys', 'Birra Moretti', 'Harp', 'Fosters', 'Hoegaarden', 'Leffe', 'Lowenbrau']
+      name: ['Pliny The Elder', 'Founders Kentucky Breakfast', 'Trappistes Rochefort 10', 'HopSlam Ale', 'Stone Imperial Russian Stout', 'St. Bernardus Abt 12', 'Founders Breakfast Stout', 'Weihenstephaner Hefeweissbier', 'Péché Mortel', 'Celebrator Doppelbock', 'Duvel', 'Dreadnaught IPA', 'Nugget Nectar', 'La Fin Du Monde', 'Bourbon County Stout', 'Old Rasputin Russian Imperial Stout', 'Two Hearted Ale', 'Ruination IPA', 'Schneider Aventinus', 'Double Bastard Ale', '90 Minute IPA', 'Hop Rod Rye', 'Trappistes Rochefort 8', 'Chimay Grande Réserve', 'Stone IPA', 'Arrogant Bastard Ale', 'Edmund Fitzgerald Porter', 'Chocolate St', 'Oak Aged Yeti Imperial Stout', 'Ten FIDY', 'Storm King Stout', 'Shakespeare Oatmeal', 'Alpha King Pale Ale', 'Westmalle Trappist Tripel', 'Samuel Smith’s Imperial IPA', 'Yeti Imperial Stout', 'Hennepin', 'Samuel Smith’s Oatmeal Stout', 'Brooklyn Black', 'Oaked Arrogant Bastard Ale', 'Sublimely Self-Righteous Ale', 'Trois Pistoles', 'Bell’s Expedition', 'Sierra Nevada Celebration Ale', 'Sierra Nevada Bigfoot Barleywine Style Ale', 'Racer 5 India Pale Ale, Bear Republic Bre', 'Orval Trappist Ale', 'Hercules Double IPA', 'Maharaj', 'Maudite', 'Kirin Inchiban', 'Delirium Tremens', 'Delirium Noctorum', 'Sapporo Premium']
       hop: ['Ahtanum', 'Amarillo', 'Bitter Gold', 'Bravo', 'Brewer’s Gold', 'Bullion', 'Cascade', 'Cashmere', 'Centennial', 'Chelan', 'Chinook', 'Citra', 'Cluster', 'Columbia', 'Columbus', 'Comet', 'Crystal', 'Equinox', 'Eroica', 'Fuggle', 'Galena', 'Glacier', 'Golding', 'Hallertau', 'Horizon', 'Liberty', 'Magnum', 'Millennium', 'Mosaic', 'Mt. Hood', 'Mt. Rainier', 'Newport', 'Northern Brewer', 'Nugget', 'Olympic', 'Palisade', 'Perle', 'Saaz', 'Santiam', 'Simcoe', 'Sorachi Ace', 'Sterling', 'Summit', 'Tahoma', 'Tettnang', 'TriplePearl', 'Ultra', 'Vanguard', 'Warrior', 'Willamette', 'Yakima Gol']
       yeast: ['1007 - German Ale', '1010 - American Wheat', '1028 - London Ale', '1056 - American Ale', '1084 - Irish Ale', '1098 - British Ale', '1099 - Whitbread Ale', '1187 - Ringwood Ale', '1272 - American Ale II', '1275 - Thames Valley Ale', '1318 - London Ale III', '1332 - Northwest Ale', '1335 - British Ale II', '1450 - Dennys Favorite 50', '1469 - West Yorkshire Ale', '1728 - Scottish Ale', '1968 - London ESB Ale', '2565 - Kölsch', '1214 - Belgian Abbey', '1388 - Belgian Strong Ale', '1762 - Belgian Abbey II', '3056 - Bavarian Wheat Blend', '3068 - Weihenstephan Weizen', '3278 - Belgian Lambic Blend', '3333 - German Wheat', '3463 - Forbidden Fruit', '3522 - Belgian Ardennes', '3638 - Bavarian Wheat', '3711 - French Saison', '3724 - Belgian Saison', '3763 - Roeselare Ale Blend', '3787 - Trappist High Gravity', '3942 - Belgian Wheat', '3944 - Belgian Witbier', '2000 - Budvar Lager', '2001 - Urquell Lager', '2007 - Pilsen Lager', '2035 - American Lager', '2042 - Danish Lager', '2112 - California Lager', '2124 - Bohemian Lager', '2206 - Bavarian Lager', '2278 - Czech Pils', '2308 - Munich Lager', '2633 - Octoberfest Lager Blend', '5112 - Brettanomyces bruxellensis', '5335 - Lactobacillus', '5526 - Brettanomyces lambicus', '5733 - Pediococcus']
       malt: ['Black malt', 'Caramel', 'Carapils', 'Chocolate', 'Munich', 'Caramel', 'Carapils', 'Chocolate malt', 'Munich', 'Pale', 'Roasted barley', 'Rye malt', 'Special roast', 'Victory', 'Vienna', 'Wheat mal']

src/main/resources/en/cannabis.yml

@@ -10,3 +10,4 @@ en:
       categories: ["capsules", "concentrates", "crumble", "crystalline", "distillate", "edibles", "flower", "ice hash", "live resin", "medical", "rosin", "seeds & clones", "shatter", "tinctures", "topicals", "vape pens"]
       types: ["hybrid", "indica", "sativa"]
       buzzwords: ["blunt wrap", "bong", "bottom shelf", "bubbler", "cashed", "cbd", "dank", "eighth", "gram", "high", "hydroponic", "keef", "marijuana", "mary jane", "munchies", "ounce", "papers", "pipe", "pound", "private reserve", "ripped", "spliff", "stoned", "terpene", "thc", "toke", "top shelf", "wake and bake", "weed"]
+      brands: ["8 | FOLD Cultivation", "Apothecanna", "Auntie Dolores", "Big Pete's Treats", "Bloom Farms", "CI Wholesale", "California's Finest", "Cannapunch", "Cannavore Confections", "Caviar Gold", "Cheeba Chews", "Chong's Choice", "Claw", "Coda Signature", "Colorado Cannabis Company", "Dixie Edibles", "Dixie Elixirs", "Dosist", "Evolab", "Hashman Infused", "Hiku", "Jetty Extracts", "K.I.N.D. Concentrates", "Kiva Confections", "Leafs by Snoop", "Legal Drinks", "Level Blends", "Lola Lola", "Lord Jones", "Marley Natural", "Muy", "Nature’s Medicines", "Oil Stix", "Omaha Farms", "Orchid Essentials", "OreKron", "Roots", "Seven Point", "Shore Natural RX", "Siskiyou Sungrown", "Summit", "THC Design", "THC Factory", "The Goodship Company", "The Lab", "Timeless Vapes", "True Humboldt", "Wana Brands", "Whoopie & Maya", "Willie’s Reserve", "marQaha"]

src/main/resources/en/construction.yml

@@ -1,6 +1,19 @@
 en:
   faker:
     construction:
+      heavy_equipment: [
+        "Excavator",
+        "Backhoe",
+        "Bulldozer",
+        "Skid-Steer",
+        "Grader",
+        "Crawler",
+        "Trencher",
+        "Scraper",
+        "Dump Truck",
+        "Compactor",
+        "Dragline"
+      ]
       materials: [
         "Aluminum",
         "Brass",
@@ -61,3 +74,352 @@ en:
         "Wall Protection",
         "Waterproofing & Caulking"
       ]
+      roles: [
+        "Construction Manager",
+        "Estimator",
+        "Architect",
+        "Supervisor",
+        "Construction Expeditor",
+        "Construction Worker",
+        "Engineer",
+        "Electrician",
+        "Construction Foreman",
+        "Subcontractor",
+        "Project Manager",
+        "Surveyor"
+      ]
+      trades: [
+        "Boilermaker",
+        "Brickmason",
+        "Carpenter",
+        "Tile Setter",
+        "Cement Mason",
+        "Concrete Finisher",
+        "Terrazzo",
+        "Equipment Operator",
+        "Electrician",
+        "Glazier",
+        "Linemen",
+        "Painter",
+        "Pipelayer",
+        "Plumber",
+        "Plasterers",
+        "Stucco Mason",
+        "Sheet Metal Worker",
+        "Ironworker",
+        "Laborer",
+        "Millwright",
+        "Pipefitter",
+        "Waterproofer",
+        "Safety Officer",
+        "Welder",
+        "Refridgeration",
+        "HVAC",
+        "Landscaper"
+      ]
+      standard_cost_codes: [
+        "1 - General Requirements",
+        "1-000 - Purpose",
+        "1-002 - Instructions",
+        "1-010 - Project Manager",
+        "1-011 - Project Engineer",
+        "1-012 - Superintendent",
+        "1-013 - Project Coordinator",
+        "1-014 - Project Executive",
+        "1-500 - Temporary Facilities and Controls",
+        "1-510 - Temporary Utilities",
+        "1-511 - Temporary Electricity",
+        "1-514 - Temporary Heating, Cooling and Ventilation",
+        "1-515 - Temporary Lighting",
+        "1-517 - Temporary Telephone",
+        "1-518 - Temporary Water",
+        "1-520 - Construction Facilities",
+        "1-523 - Sanitary Facilities",
+        "1-530 - Temporary Construction",
+        "1-540 - Construction Aids",
+        "1-542 - Construction Scaffolding and Platforms",
+        "1-550 - Vehicular Access and Parking",
+        "1-560 - Temporary Barriers and Enclosures",
+        "1-570 - Temporary Controls",
+        "1-580 - Project Identification",
+        "1-600 - Product Requirements (Scope of Work)",
+        "1-630 - Product Substitution Procedures",
+        "1-640 - Owner Furnished Products",
+        "1-700 - Execution Requirements",
+        "1-712 - Local Conditions",
+        "1-740 - Cleaning",
+        "1-760 - Protecting Installed Construction",
+        "1-903 - Hazardous Materials Abatement",
+        "1-904 - Hazardous Materials Removal and Disposal",
+        "2 - Site Construction",
+        "2-000 - General",
+        "2-200 - Site Preparation",
+        "2-220 - Site Demolition",
+        "2-230 - Site Clearing",
+        "2-240 - Dewatering",
+        "2-250 - Shoring and Underpinning",
+        "2-260 - Excavation Support and Protection",
+        "2-300 - Earthwork",
+        "2-310 - Grading",
+        "2-311 - Final Grading",
+        "2-312 - Rough Grading",
+        "2-315 - Excavation",
+        "2-316 - Backfilling",
+        "2-317 - Select Borrow",
+        "2-320 - Excavation and Fill",
+        "2-362 - Termite Control",
+        "2-370 - Erosion and Sedimentation Control",
+        "2-500 - Utility Services",
+        "2-540 - Septic Tank",
+        "2-621 - Foundatation Drainage Piping",
+        "2-625 - Retaining Wall Drainage Piping",
+        "2-740 - Flexible Pavement Asphalt Pavement",
+        "2-750 - Concrete Pads and Walks",
+        "2-770 - Curb and Gutters",
+        "2-780 - Clay Unit Pavers",
+        "2-781 - Asphalt Pavers",
+        "2-782 - Brick Pavers",
+        "2-783 - Interlocking Concrete Unit Paving",
+        "2-784 - Stone Unit Pavers",
+        "2-790 - Athletic Surfacing",
+        "2-795 - Porous Paving",
+        "2-800 - Site Amenities",
+        "2-812 - Drip Irrigation",
+        "2-813 - Lawn Sprinkling and Irrigation",
+        "2-815 - Fountains",
+        "2-820 - Fences and Gates",
+        "2-821 - Chain Link Fences",
+        "2-822 - Ornamental Metal Fences and Gates",
+        "2-823 - PVC Fences and Gates",
+        "2-824 - Wire Fences and Gates",
+        "2-825 - Wood Fences and Gates",
+        "2-830 - Retaining Walls",
+        "2-850 - Bridges/Footbridges",
+        "2-870 - Sculpture/Ornamental",
+        "2-900 - Landscaping",
+        "2-915 - Mulch",
+        "2-917 - Soil Preparation",
+        "2-919 - Topsoil",
+        "2-923 - Seeding and Soil Supplements",
+        "2-924 - Sodding",
+        "2-930 - Exterior Plants",
+        "2-932 - PLants and Bulbs",
+        "2-935 - Plant Maintenance",
+        "2-936 - Fertilizer",
+        "3 - Concrete",
+        "3-000 - General",
+        "3-050 - Concrete Subcontractor",
+        "3-100 - Concrete Reinforcement",
+        "3-210 - Cast-In-Place Concrete",
+        "3-230 - Anchor Bolts",
+        "3-300 - Footings",
+        "3-310 - Expansion Joints",
+        "3-320 - Slab Foundations",
+        "3-330 - Poured Concrete Basement Walls",
+        "3-350 - Concrete Finishing",
+        "3-400 - Precast Concrete",
+        "3-500 - Cementitious Decks and Underlayments",
+        "3-540 - Cementitious Underlayments",
+        "3-600 - Grouts",
+        "4 - Masonry",
+        "4-050 - Basic Masonry Materials and Methods",
+        "4-200 - Masonry Units",
+        "4-400 - Stone",
+        "4-500 - Refractories",
+        "4-600 - Corrosion-Resistant Masonry",
+        "4-700 - Simulated Masonry",
+        "4-800 - Masonry Assemblies",
+        "4-900 - Masonry Restoration and Cleaning",
+        "5 - Metals",
+        "5-050 - Basic Metal Materials and Methods",
+        "5-100 - Structural Metals",
+        "5-200 - Metal Joists",
+        "5-300 - Metal Deck",
+        "5-400 - Cold-Formed Metal Framing",
+        "5-500 - Metal Fabrications",
+        "5-600 - Hydraulic Fabrications",
+        "5-700 - Ornamental Metal",
+        "5-800 - Expansion Control",
+        "5-900 - Metal Restoration and Cleaning",
+        "6 - Wood and Plastics",
+        "6-050 - Basic Wood and Plastic Materials and Methods",
+        "6-100 - Rough Carpentry",
+        "6-200 - Finish Carpentry",
+        "6-400 - Architectural Woodwork",
+        "6-500 - Structural Plastics",
+        "6-600 - Plastic Fabrications",
+        "6-900 - Wood and Plastic Restoration and Cleaning",
+        "7 - Thermal and Moisture Protection",
+        "7-050 - Basic Thermal and Moisture Protection Materials and Methods",
+        "7-100 - Damproofing and Waterproofing",
+        "7-200 - Thermal Protection - Insulation",
+        "7-300 - Shingles, Roof Tiles, and Roof Coverings",
+        "7-400 - Roofing and Siding Panels",
+        "7-500 - Membrane Roofing",
+        "7-600 - Flashing and Sheet Metal",
+        "7-700 - Roof Specialties and Accessories",
+        "7-800 - Fire and Smoke Protection",
+        "7-900 - Joint Sealers",
+        "8 - Doors and Windows",
+        "8-050 - Basic Door and Window Materials and Methods",
+        "8-100 - Doors",
+        "8-200 - Wood and Plastic Doors",
+        "8-300 - Specialty Doors",
+        "8-400 - Entrances and Storefronts",
+        "8-500 - Windows",
+        "8-600 - Skylights",
+        "8-700 - Hardware",
+        "8-800 - Glazing",
+        "8-900 - Glazed Curtain Wall",
+        "9 - Finishes",
+        "9-050 - Basic Finish Materials and Methods",
+        "9-100 - Metal Support Assemblies",
+        "9-250 - Gypsum Wallboard",
+        "9-300 - Tile",
+        "9-400 - Terrazzo",
+        "9-500 - Ceilings",
+        "9-600 - Flooring",
+        "9-680 - Carpet",
+        "9-700 - Wall Finishes",
+        "9-800 - Acoustical Treatment",
+        "9-900 - Paints and Coatings",
+        "10 - Specialties",
+        "10-100 - Visual Display Boards",
+        "10-150 - Compartments and Cubicles",
+        "10-200 - Louvers and Vents",
+        "10-240 - Grilles and Screens",
+        "10-250 - Service Walls",
+        "10-260 - Wall and Corner Guards",
+        "10-270 - Access Flooring",
+        "10-290 - Pest Control",
+        "10-300 - Fireplaces and Stoves",
+        "10-340 - Manufactured Exterior Specialties",
+        "10-350 - Flagpoles",
+        "10-400 - Identification Devices",
+        "10-450 - Pedestrian Control Devices",
+        "10-500 - Lockers",
+        "10-520 - Fire Protection Specialties",
+        "10-530 - Protective Covers",
+        "10-550 - Postal Specialties",
+        "10-600 - Partitions",
+        "10-670 - Storage Shelving",
+        "10-700 - Exterior Protection",
+        "10-750 - Telephone Specialties",
+        "10-800 - Toilet, Bath, and Laundry Specialties",
+        "10-820 - Bathroom Accessories",
+        "10-880 - Scales",
+        "10-900 - Wardrobe and Closet Specialties",
+        "11 - Equipment",
+        "11-010 - Maintenance Equipment",
+        "11-020 - Security and Vault Equipment",
+        "11-030 - Teller and Service Equipment",
+        "11-040 - Ecclesiastical Equipment",
+        "11-050 - Library Equipment",
+        "11-060 - Theater and Stage Equipment",
+        "11-070 - Instrumental Equipment",
+        "11-080 - Registration Equipment",
+        "11-090 - Checkroom Equipment",
+        "11-100 - Mercantile Equipment",
+        "11-110 - Commercial Laundry and Dry Cleaning Equipment",
+        "11-120 - Vending Equipment",
+        "11-130 - Audio-Visual Equipment",
+        "11-140 - Vehicle Service Equipment",
+        "11-150 - Parking Control Equipment",
+        "11-160 - Loading Dock Equipment",
+        "11-170 - Solid Waste Handling Equipment",
+        "11-190 - Detention Equipment",
+        "11-200 - Water Supply and Treatment Equipment",
+        "11-280 - Hydraulic Gates and Valves",
+        "11-300 - Fluid Waste Treatment and Disposal Equipment",
+        "11-400 - Food Service Equipment",
+        "11-450 - Residential Equipment",
+        "11-460 - Unit Kitchens",
+        "11-470 - Darkroom Equipment",
+        "11-480 - Athletic, Recreational, and Therapeutic Equipment",
+        "11-500 - Industrial and Process Equipment",
+        "11-600 - Laboratory Equipment",
+        "11-650 - Planetarium Equipment",
+        "11-660 - Observatory Equipment",
+        "11-680 - Office Equipment",
+        "11-700 - Medical Equipment",
+        "11-780 - Mortuary Equipment",
+        "11-850 - Navigation Equipment",
+        "11-870 - Agricultural Equipment",
+        "11-900 - Exhibit Equipment",
+        "12 - Furnishings",
+        "12-050 - Fabrics",
+        "12-100 - Art",
+        "12-300 - Manufactured Casework",
+        "12-400 - Furnishings and Accessories",
+        "12-500 - Furniture",
+        "12-600 - Multiple Seating",
+        "12-700 - Systems Furniture",
+        "12-800 - Interior Plants and Planters",
+        "12-900 - Furnishings Restoration and Repair",
+        "13 - Special Construction",
+        "13-010 - Air-Supported Structures",
+        "13-020 - Building Modules",
+        "13-030 - Special Purpose Rooms",
+        "13-080 - Sound, Vibration, and Seismic Control",
+        "13-090 - Radiation Protection",
+        "13-100 - Lightning Protection",
+        "13-110 - Cathodic Protection",
+        "13-120 - Pre-Engineered Structures",
+        "13-150 - Swimming Pools",
+        "13-160 - Aquariums",
+        "13-165 - Aquatic Park Facilities",
+        "13-170 - Tubs and Pools",
+        "13-175 - Ice Rinks",
+        "13-185 - Kennels and Animal Shelters",
+        "13-190 - Site-Constructed Incinerators",
+        "13-200 - Storage Tanks",
+        "13-220 - Filter Underdrains and Media",
+        "13-230 - Digester Covers and Appurtenances",
+        "13-240 - Oxygenation Systems",
+        "13-260 - Sludge Conditioning Systems",
+        "13-280 - Hazardous Material Remediation",
+        "13-400 - Measurement and Control Instrumentation",
+        "13-500 - Recording Instrumentation",
+        "13-550 - Transportation Control Instrumentation",
+        "13-600 - Solar and Wind Energy Equipment",
+        "13-700 - Security Access and Surveillance",
+        "13-800 - Building Automation and Control",
+        "13-850 - Detection and Alarm",
+        "13-900 - Fire Suppression",
+        "14 - Conveying Systems",
+        "14-100 - Dumbwaiters",
+        "14-200 - Elevators",
+        "14-300 - Escalators and Moving Walks",
+        "14-400 - Lifts",
+        "14-500 - Material Handling",
+        "14-600 - Hoists and Cables",
+        "14-700 - Turntables",
+        "14-800 - Scaffolding",
+        "14-900 - Transportation",
+        "15 - Mechanical",
+        "15-050 - Basic Mechanical Materials and Methods",
+        "15-100 - Plumbing",
+        "15-200 - Process Piping",
+        "15-300 - Fire Protection Piping",
+        "15-400 - Plumbing Fixtures and Equipment",
+        "15-500 - Heat-Generation Equipment",
+        "15-600 - Refrigeration Equipment",
+        "15-700 - Heating, Venting and Air Conditioning",
+        "15-800 - Air Distribution",
+        "15-900 - HVAC Instruments and Controls",
+        "15-950 - Testing, Adjusting, and Balancing",
+        "16 - Electrical",
+        "16-050 - Basic Electrical Materials and Methods",
+        "16-100 - Electrical",
+        "16-200 - Electrical Power",
+        "16-300 - Transmission and Distribution",
+        "16-400 - Low-Voltage Distribution",
+        "16-500 - Lighting",
+        "16-700 - Communications",
+        "16-800 - Sound and Video",
+        "17 - Markup and Contingency",
+        "17-010 - Contingency",
+        "17-020 - Insurance",
+        "17-030 - Bond",
+        "17-040 - Profit"
+      ]

src/main/resources/en/country.yml

@@ -0,0 +1,9 @@
+en:
+  faker:
+    country:
+      code2: ['af', 'al', 'dz', 'ad', 'ao', 'ag', 'ar', 'am', 'au', 'at', 'az', 'bs', 'bh', 'bd', 'bb', 'by', 'be', 'bz', 'bj', 'bt', 'bo', 'ba', 'bw', 'br', 'bn', 'bg', 'bf', 'bi', 'cv', 'kh', 'cm', 'ca', 'cf', 'td', 'cl', 'cn', 'co', 'km', 'cg', 'cd', 'cr', 'ci', 'hr', 'cu', 'cy', 'cz', 'dk', 'dj', 'dm', 'do', 'ec', 'eg', 'sv', 'gq', 'er', 'ee', 'sz', 'et', 'fj', 'fi', 'fr', 'ga', 'gm', 'ge', 'de', 'gh', 'gr', 'gd', 'gt', 'gn', 'gw', 'gy', 'ht', 'hn', 'hu', 'is', 'in', 'id', 'ir', 'iq', 'ie', 'il', 'it', 'jm', 'jp', 'jo', 'kz', 'ke', 'ki', 'kp', 'kr', 'kw', 'kg', 'la', 'lv', 'lb', 'ls', 'lr', 'ly', 'li', 'lt', 'lu', 'mk', 'mg', 'mw', 'my', 'mv', 'ml', 'mt', 'mh', 'mr', 'mu', 'mx', 'fm', 'md', 'mc', 'mn', 'me', 'ma', 'mz', 'mm', 'na', 'nr', 'np', 'nl', 'nz', 'ni', 'ne', 'ng', 'no', 'om', 'pk', 'pw', 'pa', 'pg', 'py', 'pe', 'ph', 'pl', 'pt', 'qa', 'ro', 'ru', 'rw', 'kn', 'lc', 'vc', 'ws', 'sm', 'st', 'sa', 'sn', 'rs', 'sc', 'sl', 'sg', 'sk', 'si', 'sb', 'so', 'za', 'ss', 'es', 'lk', 'sd', 'sr', 'se', 'ch', 'sy', 'tj', 'tz', 'th', 'tl', 'tg', 'to', 'tt', 'tn', 'tr', 'tm', 'tv', 'ug', 'ua', 'ae', 'gb', 'us', 'uy', 'uz', 'vu', 've', 'vn', 'ye', 'zm', 'zw']
+      code3: ['afg', 'alb', 'dza', 'and', 'ago', 'atg', 'arg', 'arm', 'aus', 'aut', 'aze', 'bhs', 'bhr', 'bgd', 'brb', 'blr', 'bel', 'blz', 'ben', 'btn', 'bol', 'bih', 'bwa', 'bra', 'brn', 'bgr', 'bfa', 'bdi', 'cpv', 'khm', 'cmr', 'can', 'caf', 'tcd', 'chl', 'chn', 'col', 'com', 'cog', 'cod', 'cri', 'civ', 'hrv', 'cub', 'cyp', 'cze', 'dnk', 'dji', 'dma', 'dom', 'ecu', 'egy', 'slv', 'gnq', 'eri', 'est', 'swz', 'eth', 'fji', 'fin', 'fra', 'gab', 'gmb', 'geo', 'deu', 'gha', 'grc', 'grd', 'gtm', 'gin', 'gnb', 'guy', 'hti', 'hnd', 'hun', 'isl', 'ind', 'idn', 'irn', 'irq', 'irl', 'isr', 'ita', 'jam', 'jpn', 'jor', 'kaz', 'ken', 'kir', 'prk', 'kor', 'kwt', 'kgz', 'lao', 'lva', 'lbn', 'lso', 'lbr', 'lby', 'lie', 'ltu', 'lux', 'mkd', 'mdg', 'mwi', 'mys', 'mdv', 'mli', 'mlt', 'mhl', 'mrt', 'mus', 'mex', 'fsm', 'mda', 'mco', 'mng', 'mne', 'mar', 'moz', 'mmr', 'nam', 'nru', 'npl', 'nld', 'nzl', 'nic', 'ner', 'nga', 'nor', 'omn', 'pak', 'plw', 'pan', 'png', 'pry', 'per', 'phl', 'pol', 'prt', 'qat', 'rou', 'rus', 'rwa', 'kna', 'lca', 'vct', 'wsm', 'smr', 'stp', 'sau', 'sen', 'srb', 'syc', 'sle', 'sgp', 'svk', 'svn', 'slb', 'som', 'zaf', 'ssd', 'esp', 'lka', 'sdn', 'sur', 'swe', 'che', 'syr', 'tjk', 'tza', 'tha', 'tls', 'tgo', 'ton', 'tto', 'tun', 'tur', 'tkm', 'tuv', 'uga', 'ukr', 'are', 'gbr', 'usa', 'ury', 'uzb', 'vut', 'ven', 'vnm', 'yem', 'zmb', 'zwe']
+      name: ["Afghanistan", "Albania", "Algeria", "Andorra", "Angola", "Antigua and Barbuda", "Argentina", "Armenia", "Australia", "Austria", "Azerbaijan", "Bahamas", "Bahrain", "Bangladesh", "Barbados", "Belarus", "Belgium", "Belize", "Benin", "Bhutan", "Bolivia (Plurinational State of)", "Bosnia and Herzegovina", "Botswana", "Brazil", "Brunei Darussalam", "Bulgaria", "Burkina Faso", "Burundi", "Cabo Verde", "Cambodia", "Cameroon", "Canada", "Central African Republic", "Chad", "Chile", "China", "Colombia", "Comoros", "Congo", "Congo, Democratic Republic of the", "Costa Rica", "Côte d'Ivoire", "Croatia", "Cuba", "Cyprus", "Czechia", "Denmark", "Djibouti", "Dominica", "Dominican Republic", "Ecuador", "Egypt", "El Salvador", "Equatorial Guinea", "Eritrea", "Estonia", "Eswatini", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Gambia", "Georgia", "Germany", "Ghana", "Greece", "Grenada", "Guatemala", "Guinea", "Guinea-Bissau", "Guyana", "Haiti", "Honduras", "Hungary", "Iceland", "India", "Indonesia", "Iran (Islamic Republic of)", "Iraq", "Ireland", "Israel", "Italy", "Jamaica", "Japan", "Jordan", "Kazakhstan", "Kenya", "Kiribati", "Korea (Democratic People's Republic of)", "Korea, Republic of", "Kuwait", "Kyrgyzstan", "Lao People's Democratic Republic", "Latvia", "Lebanon", "Lesotho", "Liberia", "Libya", "Liechtenstein", "Lithuania", "Luxembourg", "Macedonia, the former Yugoslav Republic of", "Madagascar", "Malawi", "Malaysia", "Maldives", "Mali", "Malta", "Marshall Islands", "Mauritania", "Mauritius", "Mexico", "Micronesia (Federated States of)", "Moldova, Republic of", "Monaco", "Mongolia", "Montenegro", "Morocco", "Mozambique", "Myanmar", "Namibia", "Nauru", "Nepal", "Netherlands", "New Zealand", "Nicaragua", "Niger", "Nigeria", "Norway", "Oman", "Pakistan", "Palau", "Panama", "Papua New Guinea", "Paraguay", "Peru", "Philippines", "Poland", "Portugal", "Qatar", "Romania", "Russian Federation", "Rwanda", "Saint Kitts and Nevis", "Saint Lucia", "Saint Vincent and the Grenadines", "Samoa", "San Marino", "Sao Tome and Principe", "Saudi Arabia", "Senegal", "Serbia", "Seychelles", "Sierra Leone", "Singapore", "Slovakia", "Slovenia", "Solomon Islands", "Somalia", "South Africa", "South Sudan", "Spain", "Sri Lanka", "Sudan", "Suriname", "Sweden", "Switzerland", "Syrian Arab Republic", "Tajikistan", "Tanzania, United Republic of", "Thailand", "Timor-Leste", "Togo", "Tonga", "Trinidad and Tobago", "Tunisia", "Turkey", "Turkmenistan", "Tuvalu", "Uganda", "Ukraine", "United Arab Emirates", "United Kingdom of Great Britain and Northern Ireland", "United States of America", "Uruguay", "Uzbekistan", "Vanuatu", "Venezuela (Bolivarian Republic of)", "Viet Nam", "Yemen", "Zambia", "Zimbabwe"]
+      capital: ["Hargeisa", "King Edward Point", "Port-aux-Français", "Jerusalem", "Mariehamn", "Yaren", "Marigot", "Atafu", "El-Aaiún", "Kabul", "Tirana", "Algiers", "Pago Pago", "Andorra la Vella", "Luanda", "The Valley", "Saint John's", "Buenos Aires", "Yerevan", "Oranjestad", "Canberra", "Vienna", "Baku", "Nassau", "Manama", "Dhaka", "Bridgetown", "Minsk", "Brussels", "Belmopan", "Porto-Novo", "Hamilton", "Thimphu", "La Paz", "Sarajevo", "Gaborone", "Brasilia", "Road Town", "Bandar Seri Begawan", "Sofia", "Ouagadougou", "Rangoon", "Bujumbura", "Phnom Penh", "Yaounde", "Ottawa", "Praia", "George Town", "Bangui", "N'Djamena", "Santiago", "Beijing", "The Settlement", "West Island", "Bogota", "Moroni", "Kinshasa", "Brazzaville", "Avarua", "San Jose", "Yamoussoukro", "Zagreb", "Havana", "Willemstad", "Nicosia", "Prague", "Copenhagen", "Djibouti", "Roseau", "Santo Domingo", "Quito", "Cairo", "San Salvador", "Malabo", "Asmara", "Tallinn", "Addis Ababa", "Stanley", "Torshavn", "Suva", "Helsinki", "Paris", "Papeete", "Libreville", "Banjul", "Tbilisi", "Berlin", "Accra", "Gibraltar", "Athens", "Nuuk", "Saint George's", "Hagatna", "Guatemala City", "Saint Peter Port", "Conakry", "Bissau", "Georgetown", "Port-au-Prince", "Vatican City", "Tegucigalpa", "Budapest", "Reykjavik", "New Delhi", "Jakarta", "Tehran", "Baghdad", "Dublin", "Douglas", "Jerusalem", "Rome", "Kingston", "Tokyo", "Saint Helier", "Amman", "Astana", "Nairobi", "Tarawa", "Pyongyang", "Seoul", "Pristina", "Kuwait City", "Bishkek", "Vientiane", "Riga", "Beirut", "Maseru", "Monrovia", "Tripoli", "Vaduz", "Vilnius", "Luxembourg", "Skopje", "Antananarivo", "Lilongwe", "Kuala Lumpur", "Male", "Bamako", "Valletta", "Majuro", "Nouakchott", "Port Louis", "Mexico City", "Palikir", "Chisinau", "Monaco", "Ulaanbaatar", "Podgorica", "Plymouth", "Rabat", "Maputo", "Windhoek", "Kathmandu", "Amsterdam", "Noumea", "Wellington", "Managua", "Niamey", "Abuja", "Alofi", "Kingston", "Saipan", "Oslo", "Muscat", "Islamabad", "Melekeok", "Panama City", "Port Moresby", "Asuncion", "Lima", "Manila", "Adamstown", "Warsaw", "Lisbon", "San Juan", "Doha", "Bucharest", "Moscow", "Kigali", "Gustavia", "Jamestown", "Basseterre", "Castries", "Saint-Pierre", "Kingstown", "Apia", "San Marino", "Sao Tome", "Riyadh", "Dakar", "Belgrade", "Victoria", "Freetown", "Singapore", "Philipsburg", "Bratislava", "Ljubljana", "Honiara", "Mogadishu", "Pretoria", "Juba", "Madrid", "Colombo", "Khartoum", "Paramaribo", "Longyearbyen", "Mbabane", "Stockholm", "Bern", "Damascus", "Taipei", "Dushanbe", "Dar es Salaam", "Bangkok", "Dili", "Lome", "Nuku'alofa", "Port of Spain", "Tunis", "Ankara", "Ashgabat", "Grand Turk", "Funafuti", "Kampala", "Kyiv", "Abu Dhabi", "London", "Washington", "Montevideo", "Tashkent", "Port-Vila", "Caracas", "Hanoi", "Charlotte Amalie", "Mata-Utu", "Sanaa", "Lusaka", "Harare", "Washington", "North Nicosia", "Diego Garcia"]
+      currency: ["Afghani", "Euro", "Lek", "Algerian Dinar", "US Dollar", "Euro", "Kwanza", "East Caribbean Dollar", "No universal currency", "East Caribbean Dollar", "Argentine Peso", "Armenian Dram", "Aruban Florin", "Australian Dollar", "Euro", "Azerbaijan Manat", "Bahamian Dollar", "Bahraini Dinar", "Taka", "Barbados Dollar", "Belarusian Ruble", "Euro", "Belize Dollar", "CFA Franc BCEAO", "Bermudian Dollar", "Indian Rupee", "Ngultrum", "Boliviano", "Mvdol", "US Dollar", "Convertible Mark", "Pula", "Norwegian Krone", "Brazilian Real", "US Dollar", "Brunei Dollar", "Bulgarian Lev", "CFA Franc BCEAO", "Burundi Franc", "Cabo Verde Escudo", "Riel", "CFA Franc BEAC", "Canadian Dollar", "Cayman Islands Dollar", "CFA Franc BEAC", "CFA Franc BEAC", "Chilean Peso", "Unidad de Fomento", "Yuan Renminbi", "Australian Dollar", "Australian Dollar", "Colombian Peso", "Unidad de Valor Real", "Comorian Franc ", "Congolese Franc", "CFA Franc BEAC", "New Zealand Dollar", "Costa Rican Colon", "CFA Franc BCEAO", "Kuna", "Cuban Peso", "Peso Convertible", "Netherlands Antillean Guilder", "Euro", "Czech Koruna", "Danish Krone", "Djibouti Franc", "East Caribbean Dollar", "Dominican Peso", "US Dollar", "Egyptian Pound", "El Salvador Colon", "US Dollar", "CFA Franc BEAC", "Nakfa", "Euro", "Ethiopian Birr", "Euro", "Falkland Islands Pound", "Danish Krone", "Fiji Dollar", "Euro", "Euro", "Euro", "CFP Franc", "Euro", "CFA Franc BEAC", "Dalasi", "Lari", "Euro", "Ghana Cedi", "Gibraltar Pound", "Euro", "Danish Krone", "East Caribbean Dollar", "Euro", "US Dollar", "Quetzal", "Pound Sterling", "Guinean Franc", "CFA Franc BCEAO", "Guyana Dollar", "Gourde", "US Dollar", "Australian Dollar", "Euro", "Lempira", "Hong Kong Dollar", "Forint", "Iceland Krona", "Indian Rupee", "Rupiah", "SDR (Special Drawing Right)", "Iranian Rial", "Iraqi Dinar", "Euro", "Pound Sterling", "New Israeli Sheqel", "Euro", "Jamaican Dollar", "Yen", "Pound Sterling", "Jordanian Dinar", "Tenge", "Kenyan Shilling", "Australian Dollar", "North Korean Won", "Won", "Kuwaiti Dinar", "Som", "Lao Kip", "Euro", "Lebanese Pound", "Loti", "Rand", "Liberian Dollar", "Libyan Dinar", "Swiss Franc", "Euro", "Euro", "Pataca", "Denar", "Malagasy Ariary", "Malawi Kwacha", "Malaysian Ringgit", "Rufiyaa", "CFA Franc BCEAO", "Euro", "US Dollar", "Euro", "Ouguiya", "Mauritius Rupee", "Euro", "ADB Unit of Account", "Mexican Peso", "Mexican Unidad de Inversion (UDI)", "US Dollar", "Moldovan Leu", "Euro", "Tugrik", "Euro", "East Caribbean Dollar", "Moroccan Dirham", "Mozambique Metical", "Kyat", "Namibia Dollar", "Rand", "Australian Dollar", "Nepalese Rupee", "Euro", "CFP Franc", "New Zealand Dollar", "Cordoba Oro", "CFA Franc BCEAO", "Naira", "New Zealand Dollar", "Australian Dollar", "US Dollar", "Norwegian Krone", "Rial Omani", "Pakistan Rupee", "US Dollar", "No universal currency", "Balboa", "US Dollar", "Kina", "Guarani", "Sol", "Philippine Peso", "New Zealand Dollar", "Zloty", "Euro", "US Dollar", "Qatari Rial", "Euro", "Romanian Leu", "Russian Ruble", "Rwanda Franc", "Euro", "Saint Helena Pound", "East Caribbean Dollar", "East Caribbean Dollar", "Euro", "Euro", "East Caribbean Dollar", "Tala", "Euro", "Dobra", "Saudi Riyal", "CFA Franc BCEAO", "Serbian Dinar", "Seychelles Rupee", "Leone", "Singapore Dollar", "Netherlands Antillean Guilder", "Sucre", "Euro", "Euro", "Solomon Islands Dollar", "Somali Shilling", "Rand", "No universal currency", "South Sudanese Pound", "Euro", "Sri Lanka Rupee", "Sudanese Pound", "Surinam Dollar", "Norwegian Krone", "Lilangeni", "Swedish Krona", "Swiss Franc", "WIR Euro", "WIR Franc", "Syrian Pound", "New Taiwan Dollar", "Somoni", "Tanzanian Shilling", "Baht", "US Dollar", "CFA Franc BCEAO", "New Zealand Dollar", "Pa’anga", "Trinidad and Tobago Dollar", "Tunisian Dinar", "Turkish Lira", "Turkmenistan New Manat", "US Dollar", "Australian Dollar", "Uganda Shilling", "Hryvnia", "UAE Dirham", "Pound Sterling", "US Dollar", "US Dollar", "US Dollar (Next day)", "Peso Uruguayo", "Uruguay Peso en Unidades Indexadas (UI)", "Unidad Previsional", "Uzbekistan Sum", "Vatu", "Bolívar Soberano", "Dong", "US Dollar", "US Dollar", "CFP Franc", "Moroccan Dirham", "Yemeni Rial", "Zambian Kwacha", "Zimbabwe Dollar"]
+      currency_code: ["AFN", "EUR", "ALL", "DZD", "USD", "EUR", "AOA", "XCD", "XCD", "ARS", "AMD", "AWG", "AUD", "EUR", "AZN", "BSD", "BHD", "BDT", "BBD", "BYN", "EUR", "BZD", "XOF", "BMD", "INR", "BTN", "BOB", "BOV", "USD", "BAM", "BWP", "NOK", "BRL", "USD", "BND", "BGN", "XOF", "BIF", "CVE", "KHR", "XAF", "CAD", "KYD", "XAF", "XAF", "CLP", "CLF", "CNY", "AUD", "AUD", "COP", "COU", "KMF", "CDF", "XAF", "NZD", "CRC", "XOF", "HRK", "CUP", "CUC", "ANG", "EUR", "CZK", "DKK", "DJF", "XCD", "DOP", "USD", "EGP", "SVC", "USD", "XAF", "ERN", "EUR", "ETB", "EUR", "FKP", "DKK", "FJD", "EUR", "EUR", "EUR", "XPF", "EUR", "XAF", "GMD", "GEL", "EUR", "GHS", "GIP", "EUR", "DKK", "XCD", "EUR", "USD", "GTQ", "GBP", "GNF", "XOF", "GYD", "HTG", "USD", "AUD", "EUR", "HNL", "HKD", "HUF", "ISK", "INR", "IDR", "XDR", "IRR", "IQD", "EUR", "GBP", "ILS", "EUR", "JMD", "JPY", "GBP", "JOD", "KZT", "KES", "AUD", "KPW", "KRW", "KWD", "KGS", "LAK", "EUR", "LBP", "LSL", "ZAR", "LRD", "LYD", "CHF", "EUR", "EUR", "MOP", "MKD", "MGA", "MWK", "MYR", "MVR", "XOF", "EUR", "USD", "EUR", "MRU", "MUR", "EUR", "XUA", "MXN", "MXV", "USD", "MDL", "EUR", "MNT", "EUR", "XCD", "MAD", "MZN", "MMK", "NAD", "ZAR", "AUD", "NPR", "EUR", "XPF", "NZD", "NIO", "XOF", "NGN", "NZD", "AUD", "USD", "NOK", "OMR", "PKR", "USD", "PAB", "USD", "PGK", "PYG", "PEN", "PHP", "NZD", "PLN", "EUR", "USD", "QAR", "EUR", "RON", "RUB", "RWF", "EUR", "SHP", "XCD", "XCD", "EUR", "EUR", "XCD", "WST", "EUR", "STN", "SAR", "XOF", "RSD", "SCR", "SLL", "SGD", "ANG", "XSU", "EUR", "EUR", "SBD", "SOS", "ZAR", "SSP", "EUR", "LKR", "SDG", "SRD", "NOK", "SZL", "SEK", "CHF", "CHE", "CHW", "SYP", "TWD", "TJS", "TZS", "THB", "USD", "XOF", "NZD", "TOP", "TTD", "TND", "TRY", "TMT", "USD", "AUD", "UGX", "UAH", "AED", "GBP", "USD", "USD", "USN", "UYU", "UYI", "UYW", "UZS", "VUV", "VES", "VND", "USD", "USD", "XPF", "MAD", "YER", "ZMW", "ZWL"]

src/main/resources/en/crypto_coin.yml

@@ -1,9 +1,25 @@
 en:
   faker:
     crypto_coin:
-      coin: 
-        - "Bitcoin,   BTC,  https://i.imgur.com/psBNOBq.png"
-        - "Litecoin,  LTC,  https://i.imgur.com/EFz61Ei.png"
-        - "Dash,      DASH, https://i.imgur.com/2uX91cb.png"
-        - "Ethereum,  ETH,  https://i.imgur.com/uOPFCXj.png"
-        - "Ripple,    XRP,  https://i.imgur.com/GjAPSsL.png"
+      coin:
+        - "Bitcoin,          BTC,  https://i.imgur.com/psBNOBq.png"
+        - "Bitcoin Cash,     BCC,  https://i.imgur.com/ViTjr9u.png"
+        - "Bitcoin Gold,     BTG,  https://i.imgur.com/l9cVE7c.png"
+        - "Bitcoin SV,       BSV,  https://i.imgur.com/DkixrAc.png"
+        - "Binance Coin,     BNB,  https://i.imgur.com/2HJr7OR.png"
+        - "Cardano,          ADA,  https://i.imgur.com/8qGU4zg.png"
+        - "Dash,             DASH, https://i.imgur.com/2uX91cb.png"
+        - "Decred,           DCR,  https://i.imgur.com/nURXAC2.png"
+        - "EOS.IO,           EOS,  https://i.imgur.com/Cr2w77s.png"
+        - "Ethereum,         ETH,  https://i.imgur.com/uOPFCXj.png"
+        - "Ethereum Classic, ETC,  https://i.imgur.com/8wBtmQA.png"
+        - "IOTA,             IOT,  https://i.imgur.com/DGFCOVt.png"
+        - "Litecoin,         LTC,  https://i.imgur.com/EFz61Ei.png"
+        - "Monero,           XMR,  https://i.imgur.com/pnupcJM.png"
+        - "NEM,              XEM,  https://i.imgur.com/SJ8NteF.png"
+        - "NEO,              NEO,  https://i.imgur.com/BmtVrJi.png"
+        - "Ripple,           XRP,  https://i.imgur.com/GjAPSsL.png"
+        - "Stellar,          XLM,  https://i.imgur.com/COLIHUE.png"
+        - "Tether,           USDT, https://i.imgur.com/xk6pQZy.png"
+        - "TRON,             TRX,  https://i.imgur.com/grG05ZK.png"
+        - "Zcash,            ZEC,  https://i.imgur.com/mX3r4j9.png"

src/main/resources/en/culture_series.yml

@@ -0,0 +1,307 @@
+en:
+  faker:
+    culture_series:
+      books:
+      - Consider Phlebas
+      - The Player of Games
+      - Use of Weapons
+      - The State of the Art
+      - Excession
+      - Inversions
+      - Look to Windward
+      - Matter
+      - Surface Detail
+      - The Hydrogen Sonata
+      culture_ships:
+      - Bora Horza Gobuchul
+      - Determinist
+      - Eschatologist
+      - Irregular Apocalypse
+      - No More Mr Nice Guy
+      - Profit Margin
+      - Nervous Energy
+      - Prosthetic Conscience
+      - Revisionist
+      - Trade Surplus
+      - The Ends Of Invention
+      - Cargo Cult
+      - Little Rascal
+      - So Much For Subtlety
+      - Unfortunate Conflict Of Evidence
+      - Youthful Indiscretion
+      - Flexible Demeanour
+      - Just Read The Instructions
+      - Of Course I Still Love You
+      - Zealot
+      - Limiting Factor
+      - Gunboat Diplomat
+      - Kiss My Ass
+      - Prime Mover
+      - Screw Loose
+      - Bad For Business
+      - Ablation
+      - Arbitrary
+      - Arrested Development
+      - A Series Of Unlikely Explanations
+      - A Ship With A View
+      - Big Sexy Beast
+      - Boo!
+      - Cantankerous
+      - Credibility Problem
+      - Dramatic Exit
+      - Excuses And Accusations
+      - Funny, It Worked Last Time...
+      - God Told Me To Do It
+      - Halation Effect
+      - Happy Idiot Talk
+      - Helpless In The Face Of Your Beauty
+      - Heresiarch
+      - I Thought He Was With You
+      - It'll Be Over By Christmas
+      - Just Another Victim Of The Ambient Morality
+      - Minority Report
+      - Never Talk To Strangers
+      - Not Wanted On Voyage
+      - Only Slightly Bent
+      - Perfidy
+      - Sacrificial Victim
+      - Space Monster
+      - Stranger Here Myself
+      - Synchronize Your Dogmas
+      - Thank You And Goodnight
+      - The Precise Nature Of The Catastrophe
+      - Ultimate Ship The Second
+      - Undesirable Alien
+      - Unwitting Accomplice
+      - Well I Was In The Neighbourhood
+      - You'll Thank Me Later
+      - You Would If You Really Loved Me
+      - Congenital Optimist
+      - Size Isn't Everything
+      - What Are The Civilian Applications?
+      - Just Testing
+      - Sweet and Full of Grace
+      - Very Little Gravitas Indeed
+      - Xenophobe
+      - Anticipation Of A New Lover's Arrival, The
+      - Death And Gravity
+      - Ethics Gradient
+      - Honest Mistake
+      - Limivorous
+      - Uninvited Guest
+      - Use Psychology
+      - What Is The Answer And Why?
+      - Wisdom Like Silence
+      - Yawning Angel
+      - Zero Gravitas
+      - Not Invented Here
+      - Misophist
+      - Serious Callers Only
+      - Steely Glint
+      - Different Tan
+      - Fate Amenable To Change
+      - It's Character Forming
+      - Jaundiced Outlook
+      - Problem Child
+      - Reasonable Excuse
+      - Recent Convert
+      - Tactical Grace
+      - Unacceptable Behaviour
+      - Attitude Adjuster
+      - Heavy Messing
+      - Killing Time
+      - Frank Exchange Of Views
+      - T3OU 4
+      - T3OU 118
+      - T3OU 736
+      - Charitable View
+      - Just Passing Through
+      - I Blame My Mother
+      - I Blame Your Mother
+      - Full Refund
+      - MBU 604
+      - Quietly Confident , later Sleeper Service
+      - No Fixed Abode
+      - Highpoint
+      - Shoot Them Later
+      - Appeal To Reason
+      - Break Even
+      - Long View
+      - Peace Makes Plenty
+      - Sober Counsel
+      - Within Reason
+      - Lasting Damage
+      - Lasting Damage I
+      - Lasting Damage II
+      - Sanctioned Parts List
+      - Grey Area
+      - Meatfucker
+      - Nuisance Value
+      - Resistance Is Character-Forming
+      - Vulgarian
+      - Someone Else's Problem
+      - Lacking That Small Match Temperament
+      - Poke It With A Stick
+      - I Said, I've Got A Big Stick
+      - Hand Me The Gun And Ask Me Again
+      - But Who's Counting?
+      - Germane Riposte
+      - We Haven't Met But You're A Great Fan Of Mine
+      - All The Same, I Saw It First
+      - Ravished By The Sheer Implausibility Of That Last Statement
+      - Zero Credibility
+      - Charming But Irrational
+      - Demented But Determined
+      - You May Not Be The Coolest Person Here
+      - Lucid Nonsense
+      - Awkward Customer
+      - Thorough But... Unreliable
+      - Advanced Case Of Chronic Patheticism
+      - Another Fine Product From The Nonsense Factory
+      - Conventional Wisdom
+      - In One Ear
+      - Fine Till You Came Along
+      - I Blame The Parents
+      - Inappropriate Response
+      - A Momentary Lapse Of Sanity
+      - Lapsed Pacifist
+      - Reformed Nice Guy
+      - Pride Comes Before A Fall
+      - Injury Time
+      - Now Look What You've Made Me Do
+      - Kiss This Then
+      - Seed Drill
+      - Don't Try This At Home
+      - Xenoglossicist
+      - Subtle Shift In Emphasis
+      - Experiencing A Significant Gravitas Shortfall
+      - It's My Party And I'll Sing If I Want To
+      - Lightly Seared On The Reality Grill
+      - Pure Big Mad Boat Man
+      - Qualifier
+      - Transient Atmospheric Phenomenon
+      - You Naughty Monsters
+      - Eight Rounds Rapid
+      - You'll Clean That Up Before You Leave
+      - Now We Try It My Way
+      - Liveware Problem
+      - Dressed Up To Party
+      - Pelagian
+      - Sense Amid Madness, Wit Amidst Folly
+      - Total Internal Reflection
+      - Armchair Traveller
+      - Bodhisattva , OAQS
+      - Falling Outside The Normal Moral Constraints
+      - No One Knows What The Dead Think
+      - Hylozoist
+      - The Usual But Etymologically Unsatisfactory
+      - Beastly To The Animals
+      - Fixed Grin
+      - Hidden Income
+      - Scar Glamour
+      - Labtebricolephile
+      - Me, I'm Counting
+      - A Fine Disregard For Awkward Facts
+      - Contents May Differ
+      - Empiricist
+      - Just The Washing Instruction Chip In Life's Rich Tapestry
+      - Kakistocrat
+      - Teething Problems
+      - Unreliable Witness
+      - Passing By And Thought I'd Drop In
+      - Pressure Drop
+      - You Call This Clean?
+      - Displacement Activity
+      - Warm, Considering
+      - Anything Legal Considered
+      - Beats Working
+      - Headcrash
+      - Questionable Ethics
+      - Xenocrat
+      - Caconym
+      - New Toy
+      - Rapid Random Response Unit
+      - Learned Response
+      - Outstanding Contribution To The Historical Process
+      - Refreshingly Unconcerned With The Vulgar Exigencies Of Veracity
+      - Value Judgement
+      - Zoologist
+      - Mistake Not...
+      - Smile Tolerantly
+      culture_ship_classes:
+      - General Systems Vehicle
+      - Medium Systems Vehicle
+      - Limited Systems Vehicle
+      - General Contact Vehicle
+      - General Contact Unit
+      - Limited Contact Unit
+      - Rapid Offensive Unit
+      - General Offensive Unit
+      - Limited Offensive Unit
+      - Demilitarised ROU
+      - Demilitarised GOU
+      - Demilitarised LOU
+      - Very Fast Picket
+      - Fast Picket
+      - Superlifter
+      culture_ship_class_abvs:
+      - GSV
+      - MSV
+      - LSV
+      - GCV
+      - GCU
+      - LCU
+      - ROU
+      - GOU
+      - LOU
+      - "(D)ROU"
+      - "(D)GOU"
+      - "(D)LOU"
+      - VFP
+      - FP
+      - SL
+      civs:
+      - "'Ktik"
+      - Affront
+      - Aultridia
+      - Azadian
+      - Birilisi
+      - Bithian
+      - Bulbitian
+      - Changer
+      - Chelgrian
+      - Culture
+      - Dra'azon
+      - Flekke
+      - Geseptian-Fardesile
+      - Gzilt
+      - Homomda
+      - Idiran
+      - Iln
+      - Involucra AKA Veil
+      - Jhlupe
+      - Medjel
+      - Liseiden
+      - Morthanveld
+      - Nariscene
+      - Nauptre
+      - Oct
+      - Pavulean
+      - Ronte
+      - Sichultia
+      - Tensile Xinthian Aeronathaur
+      - Xolpe
+      - Zihdra
+      planets:
+      - Bulthmaas
+      - Chel
+      - Eä
+      - Idir
+      - Issorile
+      - Narisca
+      - Nauptria
+      - Pavul
+      - Sichult
+      - Telaturier
+      - Xinth
+      - Zunzil Ligature

src/main/resources/en/dc_comics.yml

@@ -5,7 +5,7 @@ en:
       "Batman", "Superman", "Red Arrow", "Green Lantern", "Robin",
       "Nightwing", "The Flash", "Aquaman", "Green Arrow", "Captain Marvel",
       "Shazam", "Martain Manhunter", "Cyborg", "Hawkman", "Speedy", "Arsenal",
-      "Red Tornado","Booster Gold", "Doctor Fate", "Beast Boy", "Plastic Man",
+      "Red Tornado", "Booster Gold", "Doctor Fate", "Beast Boy", "Plastic Man",
       "Captain Atom", "Tempest", "Spectre", "Midnighter", "The Atom", "Kilowog",
       "Firestorm", "Blue Beetle", "Animal Man", "Mr. Miracle", "Wildcat",
       "Rorschach", "Dr. Manhattan", "Nite Owl", "The Comedian", "Azrael",
@@ -21,7 +21,7 @@ en:
       villain: [
       "The Joker", "Lex Luthor", "Darkseid", "Sinestro", "Brainiac", "Black Adam",
       "Ras al Ghul", "Deathstroke", "Two-Face", "Doomsday", "Catwoman", "Mongul",
-      "Bizaroo", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
+      "Bizarro", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
       "Paralax", "Gorilla Grodd", "General Zod", "Black Manta", "Mr. Freeze",
       "Cheetah", "Amanda Waller", "Penguin", "Poison Ivy", "Solomon Grundy",
       "Parasite", "Krona", "Deadshot", "Metallo", "Lobo", "Eclipso", "Ares",
@@ -39,14 +39,14 @@ en:
       ]
       title: [
       "The Sinestro Corps War", "The Coyote Gospel", "Green Arrow: The Longbow Hunters",
-      "Jla: Earth 2 ", "Identity Crisis", "Jla: Tower Of Babel", "Superman For All Seasons",
+      "JLA: Earth 2", "Identity Crisis", "JLA: Tower Of Babel", "Superman For All Seasons",
       "Superman: Red Son", "Batman: The Long Halloween", "Swamp Thing: The Anatomy Lesson",
-      "For The Man Who Has Everything", "Jack Kirby'S New Gods",
+      "For The Man Who Has Everything", "Jack Kirby's New Gods",
       "Arkham Asylum: A Serious House On Serious Earth", "Snowbirds Don't Fly",
       "Whatever Happened To The Man Of Tomorrow?", "The Killing Joke",
       "Teen Titans: The Judas Contract", "The New Frontier",
       "Kingdom Come", "Crisis On Infinite Earths",
       "Batman: Year One", "All Star Superman", "The Dark Knight Returns",
-      "Multiversity", "Gotham Central", "Grant Morrison'S Animal Man",
+      "Multiversity", "Gotham Central", "Grant Morrison's Animal Man",
       "Doom Patrol", "Action Comics", "Detective Comics"
       ]

src/main/resources/en/dog.yml

@@ -10,4 +10,3 @@ en:
         coat_length: ["hairless", "short", "medium", "long", "wire", "curly"]
         size: ["small", "medium", "large", "extra large"]
         gender: ["female", "male"]
-

src/main/resources/en/dota.yml

@@ -2,7 +2,7 @@ en:
   faker:
     games:
       dota:
-        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk"]
+        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk", "Meepo"]
         abaddon:
           quote: ["You have called death upon yourself.", "From House Avernus, I set forth.", "The mist chose me, it is not mine to command.", "To die at a noble hand is no guarantee of a noble death."]
         alchemist:
@@ -45,6 +45,8 @@ en:
           quote: ["A wolf in man's clothing.", "Who fears the wolf should fear the forest.", "A peaceful man is but a patient wolf."]
         magnus:
           quote: ["Under my hoof you will find your fate.", "My horn is sharp, my pike is sharper still.", "Compared to my horn, all precious items are cheap."]
+        meepo:
+          quote: ["Got dirt between my toes.", "One paw in front of the other!", "What's up Meepo?", "Have shovel, will bury. You.", "They should call you Ain't-Mage.", "You punched out all of my blood!", "Try that again, tough guy!"]
         night_stalker:
           quote: ["Day walker, night stalker.", "Devil by day, demon by night.", "Flesh sustains, gold remains.", "I feed the darkness and the darkness feeds me."]
         omniknight:

src/main/resources/en/elder_scrolls.yml

@@ -1,5 +1,5 @@
-en:  
-  faker: 
+en:
+  faker:
     games:
       elder_scrolls:
         race: ["Altmer", "Argonian", "Bosmer", "Breton", "Dunmer", "Dwemer", "Imperial", "Khajiit", "Nord", "Orc", "Redguard","Riekling"]
@@ -9,3 +9,48 @@ en:
         city: ["Solitude", "Winterhold", "Markarth", "Daggerfall", "Silvenar", "Tignus", "Lainlyn", "Dwyynen", "Glenpoint", "Whiterun", "Falkreath","Ykalon","Kozanset", "Kambria","Menevia", "Betony", "Northmoor", "Tulune", "Alcaire", "Verkarth", "Davon's Watch",    "Abah's Landing", "Clockwork City", "Wayrest", "Stormhold", "Sentinel", "Dawnstar", "Morthal","Riften","Windhelm","Dragon Bridge","Helgen", "Ivarstead", "Karthwasten", "Riverwood", "Rorikstead", "Shor's Stone"]
         first_name: ["Balgruuf", "Ralof", "Hadvar", "Irileth", "Gormlaith", "Farengar", "Felldir", "Hakon", "Iddra", "Malborn", "Tsun","Ysgramor", "Tsun", "Gerdur", "Dirge", "Orgnar", "Septimus", "Urag", "Brynjolf", "Faralda", "Vignar", "Elenwen", "Rulindil",  "Gissur", "Drahff", "Hewnon", "Gian", "Sulla", "Umana", "J'darr", "Astrid", "Nazir", "Maliq", "Babette",  "Gabriella", "Festus", "Arnbjorn", "Veezara", "Kodlak", "Aela", "Farkas", "Vilkas", "Skjor", "Athis", "Njada", "Ria", "Torvar", "Brill", "Eorlund", "Tilma", "Hestla", "Askar","Mercer", "Delvin", "Vex", "Tonilia", "Sapphire",  "Cynric", "Niruin", "Rune", "Thrynn", "Vipir", "Garthar", "Ravyn", "Etienne", "Molgrom", "Karliah", "Syndus",  "Vanryth", "Gulum-Ei", "Enthir", "Niranye", "Endon", "Mallus", "Athel", "Glover", "Erikur", "Ri'saad", "Atahbah",  "Ma'randru-jo", "Khayla", "Ahkari", "Zaynabi", "Dro'marash", "Kharjo", "Ma'dran", "Ma'jhad", "Ra'zhinda", "Mjoll",  "Brand-shei", "Inigo"]
         last_name: ["The Old", "The Greater", "The Lesser", "One-Eye", "Golden-Hilt", "Secret-Fire", "Septim", "Signus", "gro-Shub","Gray-Mane", "Black-Skeever", "The Fist", "Krex", "Whitemane", "Hunter", "Stonearm","The Haggard", "The Unbroken",   "The Man", "Ember-Master", "Battle-Born", "Black-Briar", "Lothaire", "Frey", "Mallory", "Endell", "The Fleet",   "Imyan", "Rarnis", "Twice-Killed", "Gatharian", "Maccius", "Newberry", "Cruel-Sea", "The Lion"]
+        quote: [
+          "You plod along, putting one foot before the other, look up, and suddenly, there you are. Right where you wanted to be all along.",
+          "Combatant from the blue team. You may leave the arena and rest now. You have earned it.",
+          "Sometimes life puts you in difficult circumstances you didn't choose. But being happy or unhappy is a choice you make, and I've chosen to make the best of things that I can.",
+          "My father taught me an important lesson many years ago. He said, 'Gwinlin, you have the whole world before you. Go out and experience it... be whatever you want to be.' So I took his advice, and here I am. This life might not look like much to you, but I'm content, and isn't that all that matters?",
+          "What is better: To be born good, or to overcome one's evil nature through great effort?",
+          "Wealth beyond measure, Outlander.",
+          "May your roads lead to warm sands.",
+          "I still don't know if there is a divine plan, but I've come to realize that it doesn't matter. What matters is that we act; that we do what's right when confronted with evil. That's what you did at Kvatch. It wasn't the gods that saved us, it was you.",
+          "What a fool you are. I'm a god! How can you kill a god? How could you be so naive? What a grand and intoxicating innocence. There is no escape. No recall or intervention works in this place. Come, lay down your weapons. It is not to late for my mercy.",
+          "Never should have come here.",
+          "The best techniques are passed on by the survivors.",
+          "The results of hard work and dedication always look like luck. But you know you've earned every ounce of your success.",
+          "Wake up. We're here. Why are you shaking? Are you okay? Wake up.",
+          "Not even last quarter's storm could wake you. I heard them say we've reached Adulthood, I'm sure they'll let us go.",
+          "Quiet, here comes the guard. You better do what they say.",
+          "Do you get to the cloud district very often?",
+          "Change will preserve us! It is the lifeblood of the world. It will move mountains! It will mount movements!",
+          "It's the grand champion! I can't believe it's you, standing here, next to me!",
+          "Why walk when you can ride?",
+          "Remember, your mind is the best weapon you have.",
+          "Brave hearts beat lesser ones. That's the decider.",
+          "Use Nature's gifts wisely. Respect her power, and fear her fury.",
+          "Treasure the gifts of friendship. Seek joy and inspiration in the mysteries of love.",
+          "Wait, I know you",
+          "Candy, candy -- he makes so much. Uncle Sweetshare has a magic touch! So it's back to the workshop in the snow! With lovely lanterns all aglow! He he! Ha ho! He he he ha ha ho!",
+          "Let me guess, somebody stole your sweetroll.",
+          "Can't wait to count out your coin!",
+          "You will find your own path. Take care... there will be blood and death before the end.",
+          "My ancestors are smiling at me, Imperials. Can you say the same?",
+          "KHAJIIT HAS WARES, IF YOU HAVE COIN",
+          "STOP RIGHT THERE YOU CRIMINAL SCUM!",
+          "Stupid bees and their stupid honey!",
+          "Have you heard of the high elves?",
+          "Sheggorath, you are the Skooma Cat, for what is crazier than a cat on skooma?",
+          "When we understand the events that occur to us, the events become history. History is understanding. Otherwise we are all just dumb animals trying to get in out of the cold.",
+          "Hey, there's my new pal! So what can I do for you? Need some items? Or maybe you ready to unload something? Whatever you need!",
+          "Children, listen as the shadows cross your sleeping hutch, And the village sleeps away, streets emptied of the crowds, And the moons do balefully glare through the nightly clouds, And the graveyard's people rest, we hope, in eternal sleep, Listen and you'll hear the whispered tap of the footsteps creep, Then pray you'll never feel the Worm King's awful touch.",
+          "He killed them! All of those people! We… we have to get him before he gets us! We have to kill that murdering swine!",
+          "Skooma! Oh yeah… You want to… want to be my friend? I'll… I'll tell you what… Skooma's the only thing… the only thing I want…",
+          "You impossible fool. What possessed you to think I would suggest a meeting here, of all places?",
+          "Some may call this junk, me, I call them treasures.",
+          "I'd be a lot happier and a lot warmer with a belly full of mead.",
+          "No lollygagin",
+          "I'm not a man, I'm a weapon in human form."]

src/main/resources/en/game.yml

@@ -0,0 +1,283 @@
+en:
+  faker:
+    game:
+      title:
+        - 'Half-Life'
+        - 'Half-Life: Opposing Force'
+        - 'Half-Life: Blue Shift'
+        - 'Half-Life 2'
+        - 'Half-Life 2: Episode One'
+        - 'Half-Life 2: Episode Two'
+        - 'Half-Life 2: Lost Coast'
+        - 'Portal'
+        - 'Portal 2'
+        - 'Team Fortress Classic'
+        - 'Team Fortress 2'
+        - 'Left 4 Dead'
+        - 'Left 4 Dead 2'
+        - 'Day of Defeat'
+        - 'Ricochet'
+        - 'Dota 2'
+        - 'Counter-Strike'
+        - 'Counter-Strike: Source'
+        - 'Counter-Strike: Global Offensive'
+        - "Garry's Mod"
+        - 'Super Mario Bros.'
+        - 'Super Mario Bros. 2'
+        - 'Super Mario Bros. 3'
+        - 'Super Mario World'
+        - 'Super Mario Sunshine'
+        - 'Super Mario Galaxy'
+        - 'Super Mario Galaxy 2'
+        - 'Super Mario Odyssey'
+        - 'Mario Kart 64'
+        - 'Mario Kart: Double Dash'
+        - 'Mario Kart DS'
+        - 'Mario Kart Wii'
+        - 'Mario Kart 7'
+        - 'Mario Kart 8'
+        - 'Mario Kart 8 Deluxe'
+        - "Luigi's Mansion"
+        - 'Animal Crossing'
+        - 'Animal Crossing: Wild World'
+        - 'Animal Crossing: City Folk'
+        - 'Animal Crossing: New Leaf'
+        - 'Civilization III'
+        - 'Civilization IV'
+        - 'Civilization V'
+        - 'Civilization VI'
+        - 'The Legend of Zelda'
+        - 'The Legend of Zelda: Ocarina of Time'
+        - "The Legend of Zelda: Majora's Mask"
+        - 'The Legend of Zelda: Twilight Princess'
+        - 'The Legend of Zelda: Skyward Sword'
+        - 'The Legend of Zelda: Breath of the Wild'
+        - 'Pong'
+        - 'Pac-Man'
+        - 'Starcraft'
+        - 'Starcraft II'
+        - 'Overwatch'
+        - 'Hearthstone'
+        - 'Halo: Combat Evolved'
+        - 'Halo 2'
+        - 'Halo 3'
+        - 'Halo 3: ODST'
+        - 'Halo: Reach'
+        - 'Halo 4'
+        - 'Halo 5: Guardians'
+        - 'Wii Sports'
+        - 'Wii Sports Resort'
+        - 'Wii Play'
+        - 'Wii Music'
+        - 'Pokémon Red'
+        - 'Pokémon Blue'
+        - 'Pokémon Yellow'
+        - 'Pokémon Gold'
+        - 'Pokémon Silver'
+        - 'Pokémon Crystal'
+        - 'Pokémon Ruby'
+        - 'Pokémon Sapphire'
+        - 'Pokémon FireRed'
+        - 'Pokémon LeafGreen'
+        - 'Pokémon Emerald'
+        - 'Pokémon Diamond'
+        - 'Pokémon Pearl'
+        - 'Pokémon Platinum'
+        - 'Pokémon HeartGold'
+        - 'Pokémon SoulSilver'
+        - 'Pokémon Black'
+        - 'Pokémon White'
+        - 'Pokémon Black 2'
+        - 'Pokémon White 2'
+        - 'Pokémon X'
+        - 'Pokémon Y'
+        - 'Pokémon Omega Ruby'
+        - 'Pokémon Alpha Sapphire'
+        - 'Pokémon Sun'
+        - 'Pokémon Moon'
+        - 'Pokémon Ultra Sun'
+        - 'Pokémon Ultra Moon'
+        - "Pokémon: Let's Go Pikachu!"
+        - "Pokémon: Let's Go Eevee!"
+        - 'Pokémon Sword'
+        - 'Pokémon Shield'
+        - 'Doom'
+        - 'Doom II'
+        - 'Doom 3: BFG'
+        - 'Quake'
+        - 'Wolfenstein 3D'
+        - 'Wolfenstein: The New Order'
+        - 'Wolfenstein: The Old Blood'
+        - 'Wolfenstein 2: The New Colossus'
+        - 'Puyo Puyo Tetris'
+        - 'Katamari Damacy'
+        - 'Bastion'
+        - 'Transistor'
+        - 'System Shock'
+        - 'BioShock'
+        - 'BioShock Infinite'
+        - 'Deus Ex'
+        - 'Metroid Prime'
+        - 'Metroid Prime 2: Echoes'
+        - 'Metroid Prime 3: Corruption'
+        - 'Super Meat Boy'
+        - 'Super Smash Bros. Brawl'
+        - 'Super Smash Bros. Melee'
+        - 'Super Smash Bros. Ultimate'
+        - 'Thief II'
+        - 'Vampire: The Masquerade – Bloodlines'
+        - 'Myst'
+        - 'Batman: Arkham Asylum'
+        - 'Batman: Arkham City'
+        - 'Dishonored'
+        - 'God of War'
+        - 'LittleBigPlanet'
+        - 'Grim Fandango'
+        - 'Day of the Tentacle'
+        - 'Kingdom Hearts'
+        - 'Kingdom Hearts II'
+        - 'The Last of Us'
+        - 'Perfect Dark'
+        - 'Shadow of the Colossus'
+        - 'Fallout: New Vegas'
+        - 'Fire Emblem Awakening'
+        - "Banjo-Kazooie: Grunty's Revenge"
+        - 'Banjo-Kazooie: Nuts & Bolts'
+        - 'Firewatch'
+        - 'Mass Effect'
+        - 'Mass Effect 2'
+        - 'Mass Effect 3'
+        - 'Mega Man'
+        - 'Mega Man Battle Network'
+        - 'Bayonetta'
+        - 'Bayonetta 2'
+        - 'The Wonderful 101'
+        - 'Sleeping Dogs'
+        - 'Battletoads'
+        - 'Brütal Legend'
+        - 'Halo Wars'
+        - 'Clannad'
+        - 'Highway Blossoms'
+        - 'Infamous'
+        - 'Crash Bandicoot'
+        - 'Just Cause'
+        - 'Just Cause 2'
+        - 'Devil May Cry'
+        - 'Life is Strange'
+        - 'WarioWare: Smooth Moves'
+        - 'WarioWare: Touched!'
+        - 'Dwarf Fortress'
+        - 'Dungeon Keeper'
+        - 'Minecraft'
+        - 'Fortnite'
+        - "PlayerUnknown's Battlegrounds"
+        - "Kirby's Adventure"
+        - "Kirby's Dream Land"
+        - "Kirby's Epic Yarn"
+        - "Yoshi's Wooly World"
+        - 'L.A. Noire'
+        - 'Kid Icarus'
+        - 'Ice Climbers'
+        - 'Crysis'
+        - 'Crysis 2'
+        - 'Hitman: Absolution'
+        - 'Metal Gear Solid'
+        - 'F-Zero'
+        - 'F.E.A.R.'
+        - 'Max Payne'
+        - 'Max Payne 2: The Fall of Max Payne'
+        - 'Max Payne 3'
+        - 'Far Cry'
+        - 'Castle Crashers'
+        - 'Sonic Unleashed'
+        - "Mirror's Edge"
+        - 'The Witcher'
+        - 'The Witcher 2: Assassins of Kings'
+        - 'The Witcher 3: Wild Hunt'
+        - 'Monster Hunter: World'
+        - 'Call of Duty'
+        - 'Call of Duty 4: Modern Warfare'
+        - 'Call of Duty: Modern Warfare Remastered'
+        - 'Call of Duty: Modern Warfare 2'
+        - 'Call of Duty: Modern Warfare 3'
+        - 'Call of Duty: World at War'
+        - 'Call of Duty: Black Ops'
+        - 'Call of Duty: Black Ops II'
+        - 'Call of Duty: Black Ops III'
+        - 'Call of Duty: Black Ops 4'
+        - 'Shadow Tactics: Blade of the Shogun'
+        - 'Commandos: Behind Enemy Lines'
+        - 'Commandos: Beyond the Call of Duty'
+        - 'Commandos 2: Men of Courage'
+        - 'Commandos 3: Destination Berlin'
+        - 'Commandos: Strike Force'
+        - 'Desperados: Wanted Dead or Alive'
+        - "Desperados 2: Cooper's Revenge"
+        - 'Helldorado'
+        - 'Desperados III'
+        - 'Diablo'
+        - 'Diablo II'
+        - 'Diablo III'
+        - 'Guitar Hero'
+      genre:
+        - 'First-person shooter'
+        - 'Puzzle'
+        - 'Platformer'
+        - 'Action'
+        - 'Adventure'
+        - 'Real-time strategy'
+        - 'Action role-playing'
+        - 'Dungeon crawl'
+        - 'Roguelike'
+        - 'Tactical role-playing'
+        - 'Sports'
+        - 'Simulation'
+        - 'Fighting'
+        - 'Massively multiplayer online'
+        - 'Stealth'
+        - 'Survival'
+        - 'Rhythm'
+        - 'Survival horror'
+        - 'Text adventure'
+        - 'Visual novel'
+        - 'Real-time strategy'
+        - 'Multiplayer online battle arena'
+        - 'Tower defense'
+        - 'Trivia'
+        - 'Real-time tactics'
+        - 'Hack and slash'
+        - 'Battle royale'
+        - 'Third-person shooter'
+        - 'Music'
+      platform:
+        - 'Xbox'
+        - 'Xbox 360'
+        - 'Xbox One'
+        - 'PlayStation'
+        - 'PlayStation 2'
+        - 'PlayStation 3'
+        - 'PlayStation 4'
+        - 'PlayStation Portable'
+        - 'PlayStation Vita'
+        - 'Game Boy'
+        - 'Game Boy Color'
+        - 'Game Boy Advance'
+        - 'Nintendo DS'
+        - 'Nintendo DSi'
+        - 'Nintendo 3DS'
+        - 'Nintendo Entertainment System'
+        - 'Super Nintendo Entertainment System'
+        - 'Nintendo 64'
+        - 'GameCube'
+        - 'Wii'
+        - 'Wii U'
+        - 'Nintendo Switch'
+        - 'Windows'
+        - 'macOS'
+        - 'Linux'
+        - 'Sega Genesis'
+        - 'Sega Master System'
+        - 'Game Gear'
+        - 'Sega Saturn'
+        - 'Sega Dreamcast'
+        - 'Virtual Boy'

src/main/resources/en/grateful_dead.yml

@@ -44,4 +44,5 @@ en:
               "The Music Never Stopped",
               "Black Muddy River",
               "Looks Like Rain",
-              "Bird Song"]
+              "Bird Song",
+              "Cassidy"]

src/main/resources/en/heroes_of_the_storm.yml

@@ -2,6 +2,6 @@ en:
   faker:
     heroes_of_the_storm:
       battlegrounds: ["Alterac Pass", "Battlefield of Eternity", "Blackheart's Bay", "Braxis Holdout", "Cursed Hollow", "Dragon Shire", "Garden of Terror", "Hanamura Temple", "Haunted Mines", "Infernal Shrines", "Sky Temple", "Tomb of the Spider Queen", "Towers of Doom", "Volskaya Foundry", "Warhead Junction"]
-      classes: ["Assasin", "Multiclass", "Specialist", "Support", "Warrior"]
-      heroes: ["Abathur", "Alarak", "Alexstrasza", "Ana", "Anub'arak", "Artanis", "Arthas", "Auriel", "Azmodan", "Blaze", "Brightwing", "Cassia", "Chen", "Cho", "Chromie", "D.Va", "Deckard", "Dehaka", "Diablo", "E.T.C.", "Falstad", "Fenix", "Gall", "Garrosh", "Gazlowe", "Genji", "Greymane", "Gul'dan", "Hanzo", "Illidan", "Jaina", "Johanna", "Junkrat", "Kael'thas", "Kel'Thuzad", "Kerrigan", "Kharazim", "Leoric", "Li Li", "Li-Ming", "Lt. Morales", "Lunara", "Lúcio", "Maiev", "Mal'Ganis", "Malfurion", "Malthael", "Medivh", "Mephisto", "Muradin", "Murky", "Nazeebo", "Nova", "Orphea", "Probius", "Ragnaros", "Raynor", "Rehgar", "Rexxar", "Samuro", "Sgt. Hammer", "Sonya", "Stitches", "Stukov", "Sylvanas", "Tassadar", "The Butcher", "The Lost Vikings", "Thrall", "Tracer", "Tychus", "Tyrael", "Tyrande", "Uther", "Valeera", "Valla", "Whitemane", "Xul", "Yrel", "Zagara", "Zarya", "Zeratul", "Zul'jin"]
+      classes: ["Bruiser", "Healer", "Melee Assassin", "Ranged Assassin", "Support", "Tank"]
+      heroes: ["Abathur", "Alarak", "Alexstrasza", "Ana", "Anduin", "Anub'arak", "Artanis", "Arthas", "Auriel", "Azmodan", "Blaze", "Brightwing", "Cassia", "Chen", "Cho", "Chromie", "D.Va", "Deckard", "Dehaka", "Diablo", "E.T.C.", "Falstad", "Fenix", "Gall", "Garrosh", "Gazlowe", "Genji", "Greymane", "Gul'dan", "Hanzo", "Illidan", "Imperius", "Jaina", "Johanna", "Junkrat", "Kael'thas", "Kel'Thuzad", "Kerrigan", "Kharazim", "Leoric", "Li Li", "Li-Ming", "Lt. Morales", "Lunara", "Lúcio", "Maiev", "Mal'Ganis", "Malfurion", "Malthael", "Medivh", "Mephisto", "Muradin", "Murky", "Nazeebo", "Nova", "Orphea", "Probius", "Ragnaros", "Raynor", "Rehgar", "Rexxar", "Samuro", "Sgt. Hammer", "Sonya", "Stitches", "Stukov", "Sylvanas", "Tassadar", "The Butcher", "The Lost Vikings", "Thrall", "Tracer", "Tychus", "Tyrael", "Tyrande", "Uther", "Valeera", "Valla", "Whitemane", "Xul", "Yrel", "Zagara", "Zarya", "Zeratul", "Zul'jin"]
       quotes: ["Beat them like they owe you money!", "Careful wizard, your kind has upset the balance beforeo I become re-dead? Deader? ... Alive?\"", "Don't forget to check the pocket!", "Have you ever considered aiming anywhere other than the face?", "Hey, you look like the cover of E.T.C.s new album!", "Human words are hard to make together talking for expressing... things!", "I like happy things! Like puppies, and rainbows, and dead enemies!", "I must leave and I blame this failure upon you.", "Mrgrgrlrgrlgr!!!", "Oh my God, I can't believe I just killed a panda.", "Taunting life form; you are weak! And physically unappealing!", "Teammates. Much to improve.\" is a pretty good contender.", "That was easy! You were easy to kill!", "This will only hurt until you die.", "Ugh, I've known much better healers.", "We drink first blood!", "You look like you could actually be of use here!", "You might be a king, or just a street sweeper... yet sooner or later you dance with the reaper.", "You see this hero yes? Then kill them!", "You think us fools?", "You waste both my time and your breath, and the former has value."]

src/main/resources/en/internet.yml

@@ -10,16 +10,79 @@ en:
       user_agent:
         aol:
           - Mozilla/5.0 (compatible; MSIE 9.0; AOL 9.7; AOLBuild 4343.19; Windows NT 6.1; WOW64; Trident/5.0; FunWebProducts)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; SV1)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; .NET CLR 1.1.4322)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; SV1; FunWebProducts; .NET CLR 1.1.4322)
+          - Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.0; Windows NT 5.1; .NET CLR 1.1.4322)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows 98)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; .NET CLR 1.0.3705)
+          - Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.1; SV1; .NET CLR 1.0.3705; .NET CLR 1.1.4322; Media Center PC 4.0)
         chrome:
           - Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36
+          - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36
+          - Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36
+          - Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.157 Safari/537.36
+          - Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.71 Safari/537.36
+          - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36
+          - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36
+          - Mozilla/5.0 (Windows NT 5.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36
+          - Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.90 Safari/537.36
+          - Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36
         firefox:
           - Mozilla/5.0 (Windows NT x.y; Win64; x64; rv:10.0) Gecko/20100101 Firefox/10.0
+          - Mozilla/5.0 (Windows NT 5.1; rv:36.0) Gecko/20100101 Firefox/36.0
+          - Mozilla/5.0 (Windows NT 5.1; rv:33.0) Gecko/20100101 Firefox/33.0
+          - Mozilla/5.0 (Windows NT 10.0; WOW64; rv:50.0) Gecko/20100101 Firefox/50.0
+          - Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Firefox/52.0
+          - Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:57.0) Gecko/20100101 Firefox/57.0
+          - Mozilla/5.0 (Windows NT 5.1; rv:7.0.1) Gecko/20100101 Firefox/7.0.1
+          - Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0
+          - Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1
+          - Mozilla/5.0 (Windows NT 6.1; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0
         internet_explorer:
           - Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; AS; rv:11.0) like Gecko
+          - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)
+          - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)
+          - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)
+          - Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko
+          - Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0)
+          - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)
+          - Mozilla/4.0 (compatible; MSIE 9.0; Windows NT 6.1; 125LA; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022)
+          - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322)
+          - Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)
         netscape:
           - Mozilla/5.0 (Windows; U; Win 9x 4.90; SG; rv:1.9.2.4) Gecko/20101104 Netscape/9.1.0285
+          - Mozilla/4.5 (compatible; HTTrack 3.0x; Windows 98)
+          - Mozilla/4.0 (compatible; Win32; WinHttp.WinHttpRequest.5)
+          - Mozilla/5.0 (compatible; Linux x86_64; Mail.RU_Bot/2.0; +http://go.mail.ru/help/robots)
+          - Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.2) Gecko/20040804 Netscape/7.2 (ax)
+          - Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)
+          - Mozilla/5.001 (windows; U; NT4.0; en-US; rv:1.0) Gecko/25250101
+          - Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02
+          - Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.11) Gecko GranParadiso/3.0.11
+          - Mozilla/5.0 (Windows; U; Windows NT 6.1; rv:2.2) Gecko/20110201
         opera:
           - Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16
+          - Opera/9.80 (Windows NT 6.1; WOW64) Presto/2.12.388 Version/12.18
+          - Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 OPR/43.0.2442.991
+          - Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36 OPR/56.0.3051.52
+          - Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36 OPR/36.0.2130.32
+          - Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36 OPR/43.0.2442.991
+          - Opera/9.80 (Windows NT 6.0) Presto/2.12.388 Version/12.14
+          - Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36 OPR/42.0.2393.94
+          - Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3198.0 Safari/537.36 OPR/49.0.2711.0
+          - Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36 OPR/42.0.2393.94
         safari:
           - Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A
+          - Mozilla/5.0 (iPhone; CPU iPhone OS 11_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1
+          - Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_6; en-en) AppleWebKit/533.19.4 (KHTML, like Gecko) Version/5.0.3 Safari/533.19.4
+          - Mozilla/5.0 (iPhone; CPU iPhone OS 12_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1
+          - Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1
+          - Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.1 Safari/605.1.15
+          - Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 Mobile/14G60 Safari/602.1
+          - Mozilla/5.0 (iPhone; CPU iPhone OS 12_0_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1
+          - Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/534.59.10 (KHTML, like Gecko) Version/5.1.9 Safari/534.59.10
+          - Mozilla/5.0 (iPad; CPU OS 9_3_5 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13G36 Safari/601.1
 

src/main/resources/en/kpop.yml

@@ -26,7 +26,7 @@ en:
       "Victon", "Vromance", "A.C.E", "Be.A", "Dream Catcher", "Duetto", "ELRIS", "Favorite", "Fromis", "Golden Child", "Good Day", "Gugudan Ogu-ogu",
       "Hash Tag", "HONEYST", "Highlight", "IN2IT", "IZ", "JBJ", "K.A.R.D", "Longguo & Shihyun", "MVP", "MXM", "MYTEEN", "NU'EST W", "ONF", "P.O.P",
       "Pristin", "Rainz", "S.I.S", "Seven O'Clock", "The Boyz", "Top Secret", "TRCNG", "Triple H", "Wanna One", "Weki Meki"]
-      girl_groups: [2NB", "2NE1", "2Yoon", "4L ", "4Minute", "4Ten", "15&", "After School ", "AOA", "AOA Black", "AOA Cream", "Apink", "April",
+      girl_groups: ["2NB", "2NE1", "2Yoon", "4L ", "4Minute", "4Ten", "15&", "After School ", "AOA", "AOA Black", "AOA Cream", "Apink", "April",
       "As One", "Baby Vox", "Baby Vox Re.V", "Badkiz", "Bambino", "The Barberettes", "Berry Good", "Bestie", "Big Mama",
       "Black Pearl", "Blackpink", "Blady", "Bob Girls", "Bolbbalgan4", "BP Rania", "Brave Girls", "Brown Eyed Girls", "C-REAL ", "Chakra",
       "Chocolat", "CLC", "Cleo", "Cosmic Girls", "Crayon Pop", "Cupid ", "D-Unit", "D.Holic", "Dal Shabet", "Davichi", "Dia", "Diva",

src/main/resources/en/league_of_legends.yml

@@ -2,9 +2,9 @@ en:
   faker:
     games:
       league_of_legends:
-        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu", "Olaf", "Orianna", "Pantheon", "Poppy", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Zac", "Zed", "Ziggs", "Zilean", "Zyra"]
+        champion: ["Aatrox", "Ahri", "Akali", "Alister", "Amumu", "Anivia", "Annie", "Ashe", "Aurelion Sol", "Azir", "Bard", "Blitzcrank", "Brand", "Braum", "Caitlyn", "Camille", "Cassiopeia", "Cho-Gath", "Corki", "Darius", "Diana", "Dr. Mundo", "Draven", "Ekko", "Elise", "Evelynn", "Ezreal", "Fiddlesticks", "Fiora", "Fizz", "Galio", "Gangplank", "Garen", "Gnar", "Gragas", "Graves", "Hecarim", "Heimerdinger", "Illaoi", "Irelia", "Ivern", "Janna", "Jarvan IV", "Jax", "Jayce", "Jhin", "Jinx", "Kai'Sa", "Kalista", "Karma", "Karthus", "Kassadin", "Katarina", "Kayle", "Kayn", "Kennen", "Kha'Zix", "Kindred", "Kled", "Kog'Maw", "LeBlanc", "Lee Sin", "Leona", "Lissandra", "Lucian", "Lulu", "Lux", "Malphite", "Malzahar", "Maokai", "Master Yi", "Miss Fortune", "Mordekaiser", "Morgana", "Neeko", "Nami", "Nasus", "Nautilus", "Nidalee", "Nocturne", "Nunu & Willump", "Olaf", "Orianna", "Ornn", "Pantheon", "Poppy", "Pyke", "Quinn", "Rammus", "Rek'Sai", "Renekton", "Rengar", "Riven", "Rakan", "Rumble", "Ryze", "Sejuani", "Shaco", "Shen", "Shyvanna", "Singed", "Sion", "Sivir", "Skarner", "Sona", "Soraka", "Swain", "Sylas", "Syndra", "Tahm Kench", "Taliyah", "Talon", "Taric", "Teemo", "Thresh", "Tristana", "Trundle", "Tryndamere", "Twisted Fate", "Twitch", "Udyr", "Urgot", "Varus", "Vayne", "Veigar", "Vel'Koz", "Vi", "Viktor", "Vladimir", "Volibear", "Warwick", "Wukong", "Xayah", "Xerath", "Xin Zhao", "Yasuo", "Yorick", "Yuumi", "Zac", "Zed", "Ziggs", "Zilean", "Zoe", "Zyra"]
         location: ["Demacia", "Noxus", "Shadow Isles", "Valoran", "Runeterra", "Bandle City", "Bilgewater", "Freljord", "Ionia", "Mount Targon", "Piltover", "Lokfar", "Zaun"]
         quote: ["Purge the unjust.", "By my will, this shall be finished!", "You only have to click once, fool!", "My right arm is a lot stronger than my left.", "Ready to set the world on fire...", "The early bird guts the worm!", "Don't you trust me?", "Welcome to Summoners Rift!", "Have you seen my Bear Tibbers?", "NOM NOM NOM", "Defy Noxus and taste your own blood.", "Behold the might of the shadow isles.", "Who wants a piece of the champ?!", "Come on, live a little... while you can!", "Master yourself, master the enemy.", "Blindness is no impairment against a smelly enemy.", "ok.", "Caught between a rock... and a hard place.", "Mundo will go where he pleases!", "Mundo say his own name a lot, or else he forget! Has happened before.", "A man, a woman and a yordle walk into the sun. They die! Because it burns them alive? heh heh heh heh", "The cycle of life and death continues. We will live, they will die.", "My profession?! You know, now that I think of it, I've always wanted to be a baker.", "Tonight we hunt!", "Monsters can be made to fear.", "How about a drink?", "Captain Teemo on duty.", "Hut, two, three, four. Yes, sir!", "I'll scout ahead!", "That's gotta sting.", "Never underestimate the power of the Scout's code.", "I suppose you're expecting some inBEARable pun?", "It's not how much you can lift. It's how good you look!", "Welcome to the League of Draven.", "Not Draven; Draaaaven.", "Who wants some Draven? Heheheh.", "Subtle? I don't do subtle."]
         summoner_spell: ["Teleport", "Exhaust", "Barrier", "Smite", "Flash", "Ignite", "Clarity", "Mark", "To the King!", "Ghost", "Heal", "Poro Toss", "Cleanse"]
         masteries: ["Battle Trance", "Double Edged Sword", "Bounty Hunter", "Fresh Blood", "Expose Weakness", "Feast", "Warlord's Bloodlust", "Fervor of Battle", "Deathfire Touch", "Greenfather's Gift", "Dangerous Game", "Bandit", "Courage of the Colossus", "Stoneborn Pact", "Grasp of the Undying", "Siegemaster", "Tough Skin", "Explorer", "Assassin", "Secret Stash", "Runic Affinity", "Windspeaker's Blessing", "Thunderlord's Decree", "Stormraider's Surge", "Fearless", "Unyielding", "Meditation", "Battering Blows", "Piercing Thoughts", "Insight", "Perseverance", "Intelligence", "Precision", "Sorcery", "Vampirism", "Fury", "Natural Talent", "Savagery", "Wanderer", "Merciless", "Recovery", "Legendary Guardian", "Swiftness", "Runic Armor", "Veteran's Scars"]
-        rank: ["Bronze V", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver V", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold V", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum V", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond V", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Challenger"]
+        rank: ["Iron IV", "Iron III", "Iron II", "Iron I", "Bronze IV", "Bronze III", "Bronze II", "Bronze I", "Silver IV", "Silver III", "Silver II", "Silver I", "Gold IV", "Gold III", "Gold II", "Gold I", "Platinum IV", "Platinum III", "Platinum II", "Platinum I", "Diamond IV", "Diamond III", "Diamond II", "Diamond I", "Master", "Grandmaster", "Challenger"]

src/main/resources/en/music.yml

@@ -26,7 +26,7 @@ en:
       "The Eminem Show", "Hybrid Theory", "Come Away with Me", "Unplugged", "True Blue", "Legend: The Best of Bob Marley & The Wailers", "Tapestry", "No Jacket Required", "Greatest Hits",
       "Bridge over Troubled Water", "The Joshua Tree", "...Baby One More Time", "Backstreet's Back", "Backstreet Boys", "Millennium", "Spice", "Happy Nation", "The Sign", "Whitney Houston",
       "(What's the Story) Morning Glory?", "The Marshall Mathers LP", "Like a Virgin", "Cross Road", "25", "Boston", "Oops!... I Did It Again", "The Colour of My Love", "Hysteria", "Faith",
-      "Dookie", "Can't Slow Down", "Daydream", "HIStory: Past", " Present and Future", " Book I", "Off the Wall", "The Woman in Me", "Breakfast in America", "Tracy Chapman",
+      "Dookie", "Can't Slow Down", "Daydream", "HIStory: Past, Present and Future, Book I", "Off the Wall", "The Woman in Me", "Breakfast in America", "Tracy Chapman",
       "Flashdance: Original Soundtrack from the Motion Picture", "Whitney", "Confessions", "X&Y", "High School Musical", "High School Musical 2", "Viva la Vida or Death and All His Friends",
       "I Dreamed a Dream", "Recovery", "Midnight Memories", "Frozen", "Lemonade", "Brand New Eyes", "All We Know Is Falling", "Riot!", "Songs About Jane", "Hands All Over"]
       genres: ["Rock", "Pop", "Electronic", "Folk", "World", "Country", "Jazz", "Funk", "Soul", "Hip Hop", "Classical", "Latin", "Reggae", "Stage And Screen", "Blues", "Non Music", "Rap"]

src/main/resources/en/name.yml

@@ -26,4 +26,5 @@ en:
       title:
         descriptor: [Lead, Senior, Direct, Corporate, Dynamic, Future, Product, National, Regional, District, Central, Global, Customer, Investor, Dynamic, International, Legacy, Forward, Internal, Human, Chief, Principal]
         level: [Solutions, Program, Brand, Security, Research, Marketing, Directives, Implementation, Integration, Functionality, Response, Paradigm, Tactics, Identity, Markets, Group, Division, Applications, Optimization, Operations, Infrastructure, Intranet, Communications, Web, Branding, Quality, Assurance, Mobility, Accounts, Data, Creative, Configuration, Accountability, Interactions, Factors, Usability, Metrics]
-        job: [Supervisor, Associate, Executive, Liaison, Officer, Manager, Engineer, Specialist, Director, Coordinator, Administrator, Architect, Analyst, Designer, Planner, Orchestrator, Technician, Developer, Producer, Consultant, Assistant, Facilitator, Agent, Representative, Strategist]
+        job: [Supervisor, Associate, Executive, Liaison, Officer, Manager, Engineer, Specialist, Director, Coordinator, Administrator, Architect, Analyst, Designer, Planner, Orchestrator, Technician, Developer, Producer, Consultant, Assistant, Facilitator, Agent, Representative, Strategist]
+      blood_group: [O-, O+, A-, A+, B-, B+, AB-, AB+]

src/main/resources/en/opera.yml

@@ -0,0 +1,172 @@
+en:
+  faker:
+    opera:
+      italian:
+        by_giuseppe_verdi:
+          - Oberto Conte di San Bonifacio
+          - Un Giorno di Regno
+          - Nabucco
+          - Lombardi alla Prima Crociata
+          - Ernani
+          - I due Foscari
+          - Giovanna d'Arco
+          - Alzira
+          - Attila
+          - Macbeth
+          - I Masnadieri
+          - Jérusalem
+          - Il Corsaro
+          - La Battaglia di Legnano
+          - Luisa Miller
+          - Stiffelio
+          - Rigoletto
+          - Il Trovatore
+          - Simon Boccanegra
+          - Aroldo
+          - Un Ballo in Maschera
+          - La Forza del Destino
+          - Don Carlos
+          - Aida
+          - Otello
+          - Falstaff
+          - I Vespri Siciliani
+          - La Traviat
+        by_gioacchino_rossini:
+          - Demetrio e Polibio
+          - La cambiale di matrimonio
+          - L'equivoco stravagante
+          - L'inganno felice
+          - Ciro in Babilonia ossia La caduta di Baldassare
+          - La scala di seta
+          - La pietra del paragone
+          - L'occasione fa il ladro  ossia Il cambio della valigia
+          - Il signor Bruschino   ossia Il figlio per azzardo
+          - Tancredi
+          - L'italiana in Algeri
+          - Aureliano in Palmira
+          - Il turco in Italia
+          - Sigismondo
+          - Elisabetta   regina d'Inghilterra
+          - Torvaldo e Dorliska
+          - Il barbiere di Siviglia   ossia L'inutile precauzione
+          - La gazzetta   ossia Il matrimonio per concorso
+          - Otello   ossia Il Moro di Venezia
+          - La Cenerentola   ossia La bontà in trionfo
+          - La gazza ladra
+          - Armida
+          - Adelaide di Borgogna ossia Ottone re d'Italia
+          - Mosè in Egitto
+          - Adina ossia Il califfo di Bagdad
+          - Ricciardo e Zoraide
+          - Ermione
+          - Eduardo e Cristina
+          - La donna del lago
+          - Bianca e Falliero ossia Il consiglio dei tre
+          - Maometto II
+          - Matilde di Shabran
+          - Zelmira
+          - Semiramide
+          - Ugo   re d'Italia
+          - Il viaggio a Reims   ossia L'albergo del Giglio d'Oro
+          - Le siège de Corinthe
+          - Moïse et Pharaon ou Le passage de la mer rouge
+          - Le comte Ory
+          - Guillaume Tell
+        by_gaetano_donizetti:
+          - Olimpiade
+          - L'ira di Achille
+          - Enrico di Borgogna
+          - Una follia
+          - I piccioli virtuosi ambulanti
+          - Il falegname di Livonia o Pietro il grande czar delle Russie
+          - Le nozze in villa
+          - Zoraida di Granata
+          - La zingara
+          - La lettera anonima
+          - Chiara e Serafina o Il pirata
+          - Alfredo il grande
+          - Il fortunato inganno
+          - L'ajo nell'imbarazzo
+          - Emilia di Liverpool or L'eremitaggio di Liverpool
+          - Alahor in Granata
+          - Don Gregorio
+          - Elvida
+          - Gabriella di Vergy
+          - Olivo e Pasquale
+          - Otto mesi in due ore ossia Gli esiliati in Siberia
+          - Il borgomastro di Saardam
+          - Le convenienze teatrali
+          - L'esule di Roma ossia Il proscritto
+          - L'eremitaggio di Liverpool
+          - Alina regina di Golconda
+          - Gianni di Calais
+          - Il paria
+          - Il giovedì grasso o Il nuovo Pourceaugnac
+          - Elisabetta al castello di Kenilworth
+          - Alina regina di Golconda[rev]
+          - I pazzi per progetto
+          - Il diluvio universale
+          - Imelda de' Lambertazzi
+          - Anna Bolena
+          - Gianni di Parigi
+          - Le convenienze ed inconvenienze teatrali
+          - Francesca di Foix
+          - La romanziera e l'uomo nero
+          - Fausta
+          - Ugo conte di Parigi
+          - L'elisir d'amore
+          - Sancia di Castiglia
+          - Il furioso all'isola di San Domingo
+          - Otto mesi in due ore
+          - Parisina
+          - Torquato Tasso
+          - Lucrezia Borgia
+          - Il diluvio universale
+          - Rosmonda d'Inghilterra
+          - Maria Stuarda
+          - Buondelmonte
+          - Gemma di Vergy
+          - Marino Faliero
+          - Lucia di Lammermoor
+          - Belisario
+          - Il campanello di notte
+          - Betly o La capanna svizzera
+          - L'assedio di Calais
+          - Pia de' Tolomei
+          - Pia de' Tolomei
+          - Betly
+          - Roberto Devereux
+          - Maria de Rudenz
+          - Gabriella di Vergy
+          - Poliuto
+          - Pia de' Tolomei
+          - Lucie de Lammermoor
+          - Le duc d'Albe
+          - L'ange de Nisida
+          - Lucrezia Borgia
+          - Les Martyrs
+          - La fille du régiment
+          - Lucrezia Borgia
+          - La favorite
+          - Adelia
+          - Rita
+          - Maria Padilla
+          - Linda di Chamounix
+          - Caterina Cornaro
+          - Don Pasquale
+          - Maria di Rohan
+          - Dom Sébastien roi de Portugal
+          - Dom Sebastian von Portugal
+          - Il duca d'Alba
+        by_vincenzo_bellini:
+          - Adelson e Salvini
+          - Bianca e Gernando
+          - Il pirata
+          - Bianca e Fernando
+          - La straniera
+          - Zaira
+          - I Capuleti e i Montecchi
+          - La sonnambula
+          - Norma
+          - Beatrice di Tenda
+          - I puritani

src/main/resources/en/rupaul.yml

@@ -68,28 +68,58 @@ en:
         "Valentina",
         "Farrah Moan",
         "Aja",
-        "Cynthia Lee Fontaine"
+        "Cynthia Lee Fontaine",
+        "Aquaria",
+        "Eureka",
+        "Kameron Michaels",
+        "Asia O'Hara",
+        "Miz Cracker",
+        "Monet X Change",
+        "The Vixen",
+        "Monique Heart",
+        "Blair St. Clair",
+        "Mayhem Miller",
+        "A'keria Chanel Davenport",
+        "Ariel Versace",
+        "Brook Lynn Hytes",
+        "Mercedes Iman Diamond",
+        "Nina West",
+        "Plastique Tiara",
+        "Ra'jah O'Hara",
+        "Scarlet Envy",
+        "Shuga Cain",
+        "Silky Nutmeg Ganache",
+        "Vanessa Vanjie Mateo",
+        "Yvie Oddly"
       ]
       quotes: [
        "Glamazon!",
-       "Put The Bass In Your Walk",
-       "Sashay Away",
-       "Don't F*ck It Up",
-       "Shante, You Stay",
-       "Shante, Shante, Shante",
-       "You Betta Work",
-       "Lip-Sync for Your Life",
-       "Extravaganza Eleganza",
-       "Let the music play",
-       "That's Funny, Tell Another One",
-       "Sissy That Walk",
-       "Don't Be Jealous Of My Boogie",
-       "You're Born Naked, The Rest Is Drag",
-       "Life Is About Using The Whole Box Of Crayons",
-       "When The Going Gets Tough, The Tough Reinvent",
-       "Hello Hello Hello!",
-       "Bring Back My Girls",
-       "Just Between Us Squirrel Friends",
-       "Get Out Your Library Cards",
-       "Silence...I've made my decision",
+       "Put the bass in your walk.",
+       "Sashay away.",
+       "Good luck, and don't fuck it up.",
+       "Shante, you stay.",
+       "You betta work.",
+       "The time has come, for you to lip-sync for your life!",
+       "Extravaganza eleganza!",
+       "Now, let the music play!",
+       "That's funny, tell another one.",
+       "Sissy that walk.",
+       "Don't be jealous of my boogie.",
+       "We're all born naked and the rest is drag.",
+       "Life is about using the whole box of crayons.",
+       "When the going gets tough, the tough reinvent themselves.",
+       "Hello, hello, hello!",
+       "Bring back my girls.",
+       "Just between us squirrel friends...",
+       "In the great tradition of Paris is Burning, \"Get out your Library Cards!\"",
+       "Because reading is what?",
+       "Now listen, I gotta tell ya...",
+       "Silence...I've made my decision.",
+       "You're a winner, baby!",
+       "Condragulations!",
+       "I'm sorry, my dear, but you are up for elimination.",
+       "Prance, I say!",
+       "If you can't love yourself, how in the hell you gonna love somebody else?",
+       "Must be jelly 'cause jam don't shake.",
+       "She done already done had herses."
       ]

src/main/resources/en/space.yml

@@ -6,7 +6,7 @@ en:
       galaxy: ['Milky Way', 'Andromeda', 'Triangulum', 'Whirlpool', 'Blackeye', 'Sunflower', 'Pinwheel', 'Hoags Object', 'Centaurus A', 'Messier 83']
       nebula: ['Lagoon Nebula', 'Eagle Nebula', 'Triffid Nebula', 'Dumbell Nebula', 'Orion Nebula', 'Ring Nebula', 'Bodes Nebula', 'Owl Nebula']
       star_cluster: ['Wild Duck', 'Hyades', 'Coma', 'Butterfly', 'Messier 7', 'Pleiades', 'Beehive Cluster', 'Pearl Cluster', 'Hodge 301', 'Jewel Box Cluster', 'Wishing Well Cluster', 'Diamond Cluster', 'Trumpler 10', 'Collinder 140', 'Liller 1', 'Koposov II', 'Koposov I', 'Djorgovski 1', 'Arp-Madore 1', 'NGC 6144', 'NGC 2808', 'NGC 1783', 'Messier 107', 'Messier 70', 'Omega Centauri', 'Palomar 12', 'Palomar 4', 'Palomar 6', 'Pyxis Cluster', 'Segue 3']
-      constellation: ['Big Dipper', 'Litte Dipper', 'Orion', 'Loe', 'Gemini', 'Cancer', 'Canis Minor', 'Canis Major', 'Ursa Major', 'Ursa Minor', 'Virgo', 'Libra', 'Scorpius', 'Sagittarius', 'Lyra', 'Capricornus', 'Aquarius', 'Pisces', 'Aries', 'Leo Minor', 'Auriga']
+      constellation: ['Big Dipper', 'Litte Dipper', 'Orion', 'Leo', 'Gemini', 'Cancer', 'Canis Minor', 'Canis Major', 'Ursa Major', 'Ursa Minor', 'Virgo', 'Libra', 'Scorpius', 'Sagittarius', 'Lyra', 'Capricornus', 'Aquarius', 'Pisces', 'Aries', 'Leo Minor', 'Auriga']
       star: ['Sun', 'Proxima Centauri', 'Rigil Kentaurus', 'Barnards Star', 'Wolf 359', 'Luyten 726-8A', 'Luyten 726-8B', 'Sirius A', 'Sirius B', 'Ross 154', 'Ross 248', 'Procyon A', 'Procyon B', 'Vega', 'Rigel', 'Arcturus', 'Betelgeuse', 'Mahasim', 'Polaris']
       agency: ['National Aeronautics and Space Administration', 'European Space Agency', 'German Aerospace Center', 'Indian Space Research Organization', 'China National Space Administration', 'UK Space Agency', 'Brazilian Space Agency', 'Mexican Space Agency', 'Israeli Space Agency', 'Italian Space Agency', 'Japan Aerospace Exploration Agency', 'National Space Agency of Ukraine', 'Russian Federal Space Agency', 'Swedish National Space Board']
       agency_abv: ['NASA', 'AEM', 'AEB', 'UKSA', 'CSA', 'CNSA', 'ESA', 'DLR', 'ISRO', 'JAXA', 'ISA', 'CNES', 'NSAU', 'ROSCOSMOS', 'SNSB']
@@ -14,4 +14,4 @@ en:
       company: ['Rocket Lab', SpaceX', 'Blue Origin', 'Virgin Galactic', 'SpaceDev', 'Bigelow Aerospace', 'Orbital Sciences', 'JPL', 'NASA Jet Propulsion Laboratory']
       distance_measurement: ['light years', 'AU', 'parsecs', 'kiloparsecs', 'megaparsecs']
       meteorite: ['Aarhus', 'Abee', 'Adelie Land', 'Adhi Kot', 'Adzhi-Bogdo', 'Santa Rosa de Viterbo', 'Agen', 'Akbarpur', 'Albareto', 'Allan Hills 84001', 'Allan Hills A81005', 'Allegan', 'Allende', 'Ambapur Nagla', 'Andura', 'Angers', 'Angra dos Reis', 'Ankober', 'Anlong', 'Annaheim', 'Appley Bridge', 'Arbol Solo', 'Archie', 'Arroyo Aguiar', 'Assisi', 'Atoka', 'Avanhandava', 'Bacubirito', 'Baszkówka','Beardsley', 'Bellsbank', 'Bench Crater', 'Benton', 'Białystok', 'Blithfield','Block Island', 'Bovedy', 'Brachina', 'Brahin', 'Brenham', 'Buzzard Coulee','Campo del Cielo', 'Canyon Diablo', 'Cape York', 'Carancas', 'Chambord','Chassigny', 'Chelyabinsk', 'Chergach', 'Chinga', 'Chinguetti', 'Claxton','Coahuila', 'Cranbourne', 'D''Orbigny', 'Dronino', 'Eagle Station', 'Elbogen','Ensisheim', 'Esquel', 'Fukang', 'Gancedo', 'Gao–Guenie', 'Gay Gulch', 'Gebel Kamil', 'Gibeon', 'Goose Lake', 'Grant', 'Hadley Rille', 'Heat Shield Rock','Hoba', 'Homestead', 'Hraschina', 'Huckitta', 'Imilac', 'Itqiy', 'Kaidun','Kainsaz', 'Karoonda', 'Kesen', 'Krasnojarsk', 'L''Aigle', 'Lac Dodon', 'Lake Murray', 'Loreto', 'Los Angeles', 'Łowicz', 'Mackinac Island', 'Mbozi','Middlesbrough', 'Millbillillie', 'Mineo', 'Monte Milone', 'Moss','Mundrabilla', 'Muonionalusta', 'Murchison', 'Nakhla', 'Nantan','Neuschwanstein', 'Northwest Africa 7034', 'Northwest Africa 7325', 'Norton County', 'Novato', 'Northwest Africa 3009', 'Oileán Ruaidh (Martian)', 'Old Woman', 'Oldenburg', 'Omolon', 'Orgueil', 'Ornans', 'Osseo', 'Österplana 065','Ourique', 'Pallasovka', 'Paragould', 'Park Forest', 'Pavlovka', 'Peace River','Peekskill', 'Penouille', 'Polonnaruwa', 'High Possil', 'Příbram', 'Pultusk','Qidong', 'Richardton', 'Santa Vitoria do Palmar', 'Sayh al Uhaymir 169','Seymchan', 'Shelter Island', 'Shergotty', 'Sikhote-Alin', 'Sołtmany','Springwater', 'St-Robert', 'Stannern', 'Sulagiri', 'Sutter''s Mill','Sylacauga', 'Tagish Lake', 'Tamdakht', 'Tenham', 'Texas Fireball', 'Tissint','Tlacotepec', 'Toluca', 'Treysa', 'Twannberg', 'Veliky Ustyug', 'Vermillion','Weston', 'Willamette', 'Winona', 'Wold Cottage', 'Yamato 000593','Yamato 691','Yamato 791197', 'Yardymly', 'Zagami', 'Zaisho', 'Zaklodzie']
-      launch_vehicule: ['Antares', 'Ariane 5', 'Atlas', 'Diamant', 'Dnepr', 'Delta', 'Electron', 'Energia', 'Europa', 'Falcon 9', 'Falcon Heavy', 'GSLV', 'Juno', 'Long March', 'Mercury-Redstone', 'Minotaur', 'Pegasus', 'Proton', 'PSLV', 'Safir', 'Shavit', 'Saturn IV', 'Semiorka', 'Soyouz', 'Titan', 'Vega', 'Veronique', 'Zenit']
+      launch_vehicle: ['Antares', 'Ariane 5', 'Atlas', 'Diamant', 'Dnepr', 'Delta', 'Electron', 'Energia', 'Europa', 'Falcon 9', 'Falcon Heavy', 'GSLV', 'Juno', 'Long March', 'Mercury-Redstone', 'Minotaur', 'Pegasus', 'Proton', 'PSLV', 'Safir', 'Shavit', 'Saturn IV', 'Semiorka', 'Soyouz', 'Titan', 'Vega', 'Veronique', 'Zenit']

src/main/resources/en/star_wars.yml

@@ -226,7 +226,7 @@ en:
         admiral_ackbar: ['akbar', 'ackbar', 'admiral ackbar', 'admiral akbar', 'admiral_ackbar']
         ahsoka_tano: ['ahsoka', 'tano', 'ahsoka tano', 'ahsoka_tano']
         anakin_skywalker: ['anakin', 'anakin skywalker', 'ani', 'ani skywalker', 'anakin_skywalker']
-        asajj_ventress: ['asajj', 'ventress', 'asajj ventress', 'anakin_skywalker']
+        asajj_ventress: ['asajj', 'ventress', 'asajj ventress', 'asajj_ventress']
         bendu: ['the bendu', 'bendu']
         boba_fett: ['boba fett', 'bobafett', 'boba_fett']
         c_3po: ['c 3po', 'c3po', 'c3p0', 'c_3po']

src/main/resources/en/stargate.yml

@@ -2,7 +2,7 @@ en:
   faker:
     stargate:
       characters: ["Jack O'Neill", "Teal'c", "Daniel Jackson", "Samantha Carter", "Janet Frasier", "George Hammond", "Jonas Quinn", "Cameron Mitchell", "Vala Mal Doran", "Kawalsky", "Jacob Carter", "Kasuf", "Sha're", "Skaara", "Thor", "Anubis", "Apophis", "Ba'al", "Cronus", "Hathor", "Heru-ur", "Klorel", "Ra", "Amonet", "Osiris", "Sokar", "Bra'tac", "Lantash", "Selmak", "Jolinar", "Martouf", "Cassandra", "Harlan"]
-      planets: ["Abydos", "Altair", Asuras", "Athos", "Celestis", "Chulak", "Dakara", "Earth", "Langara", "Lantea", "Orilla", "P3X-888", "Sateda", "Tollana", "Vorash"]
+      planets: ["Abydos", "Altair", "Asuras", "Athos", "Celestis", "Chulak", "Dakara", "Earth", "Langara", "Lantea", "Orilla", "P3X-888", "Sateda", "Tollana", "Vorash"]
       quotes: [
         "What is an Oprah?",
         "Teal'c, look scary and take point.",
@@ -19,4 +19,3 @@ en:
         "Indeed.",
         "You ended that sentence with a preposition. Bastard!"
         ]
-

src/main/resources/en/subscription.yml

@@ -1,7 +1,7 @@
 en:
   faker:
     subscription:
-      plans: ["Free Trial", "Basic", "Starter", "Essential", "Student", Bronze", "Standard", "Silver", "Gold", "Platinum", "Professional", "Business", "Diamond", "Premium"]
+      plans: ["Free Trial", "Basic", "Starter", "Essential", "Student", "Bronze", "Standard", "Silver", "Gold", "Platinum", "Professional", "Business", "Diamond", "Premium"]
       statuses: ["Active", "Idle", "Blocked", "Pending"]
       payment_methods: ["Credit card", "Debit card", "Paypal", "Cash", "Money transfer", "Bitcoins", "Cheque", "Apple Pay", "Google Pay", "WeChat Pay", "Alipay", "Visa checkout"]
       subscription_terms: ["Daily", "Weekly", "Monthly", "Annual", "Biennal", "Triennal", "Quinquennal", "Lifetime"]

src/main/resources/en/super_smash_bros.yml

@@ -3,6 +3,7 @@ en:
     games:
       super_smash_bros:
         fighter:
+          - Banjo-Kazooie
           - Bayonetta
           - Bowser
           - Bowser Jr.
@@ -22,12 +23,16 @@ en:
           - Fox
           - Ganondorf
           - Greninja
+          - Hero
           - Ice Climbers
           - Ike
+          - Incineroar
           - Inkling
           - Isabelle
           - Ivysaur
           - Jigglypuff
+          - Joker
+          - Ken
           - King Dedede
           - King K. Rool
           - Kirby
@@ -53,6 +58,7 @@ en:
           - Peach
           - Pichu
           - Pikachu
+          - Piranha Plant
           - Pit
           - Pokémon Trainer
           - R.O.B.
@@ -133,6 +139,7 @@ en:
           - Mario Bros.
           - Mario Circuit
           - Mario Galaxy
+          - Mementos
           - Midgar
           - Miiverse
           - Moray Towers
@@ -174,6 +181,7 @@ en:
           - Skyworld
           - Smashville
           - Spear Pillar
+          - Spiral Mountain
           - Spirit Train
           - Summit
           - Super Happy Tree

src/main/resources/es-MX.yml

@@ -48,7 +48,7 @@ es-MX:
 
     internet:
       free_email: [gmail.com, yahoo.com, hotmail.com, prodigy.net.mx]
-      domain_suffix: [com, com.mx, mx, info, me, org, org.mx,]
+      domain_suffix: [com, com.mx, mx, info, me, org, org.mx]
 
     name:
       first_name: [José Luis, Juan, Francisco, José, Antonio, Jesús, Miguel Ángel, Pedro, Alejandro, Manuel, Juan Carlos, Roberto, Jorge, Carlos, Fernando, Ricardo, Miguel, Javier, Martín, Rafael, Raúl, Arturo, Daniel, Eduardo, Enrique, Mario, José Antonio, Sergio, Gerardo, Salvador, Marco Antonio, Alfredo, David, Armando, Alberto, Luis, Óscar, Ramón, Guillermo, Rubén, Jaime, Felipe, Julio César, Andrés, Pablo, Ángel, Gabriel, Héctor, Alfonso, José Guadalupe, Agustín, Ignacio, Víctor, Rogelio, Gustavo, Ernesto, Rodolfo, Luis Alberto, Gilberto, Vicente, Juan Antonio, Tomás, Israel, César, Adrián, Ismael, Santiago, Humberto, Gregorio, Joel, Esteban, José Alfredo, Nicolás, Omar, Moisés, Félix, Lorenzo, Samuel, Carlos Alberto, José Angel, Ramiro, Abel, Jorge Luis, Marcos, Mario Alberto, Rodrigo, Edgar, Isidro, José Alberto, Leonardo, Benjamín, Jorge Alberto, Julio, Raymundo, Víctor Hugo, Saúl, Benito, José Juan, Rigoberto, Hugo,  Guadalupe, María, Margarita, Verónica, María Elena, Josefina, Leticia, Teresa, Patricia, Rosa, Martha, Rosa María, Alicia, Yolanda, Francisca, Silvia, Elizabeth, Gloria, Ana María, Gabriela, Alejandra, María Luisa, María de Lourdes, Adriana, Araceli, Antonia, Lucía, Carmen, Irma, Claudia, Beatriz, Isabel, Laura, Maribel, Graciela, Virginia, Catalina, Esperanza, Angélica, Maricela, Cecilia, Susana, Cristina, Julia, Concepción, Victoria, Ofelia, Rocío, Carolina, Raquel, Petra, Lorena, Reyna, Sandra, Paula, Guillermina, Sara, Elvira, Manuela, Marisol, Mónica, Erika, Celia, Luz María, Irene, Magdalena, Estela, Ángela, Rosario, Esther, Eva, Norma, Aurora, Socorro, Consuelo, Lidia, Bertha, Sofía, Dolores, Elena, Rosalba, Liliana, Andrea, Adela, Mariana, Fabiola, Karina, Martina, Marcela, Miriam, Mercedes, Marina, Amalia, Olivia, Angelina, Sonia, Agustina, Edith, Lilia, Micaela]
@@ -62,6 +62,13 @@ es-MX:
       name:
         - "#{prefix} #{first_name} #{last_name} #{last_name}"
         - "#{first_name} #{last_name} #{last_name}"
+      name_with_middle:
+        - "#{prefix} #{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name} #{suffix}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
+        - "#{first_name} #{last_name} #{last_name}"
 
     phone_number:
       lada_dos: ["33", "55", "81"]
@@ -87,3 +94,9 @@ es-MX:
         - "044 (#{PhoneNumber.lada_tres}) ### ####"
         - "044 #{PhoneNumber.lada_dos}-####-####"
         - "044 #{PhoneNumber.lada_tres}-###-####"
+    subscription:
+      plans: ["Prueba gratuita", "Basico", "Starter", "Essential", "Estudiante", Bronze", "Standard", "Silver", "Gold", "Platinum", "Profesional", "Business", "Diamond", "Premium"]
+      statuses: ["Activo", "Parado", "Bloqueado", "Pendiente"]
+      payment_methods: ["Tarjeta de credito", "Tarjeta de débito", "Paypal", "Efectivo", "Transferencia de dinero", "Bitcoins", "Cheque", "Apple Pay", "Google Pay", "WeChat Pay", "Alipay", "Visa Checkout"]
+      subscription_terms: ["Diaria", "Semanal", "Mensual", "Anual", "Bienal", "Trienal", "Quinquenal", "De por vida"]
+      payment_terms: ["Pago por adelantado", "Mensual", "Anual", "Suscripción completa"]

src/main/resources/fi-FI.yml

@@ -1,5 +1,10 @@
 fi-FI:
   faker:
+    invoice:
+      reference:
+        # Source: https://wiki.xmldation.com/support/fk/finnish_reference_number
+        check_digit_method: method_731
+        pattern: '\d{3,19}#'
     address:
       city_prefix: [Haap, He, Kau, Oul, Ra, Ni, 'No', Ke, La, Or]
       city_suffix: [sjärvi, kano, ahe, inen, esi, uma, mi, inen, valta, mina]
@@ -16,13 +21,14 @@ fi-FI:
       default_country: [Suomi]
 
     name:
-      first_name_women: [Eija, Helena, Anu, Riitta, Heta, Kanerva, Tytti, Saimi, Kaari, Emma, Elli]
-      first_name_men: [Erkki, Toni, Aki, Iiro, Marko, Henri, Juha, Iivari, Arto, Eelis, Markus, Olli]
-      first_name: [Erkki, Toni, Aki, Iiro, Marko, Henri, Juha, Iivari, Arto, Eelis, Markus, Olli, Eija, Helena, Anu, Riitta, Heta, Kanerva, Tytti, Saimi, Kaari, Emma, Elli]
-      last_name: [Ahokas, Uotila, Pennanen, Meriluoto, Ilkka, Jantunen, Liukkonen, Eronen, Ojanen, Ruutu, Jantunen, Isometsä]
+      female_first_name: [Maria, Helena, Anneli, Johanna, Kaarina, Marjatta, Hannele, Kristiina, Liisa, Emilia, Elina, Tuulikki, Annikki, Maarit, Sofia, Susanna, Leena, Katariina, Anna, Marja, Sinikka, Inkeri, Riitta, Kyllikki, Aino, Tuula, Anne, Päivi, Orvokki, Ritva, Tellervo, Maija, Pirjo, Karoliina, Pauliina, Minna, Sari, Irmeli, Eeva, Tiina, Laura, Eveliina, Marika, Elisabet, Tarja, Pirkko, Satu, Anja, Mari, Hanna]
+      male_first_name: [Juhani, Olavi, Antero, Tapani, Johannes, Tapio, Mikael, Kalevi, Matti, Pekka, Petteri, Ilmari, Sakari, Matias, Antti, Juha, Heikki, Kristian, Timo, Kari, Mikko, Markus, Jari, Jukka, Kalervo, Markku, Aleksi, Jaakko, Petri, Oskari, Mika, Henrik, Lauri, Erkki, Veikko, Hannu, Seppo, Ville, Ensio, Ari, Janne, Valtteri, Marko, Pentti, Tuomas, Sami, Juho, Eero, Martti, Erik]
+      first_name: [Maria, Helena, Anneli, Johanna, Kaarina, Marjatta, Hannele, Kristiina, Liisa, Emilia, Elina, Tuulikki, Annikki, Maarit, Sofia, Susanna, Leena, Katariina, Anna, Marja, Sinikka, Inkeri, Riitta, Kyllikki, Aino, Tuula, Anne, Päivi, Orvokki, Ritva, Tellervo, Maija, Pirjo, Karoliina, Pauliina, Minna, Sari, Irmeli, Eeva, Tiina, Laura, Eveliina, Marika, Elisabet, Tarja, Pirkko, Satu, Anja, Mari, Hanna, Juhani, Olavi, Antero, Tapani, Johannes, Tapio, Mikael, Kalevi, Matti, Pekka, Petteri, Ilmari, Sakari, Matias, Antti, Juha, Heikki, Kristian, Timo, Kari, Mikko, Markus, Jari, Jukka, Kalervo, Markku, Aleksi, Jaakko, Petri, Oskari, Mika, Henrik, Lauri, Erkki, Veikko, Hannu, Seppo, Ville, Ensio, Ari, Janne, Valtteri, Marko, Pentti, Tuomas, Sami, Juho, Eero, Martti, Erik]
+      last_name: [Korhonen, Virtanen, Mäkinen, Nieminen, Mäkelä, Hämäläinen, Laine, Heikkinen, Koskinen, Järvinen, Lehtonen, Lehtinen, Saarinen, Salminen, Heinonen, Niemi, Heikkilä, Kinnunen, Salonen, Turunen, Salo, Laitinen, Tuominen, Rantanen, Karjalainen, Jokinen, Mattila, Savolainen, Lahtinen, Ahonen, Ojala, Leppänen, Väisänen, Hiltunen, Kallio, Miettinen, Leinonen, Pitkänen, Aaltonen, Manninen, Hakala, Koivisto, Anttila, Laaksonen, Hirvonen, Räsänen, Lehto, Laakso, Toivonen, Mustonen]
       name:
         - "#{first_name} #{last_name}"
-
+      name_with_middle:
+        - "#{first_name} #{last_name} #{last_name}"
     phone_number:
       formats: ['##-######', '###-#######']
     cell_phone: