.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,25 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Code to reproduce
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Versions:**
- - OS: [e.g. OSX]
- - JDK
- - Faker Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.gitignore

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

.travis.yml

@@ -1,17 +1,17 @@
 language: java
-dist: xenial
+dist: trusty
 jdk:
+- oraclejdk8
+- openjdk7
 - openjdk10
 - oraclejdk11
 sudo: true
-script: mvn verify failsafe:integration-test failsafe:verify
+script: "mvn verify failsafe:integration-test failsafe:verify"
 branches:
   except:
   - travis
 notifications:
   email: false
 after_success:
-- mvn clean cobertura:cobertura coveralls:report
-env:
-  global:
-    secure: GIdF3itH9owJXPEb/ri984853yRRIDeWbSZW7yMh6XOymGWAi0+3fGssBbHqjS/s3QgiDhnrKfDjF7UhHE1aeYCxgHM5QGOjfHUhOKevhUE4u0h4ysFS4wbh7zYODMzxdFpiKwdnNF+TvMctIReH5IVDu8gUxbNrcSXN6PQgvlM=
+- mvn clean cobertura:cobertura coveralls:cobertura
+

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at rickyyim AT gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

README.md

@@ -17,7 +17,7 @@ In pom.xml, add the following xml stanza between `<dependencies> ... </dependenc
 <dependency>
     <groupId>com.github.javafaker</groupId>
     <artifactId>javafaker</artifactId>
-    <version>1.0.2</version>
+    <version>0.18</version>
 </dependency>
 ```
 
@@ -25,7 +25,7 @@ For gradle users, add the following to your build.gradle file.
 
 ```groovy
 dependencies {
-    implementation 'com.github.javafaker:javafaker:1.0.2'
+    implementation 'com.github.javafaker:javafaker:0.18'
 }
 
 ```
@@ -42,8 +42,6 @@ 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
@@ -56,45 +54,35 @@ See [CONTRIBUTING.md](https://github.com/DiUS/java-faker/blob/master/CONTRIBUTIN
 
 Fakers
 -----
-* Address
 * Ancient
-* Animal
+* Address
 * App
-* Aqua Teen Hunger Force
 * Artist
 * Avatar
-* Back To The Future
 * Aviation
-* Basketball
 * Beer
-* Bojack Horseman
 * Book
 * Bool
 * Business
 * ChuckNorris
 * Cat
 * Code
-* Coin
 * Color
 * Commerce
 * Company
 * Crypto
 * DateAndTime
 * Demographic
-* Disease
 * Dog
 * DragonBall
-* Dune
 * Educator
 * Esports
-* EnglandFootBall
 * File
 * Finance
 * Food
 * Friends
 * FunnyName
 * GameOfThrones
-* Gender
 * Hacker
 * HarryPotter
 * Hipster
@@ -104,7 +92,6 @@ Fakers
 * IdNumber
 * Internet
 * Job
-* Kaamelott
 * LeagueOfLegends
 * Lebowski
 * LordOfTheRings
@@ -112,23 +99,17 @@ Fakers
 * Matz
 * Music
 * Name
-* Nation
 * Number
 * Options
 * Overwatch
 * PhoneNumber
-* Photography
 * Pokemon
-* Princess Bride
-* Relationship Terms
 * RickAndMorty
 * Robin
 * RockBand
 * Shakespeare
-* Sip
 * SlackEmoji
 * Space
-* StarCraft
 * StarTrek
 * Stock
 * Superhero
@@ -178,7 +159,6 @@ Supported Locales
 * fi-FI
 * fr
 * he
-* hu
 * in-ID
 * it
 * ja

pom.xml

@@ -3,7 +3,7 @@
     <groupId>com.github.javafaker</groupId>
     <artifactId>javafaker</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>0.19-SNAPSHOT</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,7 +13,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <additionalparam>-Xdoclint:none</additionalparam>
     </properties>
     <licenses>
         <license>
@@ -53,7 +52,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.26</version>
+            <version>1.23</version>
             <classifier>android</classifier>
         </dependency>
         <dependency>

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

@@ -35,10 +35,6 @@ public class Address {
         return faker.bothify(faker.fakeValuesService().resolve("address.postcode", this,faker));
     }
 
-    public String postcode() {
-        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);
     }

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

@@ -1,13 +0,0 @@
-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/AquaTeenHungerForce.java

@@ -1,15 +0,0 @@
-package com.github.javafaker;
-
-public class AquaTeenHungerForce {
-
-    private final Faker faker;
-
-    protected AquaTeenHungerForce(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String character() {
-        return faker.fakeValuesService().resolve("aqua_teen_hunger_force.character", this, faker);
-    }
-
-}

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

@@ -1,22 +0,0 @@
-package com.github.javafaker;
-
-public class Barcode {
-
-    private Faker faker;
-
-    public Barcode(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String type() {
-        return faker.resolve("barcode.types");
-    }
-
-    public String data(){
-        return faker.resolve("barcode.datas");
-    }
-
-    public String typeAndData(){
-        return faker.resolve("barcode.typeAndData");
-    }
-}

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

@@ -1,49 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Generate random components of basketall game, e.g. teams, coaches, positions and players.
- * @author unknown and irakatz
- */
-public class Basketball {
-    private final Faker faker;
-
-    /**
-     * Create a constructor for Basketball.
-     * @param faker The Faker instance for generating random, different kinds of disease, e.g. the internal disease.
-     */
-    protected Basketball(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * Generate random basketball teams
-     * @return Basketball teams
-     */
-    public String teams() {
-        return faker.fakeValuesService().resolve("basketball.teams", this, faker);
-    }
-
-    /**
-     * Generate random coaches in basketball game
-     * @return Basketball coaches
-     */
-    public String coaches() {
-        return faker.fakeValuesService().resolve("basketball.coaches", this, faker);
-    }
-
-    /**
-     * Generate random positions in basketball game
-     * @return Basketball positions
-     */
-    public String positions() {
-        return faker.fakeValuesService().resolve("basketball.positions", this, faker);
-    }
-
-    /**
-     * Generate random basketball players
-     * @return Basketball players
-     */
-    public String players() {
-        return faker.fakeValuesService().resolve("basketball.players", this, faker);
-    }
-}

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

@@ -1,43 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Generate random parts in BojackHorseman.
- * @author unknown and irakatz
- */
-
-public class BojackHorseman {
-    private final Faker faker;
-
-    /**
-     * Create a constructor for BojackHorseman.
-     * @param faker The Faker instance for generating random parts in BojackHorseman.
-     */
-    protected BojackHorseman(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * Generate random character's name in BojackHorseman.
-     * @return Characters in BojackHorseman
-     */
-    public String characters() {
-        return faker.fakeValuesService().resolve("bojack_horseman.characters", this, faker);
-    }
-
-    /**
-     * Generate random quotes in BojackHorseman.
-     * @return Quotes in BojackHorseman
-     */
-    public String quotes() {
-        return faker.fakeValuesService().resolve("bojack_horseman.quotes", this, faker);
-    }
-
-    /**
-     * Generate random tongue twisters in BojackHorseman.
-     * @return Tongue twisters in BojackHorseman
-     */
-    public String tongueTwisters() {
-        return faker.fakeValuesService().resolve("bojack_horseman.tongue_twisters", this, faker);
-    }
-
-}

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

@@ -1,30 +0,0 @@
-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/Coin.java

@@ -1,17 +0,0 @@
-package com.github.javafaker;
-
-public class Coin {
-
-    private final Faker faker;
-
-    protected Coin(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * @return coin side e.g. "Heads", "Tails".
-     */
-    public String flip() {
-        return faker.fakeValuesService().resolve("coin.flip", this, faker);
-    }
-}

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

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

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

@@ -144,40 +144,34 @@ public class DateAndTime {
             throw new IllegalArgumentException("Invalid date range, the upper bound date is before the lower bound.");
         }
 
-        if (from.equals(to)) {
-            return from;
-        }
-
         long offsetMillis = faker.random().nextLong(to.getTime() - from.getTime());
         return new Date(from.getTime() + offsetMillis);
     }
 
     /**
-     * Generates a random birthday between 65 and 18 years ago from now.
+     * Generates a random birthday between 65 and 18 years ago.
      *
-     * @return a random birthday between 65 and 18 years ago from now.
+     * @return a random birthday between 65 and 18 years ago.
      */
     public Date birthday() {
         return birthday(DEFAULT_MIN_AGE, DEFAULT_MAX_AGE);
     }
 
     /**
-     * Generates a random birthday between two ages from now.
+     * Generates a random birthday between two ages.
      *
      * @param minAge
      *            the minimal age
      * @param maxAge
      *            the maximal age
-     * @return a random birthday between {@code minAge} and {@code maxAge} years ago from now.
+     * @return a random birthday between {@code minAge} and {@code maxAge} years ago.
      * @throws IllegalArgumentException
      *             if the {@code maxAge} is lower than {@code minAge}.
      */
     public Date birthday(int minAge, int maxAge) {
         int currentYear = Calendar.getInstance().get(Calendar.YEAR);
-        int currentMonth = Calendar.getInstance().get(Calendar.MONTH);
-        int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
-        Calendar from = new GregorianCalendar(currentYear - maxAge, currentMonth, currentDay);
-        Calendar to = new GregorianCalendar(currentYear - minAge, currentMonth, currentDay);
+        Calendar from = new GregorianCalendar(currentYear - maxAge, 0, 1);
+        Calendar to = new GregorianCalendar(currentYear - minAge, 11, 31);
 
         return between(from.getTime(), to.getTime());
     }

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

@@ -1,73 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Generate random, different kinds of disease.
- */
-public class Disease {
-    private final Faker faker;
-
-    /**
-     * Create a constructor for Disease
-     * @param faker The Faker instance for generating random, different kinds of disease, e.g. the internal disease.
-     */
-    protected Disease(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * Generate random internal disease
-     * @return An internal disease
-     */
-    public String internalDisease() {
-        return faker.fakeValuesService().resolve("disease.internal_disease", this, faker);
-    }
-
-    /**
-     * Generate random neurology disease
-     * @return A neurology disease
-     */
-    public String neurology() {
-        return faker.fakeValuesService().resolve("disease.neurology", this, faker);
-    }
-
-    /**
-     * Generate random surgery disease
-     * @return A surgery disease
-     */
-    public String surgery() {
-        return faker.fakeValuesService().resolve("disease.surgery", this, faker);
-    }
-
-    /**
-     * Generate random paediattics disease
-     * @return A paediatrics disease
-     */
-    public String paediatrics() {
-        return faker.fakeValuesService().resolve("disease.paediatrics", this, faker);
-    }
-
-    /**
-     * Generate random gynecology and obstetrics disease
-     * @return A gynecology and obstetrics disease
-     */
-    public String gynecologyAndObstetrics() {
-        return faker.fakeValuesService().resolve("disease.gynecology_and_obstetrics", this, faker);
-    }
-
-    /**
-     * Generate random ophthalmology and otorhinolaryngology disease
-     * @return A ophthalmology and otorhinolaryngology disease
-     */
-    public String ophthalmologyAndOtorhinolaryngology() {
-        return faker.fakeValuesService().resolve("disease.ophthalmology_and_otorhinolaryngology", this, faker);
-    }
-
-    /**
-     * Generate random dermatolory disease
-     * @return A dermatolory disease
-     */
-    public String dermatolory() {
-        return faker.fakeValuesService().resolve("disease.dermatolory", this, faker);
-    }
-
-}

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

@@ -1,80 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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/EnglandFootBall.java

@@ -1,18 +0,0 @@
-package com.github.javafaker;
-
-public class EnglandFootBall {
-
-    private final Faker faker;
-
-    protected EnglandFootBall(final Faker faker) {
-        this.faker = faker;
-    }
-
-    public String league() {
-        return faker.fakeValuesService().resolve("englandfootball.leagues",this,faker);
-    }
-
-    public String team() {
-        return faker.fakeValuesService().resolve("englandfootball.teams",this,faker);
-    }
-}

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

@@ -42,16 +42,13 @@ public class Faker {
     private final Hacker hacker;
     private final Options options;
     private final Code code;
-    private final Coin coin;
     private final Finance finance;
     private final Food food;
     private final GameOfThrones gameOfThrones;
-    private final Gender gender;
     private final DateAndTime dateAndTime;
     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;
@@ -88,32 +85,14 @@ 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;
-    private final AquaTeenHungerForce aquaTeenHungerForce;
-    private final ProgrammingLanguage programmingLanguage;
-    private final Kaamelott kaamelott;
-    private final Photography photography;
-    private final StarCraft starCraft;
-    private final BojackHorseman bojackHorseman;
-    private final Disease disease;
-    private final Basketball basketball;
-    private final Barcode barcode;
-    private final Sip sip;
-    private final EnglandFootBall englandfootball;
-    private final Mountain mountain;
 
     public Faker() {
         this(Locale.ENGLISH);
     }
 
     public Faker(Locale locale) {
-        this(locale, (Random)null);
+        this(locale, null);
     }
 
     public Faker(Random random) {
@@ -121,16 +100,8 @@ public class Faker {
     }
 
     public Faker(Locale locale, Random random) {
-        this(locale, new RandomService(random));
-    }
-
-    public Faker(Locale locale, RandomService randomService) {
-        this(new FakeValuesService(locale, randomService), randomService);
-    }
-
-    public Faker(FakeValuesService fakeValuesService, RandomService random) {
-        this.randomService = random;
-        this.fakeValuesService = fakeValuesService;
+        this.randomService = new RandomService(random);
+        this.fakeValuesService = new FakeValuesService(locale, randomService);
 
         this.ancient = new Ancient(this);
         this.app = new App(this);
@@ -153,7 +124,6 @@ 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);
@@ -162,7 +132,6 @@ public class Faker {
         this.finance = new Finance(this);
         this.food = new Food(this);
         this.gameOfThrones = new GameOfThrones(this);
-        this.gender = new Gender(this);
         this.dateAndTime = new DateAndTime(this);
         this.demographic = new Demographic(this);
         this.dog = new Dog(this);
@@ -170,7 +139,6 @@ public class Faker {
         this.shakespeare = new Shakespeare(this);
         this.slackEmoji = new SlackEmoji(this);
         this.space = new Space(this);
-        this.coin = new Coin(this);
         this.superhero = new Superhero(this);
         this.team = new Team(this);
         this.bool = new Bool(this);
@@ -204,25 +172,7 @@ public class Faker {
         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);
-        this.aquaTeenHungerForce = new AquaTeenHungerForce(this);
-        this.programmingLanguage = new ProgrammingLanguage(this);
-        this.kaamelott = new Kaamelott(this);
-        this.photography = new Photography(this);
-        this.starCraft = new StarCraft(this);
-        this.bojackHorseman = new BojackHorseman(this);
-        this.disease = new Disease(this);
-        this.basketball = new Basketball(this);
-        this.barcode = new Barcode(this);
-        this.sip = new Sip(this);
-        this.englandfootball = new EnglandFootBall(this);
-        this.mountain = new Mountain(this);
     }
 
     /**
@@ -403,10 +353,6 @@ public class Faker {
         return book;
     }
 
-    public Buffy buffy() {
-        return buffy;
-    }
-
     public Business business() {
         return business;
     }
@@ -447,10 +393,6 @@ public class Faker {
         return code;
     }
 
-    public Coin coin() {
-        return coin;
-    }
-
     public File file() {
         return file;
     }
@@ -463,18 +405,10 @@ public class Faker {
         return food;
     }
 
-    public ElderScrolls elderScrolls() {
-        return elderScrolls;
-    }
-
     public GameOfThrones gameOfThrones() {
         return gameOfThrones;
     }
 
-    public Gender gender() {
-        return gender;
-    }
-
     public DateAndTime date() {
         return dateAndTime;
     }
@@ -515,7 +449,9 @@ public class Faker {
         return team;
     }
 
-    public Beer beer() { return beer; }
+    public Beer beer() {
+        return beer;
+    }
 
     public University university() {
         return university;
@@ -625,72 +561,14 @@ public class Faker {
         return lebowski;
     }
 
-    public Medical medical() {
-        return medical;
-    }
+    public Medical medical(){return medical;}
 
-    public Country country() {
-        return country;
-    }
-
-    public Animal animal() {
-        return animal;
-    }
+    public Country country(){ return country;}
 
     public BackToTheFuture backToTheFuture() {
-        return backToTheFuture;
+        return  backToTheFuture;
     }
 
-    public PrincessBride princessBride() {
-        return princessBride;
-    }
-
-    public Relationships relationships() {
-        return relationships;
-    }
-
-    public Nation nation() {
-        return nation;
-    }
-
-    public Dune dune() {
-        return dune;
-    }
-
-    public AquaTeenHungerForce aquaTeenHungerForce() {
-        return aquaTeenHungerForce;
-    }
-
-    public ProgrammingLanguage programmingLanguage() {
-        return programmingLanguage;
-    }
-
-    public Kaamelott kaamelott() {
-        return kaamelott;
-    }
-
-    public Photography photography() {
-        return  photography;
-    }
-
-    public StarCraft starCraft() {
-        return starCraft;
-    }
-
-    public BojackHorseman bojackHorseman() { return bojackHorseman; }
-
-    public Disease disease() {return disease; }
-
-    public Basketball basketball() { return basketball; }
-
-    public Barcode barcode() { return barcode; }
-
-    public Sip sip() { return sip; }
-
-    public EnglandFootBall englandfootball() { return englandfootball; }
-
-    public Mountain mountain() { return mountain; }
-
     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 dir + sep + name + "." + ext;
+        return new StringBuilder(dir).append(sep).append(name).append(".").append(ext).toString();
     }
 }

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

@@ -16,22 +16,6 @@ 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/Gender.java

@@ -1,41 +0,0 @@
-package com.github.javafaker;
-
-/**
- * This class is used to generate gender randomly.
- *
- */
-
-public class Gender {
-    private final Faker faker;
-
-    protected Gender(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * This method returns a gender type
-     *
-     * @return a string of gender type
-     */
-    public String types() {
-        return faker.fakeValuesService().fetchString("gender.types");
-    }
-
-    /**
-     * This method returns a binary gender type
-     *
-     * @return a string of binary gender type
-     */
-    public String binaryTypes() {
-        return faker.fakeValuesService().fetchString("gender.binary_types");
-    }
-
-    /**
-     * This method returns a short binary gender type
-     *
-     * @return a string of short binary gender type
-     */
-    public String shortBinaryTypes() {
-        return faker.fakeValuesService().fetchString("gender.short_binary_types");
-    }
-}

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

@@ -22,12 +22,4 @@ public class HarryPotter {
     public String book() {
         return faker.resolve("harry_potter.books");
     }
-
-    public String house() {
-        return faker.resolve("harry_potter.houses");
-    }
-
-    public String spell() {
-        return faker.resolve("harry_potter.spells");
-    }
 }

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

@@ -51,7 +51,7 @@ public class Internet {
     }
 
     public String url() {
-        return join(
+        return join(new Object[]{
                 "www",
                 ".",
                 FakerIDN.toASCII(
@@ -61,7 +61,7 @@ public class Internet {
                 ),
                 ".",
                 domainSuffix()
-        );
+        });
     }
 
     /**

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

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

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

@@ -20,7 +20,7 @@ public class Lorem {
     }
 
     public char character(boolean includeUppercase) {
-        return characters(1, includeUppercase).charAt(0);
+        return characters(1).charAt(0);
     }
 
     public String characters() {
@@ -28,7 +28,7 @@ public class Lorem {
     }
 
     public String characters(boolean includeUppercase) {
-        return characters(255, includeUppercase);
+        return characters(255, false);
     }
 
     public String characters(int minimumLength, int maximumLength) {

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

@@ -1,17 +0,0 @@
-package com.github.javafaker;
-
-public class Mountain {
-    private final Faker faker;
-
-    protected Mountain(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String name() {
-        return faker.fakeValuesService().resolve("mountain.name", this, faker);
-    }
-
-    public String range() {
-        return faker.fakeValuesService().resolve("mountain.range", this, faker);
-    }
-}

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

@@ -121,20 +121,12 @@ public class Name {
      */
     public String username() {
 
-        String username = StringUtils.join(
+        String username = StringUtils.join(new String[]{
                 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

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

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

@@ -14,20 +14,4 @@ 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/Photography.java

@@ -1,76 +0,0 @@
-package com.github.javafaker;
-
-/**
- * Provides photography related strings.
- */
-public class Photography {
-
-    private final Faker faker;
-
-    protected Photography(Faker faker) {
-        this.faker = faker;
-    }
-
-    /**
-     * @return a photography term.
-     */
-    public String term() {
-        return faker.fakeValuesService().fetchString("photography.term");
-    }
-
-    /**
-     * @return a photography brand.
-     */
-    public String brand() {
-        return faker.fakeValuesService().fetchString("photography.brand");
-    }
-
-    /**
-     * @return a name of camera model/make.
-     */
-    public String camera() {
-        return faker.fakeValuesService().fetchString("photography.camera");
-    }
-
-    /**
-     * @return some lens description like 500mm/8.
-     */
-    public String lens() {
-        return faker.fakeValuesService().fetchString("photography.lens");
-    }
-
-    /**
-     * @return a photography genre.
-     */
-    public String genre() {
-        return faker.fakeValuesService().fetchString("photography.genre");
-    }
-
-    /**
-     * @return some string to tag an image.
-     */
-    public String imageTag() {
-        return faker.fakeValuesService().fetchString("photography.imagetag");
-    }
-
-    /**
-     * @return some aperture description like f/1.4 .
-     */
-    public String aperture() {
-        return faker.fakeValuesService().fetchString("photography.aperture");
-    }
-
-    /**
-     * @return some shutter description like 1/25 .
-     */
-    public String shutter() {
-        return faker.fakeValuesService().fetchString("photography.shutter");
-    }
-
-    /**
-     * @return some ISO value like 3200.
-     */
-    public String iso() {
-        return faker.fakeValuesService().fetchString("photography.iso");
-    }
-}

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

@@ -1,17 +0,0 @@
-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/ProgrammingLanguage.java

@@ -1,19 +0,0 @@
-package com.github.javafaker;
-
-public class ProgrammingLanguage {
-
-    private final Faker faker;
-
-    public ProgrammingLanguage(Faker faker) {
-        this.faker = faker;
-    }
-
-    public String name() {
-        return faker.fakeValuesService().resolve("programming_language.name", this, faker);
-    }
-
-    public String creator() {
-        return faker.fakeValuesService().resolve("programming_language.creator", this, faker);
-    }
-
-}

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

@@ -1,60 +0,0 @@
-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/Sip.java

@@ -1,215 +0,0 @@
-package com.github.javafaker;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.util.ArrayList;
-
-/**
- * Faker class for generating Session Initiation Protocol (SIP) related data.
- *
- * @author TomerFi
- */
-public final class Sip {
-    private final Faker faker;
-    private final ArrayList<Integer> portPool;
-
-    protected Sip(final Faker faker) {
-        this.faker = faker;
-        int port = 40000;
-        portPool = new ArrayList<Integer>();
-        while (port <= 50000) {
-            portPool.add(port);
-            port = port + 2;
-        }
-    }
-
-    /**
-     * The various SIP methods are listed in https://en.wikipedia.org/wiki/Session_Initiation_Protocol.
-     *
-     * @return a SIP method String, e.g. {@code INVITE}.
-     */
-    public String method() {
-        return faker.resolve("sip.methods");
-    }
-
-    /**
-     * Content types are based on https://tools.ietf.org/html/rfc5621 and
-     * https://tools.ietf.org/html/rfc3261.
-     *
-     * @return a SIP content-type declaration String, e.g. {@code application/sdp}
-     */
-    public String contentType() {
-        return faker.resolve("sip.content.types");
-    }
-
-    /**
-     * Get a 4 digit random port for SIP messaging.
-     *
-     * @return a SIP messaging port int, e.g. 5060.
-     */
-    public int messagingPort() {
-        return faker.random().nextInt(1000, 9999);
-    }
-
-    /**
-     * Get a 5 digit positive even port for rtp udp communication.
-     *
-     * @return an RTP UDP 5 digit port int, e.g. 40002.
-     */
-    public int rtpPort() {
-        return portPool.get(faker.random().nextInt(0, portPool.size()));
-    }
-
-    /**
-     * Proviosional code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP provisioan response code between 100 and 199 int, e.g. {@code 180}.
-     */
-    public int provisionalResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.provisional"));
-    }
-
-    /**
-     * Success code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP success response code between 200 and 299 int, e.g. {@code 200}.
-     */
-    public int successResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.success"));
-    }
-
-    /**
-     * Redirection code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP redirection response code between 300 and 399 int, e.g. {@code 301}.
-     */
-    public int redirectResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.redirection"));
-    }
-
-    /**
-     * Client error code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP client error response code between 400 and 499 int, e.g. {@code 486}.
-     */
-    public int clientErrorResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.clientError"));
-    }
-
-    /**
-     * Server error code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP server error response code between 500 and 599 int, e.g. {@code 503}.
-     */
-    public int serverErrorResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.serverError"));
-    }
-
-    /**
-     * Global error code, the various response codes are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a 3 digit SIP global error response code between 600 and 699 int, e.g. {@code 608}.
-     */
-    public int globalErrorResponseCode() {
-        return Integer.parseInt(faker.resolve("sip.response.codes.globalError"));
-    }
-
-    /**
-     * Proviosional phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP provisional response phrase String, e.g. {@code Ringing}.
-     */
-    public String provisionalResponsePhrase() {
-        return faker.resolve("sip.response.phrases.provisional");
-    }
-
-    /**
-     * Success phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP success response phrase String, e.g. {@code OK}.
-     */
-    public String successResponsePhrase() {
-        return faker.resolve("sip.response.phrases.success");
-    }
-
-    /**
-     * Redirection phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP redirection response phrase String, e.g. {@code Moved Permanently}.
-     */
-    public String redirectResponsePhrase() {
-        return faker.resolve("sip.response.phrases.redirection");
-    }
-
-    /**
-     * Client error phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP client error response phrase String, e.g. {@code Busy Here}.
-     */
-    public String clientErrorResponsePhrase() {
-        return faker.resolve("sip.response.phrases.clientError");
-    }
-
-    /**
-     * Server error phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP server erro response phrase String, e.g. {@code Service Unavailable}.
-     */
-    public String serverErrorResponsePhrase() {
-        return faker.resolve("sip.response.phrases.serverError");
-    }
-
-    /**
-     * Server error phrase, the various response phrases are listed in
-     * https://en.wikipedia.org/wiki/List_of_SIP_response_codes.
-     *
-     * @return a SIP global error response phrase String, e.g. {@code Rejected}.
-     */
-    public String globalErrorResponsePhrase() {
-        return faker.resolve("sip.response.phrases.globalError");
-    }
-
-    /**
-     * Body example of SDP type can be found in https://tools.ietf.org/html/rfc5621.
-     *
-     * @return a fake SDP type SIP body String.
-     */
-    public String bodyString() {
-        return "v=0\n" +
-        "o=" + faker.name().firstName() + " " + faker.internet().uuid() + " IN IP4 " + faker.internet().domainName() + "\n" +
-        "s=-\n" +
-        "c=IN IP4 " + faker.internet().ipV4Address() + "\n" +
-        "t=0 0\n" +
-        "m=audio " + rtpPort() + " RTP/AVP 0\n" +
-        "a=rtpmap:0 PCMU/8000";
-    }
-
-    /**
-     * Body example of SDP type can be found in https://tools.ietf.org/html/rfc5621.
-     *
-     * @return a fake SDP type SIP body byte array.
-     */
-    public byte[] bodyBytes() {
-        return bodyString().getBytes(UTF_8);
-    }
-
-    /**
-     * Return a valid name address to use with {@code to/from} headers.
-     *
-     * @return a valid name address String, e.g. {@code <sip:fakeName@10.1.2.3:5060>}.
-     */
-    public String nameAddress() {
-        return "<sip:" + faker.name().firstName() + "@" + faker.internet().ipV4Address() + ":" + messagingPort() + ">";
-    }
-}

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

@@ -1,27 +0,0 @@
-package com.github.javafaker;
-
-public class StarCraft {
-
-    private final Faker faker;
-
-    protected StarCraft(final Faker faker) {
-        this.faker = faker;
-    }
-
-    public String unit() {
-        return faker.fakeValuesService().resolve("starcraft.units", this, faker);
-    }
-
-    public String building() {
-        return faker.fakeValuesService().resolve("starcraft.buildings", this, faker);
-    }
-
-    public String character() {
-        return faker.fakeValuesService().resolve("starcraft.characters", this, faker);
-    }
-
-    public String planet() {
-        return faker.fakeValuesService().resolve("starcraft.planets", this, faker);
-    }
-
-}

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

@@ -22,8 +22,4 @@ public class StarTrek {
     public String villain() {
         return faker.fakeValuesService().resolve("star_trek.villain", this, faker);
     }
-
-    public String klingon() {
-        return faker.fakeValuesService().resolve("star_trek.klingon", this, faker);
-    }
 }

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 (String invalidSSNPattern : invalidSSNPatterns) {
-            if (ssn.matches(invalidSSNPattern)) {
+        for (int i = 0; i < invalidSSNPatterns.length; i++) {
+            if (ssn.matches(invalidSSNPatterns[i])) {
                 isValid = false;
                 break;
             }

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

@@ -2,7 +2,6 @@ package com.github.javafaker.service;
 
 import org.yaml.snakeyaml.Yaml;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
@@ -76,11 +75,6 @@ public class FakeValues implements FakeValuesInterface {
         if (localeBased == null) {
             localeBased = (Map) valuesMap.get(filename);
         }
-        try {
-            stream.close();
-        } catch (IOException ex){
-            return null;
-        }
         return (Map) localeBased.get("faker");
     }
 

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

@@ -13,18 +13,18 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 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_ARGUMENTS_PATTERN = Pattern.compile("(?:'(.*?)')");
+    private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?(?:'([^']+)')?(?:,'([^']+)')*\\}");
 
     private final Logger log = Logger.getLogger("faker");
 
@@ -72,7 +72,7 @@ public class FakeValuesService {
                 }
                 all.add(fakeValuesGrouping);
             } else {
-                all.add(new FakeValues(l));
+                all.add(new FakeValues(locale));
             }
         }
 
@@ -108,7 +108,7 @@ public class FakeValuesService {
      * 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]);
@@ -347,11 +347,9 @@ public class FakeValuesService {
         while (matcher.find()) {
             final String escapedDirective = matcher.group(0);
             final String directive = matcher.group(1);
-            final String arguments = matcher.group(2);
-            final Matcher argsMatcher = EXPRESSION_ARGUMENTS_PATTERN.matcher(arguments);
             List<String> args = new ArrayList<String>();
-            while (argsMatcher.find()) {
-                args.add(argsMatcher.group(1));
+            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
@@ -575,7 +573,7 @@ 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 static class MethodAndCoercedArgs {
+    private class MethodAndCoercedArgs {
 
         private final Method method;
 

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

@@ -60,18 +60,11 @@ public class RandomService {
     }
 
     public String hex(int length) {
-        if (length <= 0) {
-            return ""; // Keep the existing behavior instead of throwing an error.
+        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)]);
         }
-        final char[] hexChars = new char[length];
-        for (int i = 0; i < length; i++) {
-            final int nextHex = nextInt(16);
-            if (nextHex < 10) {
-                hexChars[i] = (char) ('0' + nextHex);
-            } else {
-                hexChars[i] = (char) ('A' + nextHex - 10);
-            }
-        }
-        return new String(hexChars);
+        return hexString.toString();
     }
 }

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

@@ -35,9 +35,7 @@ public class EnFile {
             "artist.yml",
             "aviation.yml",
             "back_to_the_future.yml",
-            "barcode.yml",
             "bank.yml",
-            "basketball.yml",
             "beer.yml",
             "bojack_horseman.yml",
             "book.yml",
@@ -64,7 +62,6 @@ public class EnFile {
             "demographic.yml",
             "dessert.yml",
             "device.yml",
-            "disease.yml",
             "dota.yml",
             "dr_who.yml",
             "dragon_ball.yml",
@@ -74,7 +71,6 @@ public class EnFile {
             "elder_scrolls.yml",
             "electrical_components.yml",
             "esport.yml",
-            "englandfootball.yml",
             "fallout.yml",
             "family_guy.yml",
             "famous_last_words.yml",
@@ -120,7 +116,6 @@ public class EnFile {
             "military.yml",
             "most_interesting_man_in_the_world.yml",
             "movie.yml",
-            "mountain.yml",
             "music.yml",
             "myst.yml",
             "name.yml",
@@ -132,7 +127,6 @@ public class EnFile {
             "parks_and_rec.yml",
             "phish.yml",
             "phone_number.yml",
-            "photography.yml",
             "pokemon.yml",
             "princess_bride.yml",
             "programming_language.yml",
@@ -148,13 +142,11 @@ public class EnFile {
             "silicon_valley.yml",
             "simpsons.yml",
             "singular_siegler.yml",
-            "sip.yml",
             "slack_emoji.yml",
             "sonic_the_hedgehog.yml",
             "source.yml",
             "south_park.yml",
             "space.yml",
-            "starcraft.yml",
             "star_trek.yml",
             "star_wars.yml",
             "stargate.yml",
@@ -178,7 +170,6 @@ public class EnFile {
             "verbs.yml",
             "weather.yml",
             "witcher.yml",
-            "kaamelott.yml",
             "world_cup.yml",
             "world_of_warcraft.yml",
             "yoda.yml",
@@ -186,7 +177,6 @@ public class EnFile {
 
     // 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"),
@@ -194,7 +184,6 @@ public class EnFile {
             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
 
 

src/main/resources/bg.yml

@@ -27,9 +27,6 @@ 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,11 +21,5 @@ 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,6 +38,7 @@ 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]
@@ -45,12 +46,6 @@ 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:
@@ -69,5 +64,6 @@ 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

@@ -1,61 +0,0 @@
-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,8 +7,6 @@ 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,26 +11,4 @@ en-CA:
       domain_suffix: [ca, com, biz, info, name, net, org]
 
     phone_number:
-      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}"
+      formats: ['###-###-####', '(###)###-####', '###.###.####', '1-###-###-####', '###-###-#### x###', '(###)###-#### x###', '1-###-###-#### x###', '###.###.#### x###', '###-###-#### x####', '(###)###-#### x####', '1-###-###-#### x####', '###.###.#### x####', '###-###-#### x#####', '(###)###-#### x#####', '1-###-###-#### x#####', '###.###.#### x#####']

src/main/resources/en-GB.yml

@@ -4,7 +4,6 @@ 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,12 +7,6 @@ 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,8 +25,6 @@ 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"]
@@ -47,3 +45,5 @@ en-NEP:
       suffix: ['Pvt Ltd', 'Group', 'Ltd', 'Limited']
     phone_number:
       formats: ['##-#######', '+977-#-#######', '+977########']
+
+

src/main/resources/en-NG.yml

@@ -29,8 +29,6 @@ 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,16 +8,13 @@
 # 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]
@@ -34,6 +31,12 @@ 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,8 +3,7 @@ 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,8 +16,6 @@ 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: ['#', '##', '###']
@@ -31,5 +29,3 @@ en-SG:
       default_country: [Singapore]
     phone_number:
       formats: ['+65 6### ####', '+65 9### ####', '+65 8### ####']
-    vehicle:
-      license_plate: 'S??####'

src/main/resources/en.yml

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

src/main/resources/en/address.yml

@@ -19,7 +19,6 @@ en:
         AW: "Aruba"
         AU: "Australia"
         AT: "Austria"
-        AX: "Aland Islands"
         AZ: "Azerbaijan"
         BS: "Bahamas"
         BH: "Bahrain"
@@ -32,7 +31,6 @@ en:
         BM: "Bermuda"
         BT: "Bhutan"
         BO: "Bolivia"
-        BQ: 'Bonaire'
         BA: "Bosnia And Herzegovina"
         BW: "Botswana"
         BV: "Bouvet Island"
@@ -62,7 +60,6 @@ en:
         CI: "Cote D'ivoire"
         HR: "Croatia"
         CU: "Cuba"
-        CW: "Curacao"
         CY: "Cyprus"
         CZ: "Czech Republic"
         DK: "Denmark"
@@ -97,7 +94,6 @@ en:
         GP: "Guadeloupe"
         GU: "Guam"
         GT: "Guatemala"
-        GG: 'Guernsey'
         GN: "Guinea"
         GW: "Guinea-bissau"
         GY: "Guyana"
@@ -113,12 +109,10 @@ 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"
@@ -173,7 +167,7 @@ en:
         NU: "Niue"
         NF: "Norfolk Island"
         MP: "Northern Mariana Islands"
-        'NO': "Norway"
+        NO: "Norway"
         OM: "Oman"
         PK: "Pakistan"
         PW: "Palau"
@@ -192,11 +186,9 @@ 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"
@@ -208,14 +200,12 @@ 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"
@@ -229,7 +219,6 @@ en:
         TJ: "Tajikistan"
         TZ: "Tanzania, United Republic Of"
         TH: "Thailand"
-        TL: "Timor-Leste"
         TG: "Togo"
         TK: "Tokelau"
         TO: "Tonga"
@@ -397,6 +386,7 @@ en:
         mauritania: "MR"
         mauritius: "MU"
         mayotte: "YT"
+        mexicoMX: ""
         micronesia_federated_states_of: "FM"
         moldova_republic_of: "MD"
         monaco: "MC"
@@ -419,7 +409,7 @@ en:
         niue: "NU"
         norfolk_island: "NF"
         northern_mariana_islands: "NP"
-        norway: "NO"
+        norway: "NP"
         oman: "OM"
         pakistan: "PK"
         palau: "PW"
@@ -504,7 +494,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
@@ -566,19 +556,20 @@ 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/barcode.yml

@@ -1,10 +0,0 @@
-en:
-  faker:
-    barcode:
-      types: ['UPC', 'UPC-A', 'UPC-E', 'Code128', 'Code39','Code93', 'EAN', 'EAN-13', 'EAN-8', 'JAN-13', 'ISBN', 'ISSN',
-              'ITF', 'Codabar', 'Ames Code', 'NW-7', 'Monarch', 'Code 2 of 7', 'Rationalized', 'ANSI/AIM BC3-1995', 'USD-4',
-              'GS1 Databar', 'MSI Plessey', 'UCC']
-      datas: ['12345678', '09876543', '05755069', '15008444', '69503172', '05082366', '29951287', '37457367',
-              '87164772', '17217165', '56462327', '35186895', '16957481', '68124245', '28664694', '12372549',
-              '02527355']
-      typeAndData: "#{barcode.types} #{barcode.datas}"

src/main/resources/en/basketball.yml

@@ -1,99 +0,0 @@
-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', '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']
+      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', 'Becks', 'Bitburger', 'Koenig Pilsener', 'Vitamalz', 'Schluessel Alt', 'Charlottenburger Pilsener', 'Brinkhoffs', 'Oettinger', 'Krombacher', 'Veltins', 'Warsteiner']
+      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']
       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,4 +10,3 @@ 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/coin.yml

@@ -1,5 +1,6 @@
 en:
   faker:
     coin:
-      flip: ["Heads", "Tails"]
-
+      flip:
+        - Heads
+        - Tails

src/main/resources/en/commerce.yml

@@ -7,5 +7,5 @@ en:
         material: [Steel, Wooden, Concrete, Plastic, Cotton, Granite, Rubber, Leather, Silk, Wool, Linen, Marble, Iron, Bronze, Copper, Aluminum, Paper]
         product: [Chair, Car, Computer, Gloves, Pants, Shirt, Table, Shoes, Hat, Plate, Knife, Bottle, Coat, Lamp, Keyboard, Bag, Bench, Clock, Watch, Wallet]
       promotion_code:
-        adjective: ['Amazing', 'Awesome', 'Cool', 'Good', 'Great', 'Incredible', 'Killer', 'Premium', 'Special', 'Stellar', 'Sweet']
-        noun: ['Code', 'Deal', 'Discount', 'Price', 'Promo', 'Promotion', 'Sale', 'Savings']
+        adjective: ['Amazing', 'Awesome', 'Cool', 'Good', 'Great', 'Incredible', 'Special', 'Surprising', 'Wonderful', 'Marvelous', 'Unbelievable', 'Stunning', 'Spectacular', 'Breathtaking', 'Exciting', 'Impressive', 'Overwhelming', 'Thrilling', 'First-Class']
+        noun: ['Code', 'Deal', 'Discount', 'Price', 'Promo', 'Promotion', 'Sale', 'Savings', 'Rebate', 'Bonus', 'Benefit', 'Bounty', 'Perk', 'Reward', 'Winning']

src/main/resources/en/construction.yml

@@ -1,19 +1,6 @@
 en:
   faker:
     construction:
-      heavy_equipment: [
-        "Excavator",
-        "Backhoe",
-        "Bulldozer",
-        "Skid-Steer",
-        "Grader",
-        "Crawler",
-        "Trencher",
-        "Scraper",
-        "Dump Truck",
-        "Compactor",
-        "Dragline"
-      ]
       materials: [
         "Aluminum",
         "Brass",
@@ -74,352 +61,3 @@ 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

@@ -3,7 +3,7 @@ en:
     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"]
+      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,25 +1,9 @@
 en:
   faker:
     crypto_coin:
-      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"
+      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"

src/main/resources/en/culture_series.yml

@@ -1,307 +0,0 @@
-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",
-      "Bizarro", "Riddler", "Captain Cold", "Bane", "Harley Quinn", "Scarecrow",
+      "Bizaroo", "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/disease.yml

@@ -1,12 +0,0 @@
-en:
-  faker:
-    disease:
-      internal_disease: ['Acidosis', 'Adams-Stokes syndrome', 'alcoholism', 'alkalosis', 'anaphylaxis', 'anemia', 'iron deficiency anemia', 'megaloblastic anemia', 'aplastic anemia', 'angiitis', 'angina pectoris', 'arteriosclerosis', 'apoplexy', 'auricular fibrillation', 'auriculo-ventricular block', 'bronchial asthma', 'bronchitis', 'bronchiectasis', 'bronchopneumonia', 'carcinoma', 'cardiac arrhythmia', 'cardiac failure', 'cardiomyopathy', 'cirrhosis', 'coronary arteriosclerotic heart disease', 'Crohn disease', "Cushing's syndrome", 'diabetes', 'diffuse intravascular coagulation', 'dysentery', 'enteritis', 'gastric ulcer', 'gastritis', 'gout', 'hepatitis', "Hodgkin's disease", 'hyperlipemia', 'hyperparathyroidism', 'hypersplenism', 'hypertension', 'hyperthyroidism', 'hypoglycemia', 'hypothyroidism', 'infective endocarditis', 'influenza', 'leukemia', 'lobar pneumonia', 'lymphadenitis', 'lymphoma', 'malaria', 'malnutrition', 'measles', 'myeloma', 'myocardial infarction', 'myocarditis', 'nephritis', 'nephritic syndrome', 'obstructive pulmonary emphysema', 'pancreatitis', 'peptic ulcer', 'peritonitis', 'pleuritis', 'pneumonia', 'pneumothorax', 'purpura', 'allergic purpura', 'thrombocytolytic purpura', 'pyelonephritis', 'renal failure', 'rheumatic fever', 'rheumatoid arthritis', 'scarlet fever', 'septicemia', 'syphilis', 'tachycardia', 'tumour', 'typhoid', 'ulcerative colitis']
-      neurology: ['brain abscess', 'cerebral embolism', 'cerebral infarction', 'cerebral thrombosis', 'cerebral hemorrhage', 'concussion of brain', 'craniocerebral injury', 'epilepsy', 'intracranial tumour', 'intracranial hematoma', 'meningitis', 'migraine', 'neurasthenia', 'neurosis', 'paranoid psychosis', "Parkinson's disease", 'psychosis']
-      surgery: ['abdominal external hernia', 'acute diffuse peritonitis', 'acute mastitis', 'acute pancreatitis', 'acute perforation of gastro-duodenal', 'acute pyelonephritis', 'anal fissure', 'anal fistula', 'anesthesia', 'angioma', 'appendicitis', 'bleeding of gastro-duodenal ulcer', 'bone tumour', 'breast adenoma', 'burn', 'cancer of breast', 'carbuncle', 'carcinoma of colon', 'carcinoma of esophagus', 'carcinoma of gallbladder', 'carcinoma of rectum', 'carcinoma of stomach', 'cholecystitis', 'cervical spondylosis', 'choledochitis', 'cholelithiasis', 'chondroma', 'dislocation of joint', 'erysipelas', 'fracture', 'furuncle', 'hemorrhoid', 'hemothorax', 'hypertrophy of prostate', 'intestinal obstruction', 'intestinal tuberculosis', 'lipoma', 'lithangiuria', 'liver abscess', 'melanoma', 'osseous tuberculosis', 'osteoclastoma', 'osteoporosis', 'osteosarcoma', 'osteosarcoma', "Paget's disease", 'perianorecrtal abscess', 'phlegmon', 'portal hypertension', 'prostatitis', 'protrusion of intervertebral disc', 'purulent arthritis', 'pyogenic ostcomyclitis', 'pyothorax', 'rectal polyp', 'rheumatoid arthritis', 'rupture of spleen', 'scapulohumeral periarthritis', 'tenosynovitis', 'tetanus', 'thromboangiitis', 'thyroid adenocarcinoma', 'thyroid adenoma', 'trauma', 'urinary infection', 'varicose vein of lower limb']
-      paediatrics: ['acute military tuberculosis of the lung', 'acute necrotic enteritis', 'anaphylactic purpura', 'ancylostomiasis', 'ascariasis', 'asphyxia of the newborn', 'atrial septal defect', 'birth injury', 'cephalhematoma', 'cerebral palsy', 'congenital torticollis', 'convulsion', "Down's syndrome", 'glomerulonephritis', 'hemophilia', 'infantile diarrhea', 'intracranial hemorrhage of the newborn', 'intussusception', 'necrotic enterocolitis of newborn', 'neonatal jaundice', 'nutritional iron deficiency anemia', 'nutritional megaloblastic anemia', 'patent ductus arteriosis', 'poliomyelitis', 'premature infant', 'primary tuberculosis', 'progressive muscular dystrophy', 'pulmonary stenosis', 'purulent meningitis', 'rickets', 'sepsis of the newborn', 'tetanus of the newborn', 'tetralogy of Fallot', 'thrush', 'varicella', 'ventricular septal defect', 'viral encephalitis', 'viral myocarditis']
-      gynecology_and_obstetrics: ['abortion', 'adenomyosis', 'amniotic fluid embolism', 'Bartholins cyst', 'carcinoma of cervix', 'carcinoma of endometrium', 'carcinoma of ovary', 'cervicitis', 'chorio-epithelioma', 'corpora luteum cyst', 'dystocia', 'eclampsia', 'edema-proteinuria-hypertension', 'endometriosis', 'extrauterine pregnancy', 'hydatidiform mole', 'hyperemesis gravidarum', 'infertility', 'irregular menstruation', 'lochia', 'monilial vaginitis', 'multiple pregnancy', 'myoma of uterus', 'oligohydramnios', 'ovarian tumour', 'pelvic inflammatory disease', 'placenta previa', 'placental abruption', 'pregnancy-hypertension syndrome', 'premature birth', 'premature rupture of membrane', 'postpartum hemorrhage', 'puerperal infection', 'rupture of uterus', 'trichomonas vaginitis', 'uteroplacental apoplexy', 'vulvitis']
-      ophthalmology_and_otorhinolaryngology: ['amblyopia', 'tonsillitis', 'astigmatism', 'carcinoma of nasphyarynx', 'carcinoma of larynx', 'cataract', 'tinnitus', 'chalazion', 'colour blindness', 'deflection of nasal septum', 'deafness', 'furuncle of nasalvestibule', 'glaucoma', 'heterotropia', 'hyperopia', 'injury of cornea', 'ceruminal impaction', 'iritis', 'keratitis', 'labyrinthitis', 'laryngitis', 'mastoiditis', 'myopia', 'nasal sinusitis', 'otitis media', 'obstruction of larynx', 'peritonsillar abscess', 'pharyngitis', 'rhinitis']
-      dermatolory: ['acne', 'carcinoma of skin', 'bed sore', 'decubitus ulcer', 'drug eruption', 'eczema', 'herpes simplex', 'herpes zoster', 'lupus erythematosis', 'psoriasis', 'urticaria']
-
-

src/main/resources/en/dog.yml

@@ -10,3 +10,4 @@ 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", "Meepo"]
+        hero: ["Abaddon", "Alchemist", "Axe", "Beastmaster", "Brewmaster", "Bristleback", "Centaur Warrunner", "Chaos Knight", "Clockwerk"]
         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,8 +45,6 @@ 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,48 +9,3 @@ 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/englandfootball.yml

@@ -1,103 +0,0 @@
-en:
-  faker:
-    englandfootball:
-      leagues: [
-        "PremierLeague",
-        "EFLChampionship",
-        "EFLLeagueone",
-        "EFLLeaguetwo"
-      ]
-      teams: [
-        "NewcastileUnited",
-        "LecesterCityF.C.",
-        "LiverpoolF.C.",
-        "LeedsUnitedF.C.",
-        "ManchesterCityF.C.",
-        "ManchesterUnitedF.C.",
-        "BurnleyF.C.",
-        "Brighton&HoveAlbionF.C.",
-        "SouthamptonF.C.",
-        "SheffieldUnitedF.C.",
-        "ArsenalF.C.",
-        "AstonVillaF.C.",
-        "EvertonF.C.",
-        "WolverhamptonWanderersF.C.",
-        "WestBromwichAlbionF.C.",
-        "WestHamUnitedF.C.",
-        "ChelseaF.C.",
-        "TottenhamHotspurF.C.",
-        "CrystalPalaceF.C.",
-        "FulhamF.C.",
-        "NorwichCityF.C.",
-        "NottinghamForestF.C.",
-        "DerbyCountyF.C.",
-        "RotherhamUnitedF.C.",
-        "LutonTownF.C.",
-        "ReadingF.C.",
-        "MiddlesbroughF.C.",
-        "MillwallF.C.",
-        "BarnsleyF.C.",
-        "BirminghamCity.F.C.",
-        "A.F.C.Bournemouth",
-        "BrentfordF.C.",
-        "BristolCityF.C.",
-        "BlackburnRoversF.C.",
-        "SheffieldWednesdayF.C.",
-        "SwanseaCityA.F.C.",
-        "StokeCityF.C.",
-        "WatfordF.C.",
-        "WycombeWanderersF.C.",
-        "CardiffCityF.C.",
-        "CoventryCity.F.C.",
-        "QueensParkRangersF.C.",
-        "PrestonNorthEndF.C.",
-        "HuddersfieldTownA.F.C.",
-        "NorthamptonTownF.C.",
-        "DoncasterRoversF.C.",
-        "RochdaleA.F.C.",
-        "LincolnCityF.C.",
-        "MiltonKeynesDonsF.C.",
-        "BurtonAlbionF.C.",
-        "BristolRoversF.C.",
-        "BlackpoolF.C.",
-        "SunderlandA.F.C.",
-        "ShrewsburyTownF.C.",
-        "SwindonTownF.C.",
-        "AccringtonStanleyF.C.",
-        "OxforUnitedF.C.",
-        "WiganAthleticF.C.",
-        "AFCWimbledon",
-        "IpswichTownF.C.",
-        "GillinghamF.C.",
-        "CharltonAthleticF.C.",
-        "CreweAlexandraF.C.",
-        "PortsmouthF.C.",
-        "PlymouthArgyleF.C.",
-        "FleetwoodTownF.C.",
-        "PeterboroughUnitedF.C.",
-        "HullCityA.F.C",
-        "GrimsbyTownF.C.",
-        "NewportCountyA.F.C.",
-        "LeytonOrientF.C.",
-        "MansfieldTownF.C.",
-        "MorecambeF.C.",
-        "BarrowA.F.C.",
-        "BoltonWanderersF.C.",
-        "BradfordCityA.F.C.",
-        "SouthendUnitedF.C.",
-        "SalfordCityF.C.",
-        "ScunthorpeUnitedF.C.",
-        "StevenageF.C.",
-        "ExeterCityF.C.",
-        "OldhamAthleticA.F.C.",
-        "WalsallF.C.",
-        "CheltenhamTownF.C.",
-        "CarlisleUnitedF.C.",
-        "CambridgeUnitedF.C.",
-        "ColchesterUnitedF.C.",
-        "CrawleyTownF.C.",
-        "TranmereRoversF.C.",
-        "ForestGreenRoversF.C.",
-        "PortValeF.C.",
-        "HarrogateTownA.F.C."
-      ]

src/main/resources/en/game.yml

@@ -1,283 +0,0 @@
-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/gender.yml

@@ -1,6 +1,5 @@
-en:
-  faker:
-    gender:
-      types: ["Female", "Male", "NonBinary", "Agender", "Genderfluid", "Genderqueer", "Bigender", "Polygender"]
-      binary_types: ["Female", "Male"]
-      short_binary_types: ["f", "m"]
+en:
+  faker:
+    gender:
+      types: ["Female", "Male", "Non-binary", "Agender", "Genderfluid", "Genderqueer", "Bigender", "Polygender"]
+      binary_types: ["Female", "Male"]

src/main/resources/en/grateful_dead.yml

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

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: ["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"]
+      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"]
       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/kaamelott.yml

@@ -1,5 +0,0 @@
-en:
-  faker:
-    kaamelott:
-      characters: ["Angharad", "Anna", "Appius Manilius", "Arthur", "Attila", "Belt", "Père Blaise", "Bohort", "Breccan", "Le roi burgonde", "Caius Camillus", "Calogrenant", "Capito", "César", "Cryda de Tintagel", "Dagonet", "La Dame du Lac", "Demetra", "Le duc d'Aquitaine", "Edern", "Élias de Kelliwic'h", "Galessin", "Gauvain", "Goustan", "Grüdü", "Guenièvre", "Guethenoc", "Hervé de Rinel", "L'interprète burgonde", "Le Seigneur Jacca", "Les Jumelles du pêcheur", "Le Jurisconsulte", "Kadoc", "Karadoc", "Lancelot", "Léodagan", "Loth", "Le maître d'armes", "Méléagant", "Manius Macrinus Firmus", "Merlin", "Mevanwi", "Perceval", "Le Répurgateur", "Roparzh", "Lucius Sillius Sallustius", "Séfriane d'Aquitaine", "Séli", "Spurius Cordius Frontinius", "Le tavernier", "Urgan", "Vérinus", "Venec", "Ygerne", "Yvain"]
-      quotes: ["Nous sommes jeunes, nous marchons à pieds... J'opterai donc pour un surnom en rapport : les Petits Pédestres.", "Sur une échelle de 2 à 76, et là je préfère prendre large, de 2 à 71 on ne nous écoute pas, de 72 à 75, on nous écoute toujours pas, et seulement à 76 on nous laisse parler sans nous engueuler.", "Sinon c'est les relances : doublette ; jeu carré ; jeu de piste ; jeu gagnant ; jeu moulin ; jeu-jeu ; joue-jeu ; joue-joue ; joue-jié ; joue-ganou ; gagnar ; catakt ; tacat ; cacatac ; cagat-cata et ratacat-mic. Ou : chante Sloubi. Nous, on va faire que chante Sloubi.", "Elle est où la poulette ?", "Sloubi 1, sloubi 2, sloubi 3, sloubi 4, sloubi 5 [...] sloubi 324, sloubi 325 !", "Arthur ! Kaamelott, c'est zéro ! Des cailloux, des cailloux, des cailloux, ça m'énerve !", "Arthour ! Couhillère !", "Ça y est... je vois trouble. C'est le manque de gras, je me dessèche.", "Comment vous dire... C'est systématiquement débile mais c'est toujours inattendu.", "Du passé faisons table en marbre.", "Les chiffres, c'est pas une science exacte figurez-vous !", "Sire, Sire ! On en a gros !", "Et toc ! Remonte ton slibard, Lothard !", "13, 14, 15... Enfin tous les chiffres impairs jusqu'à 22.", "Misa brevis et spiritus maxima. Ça veut rien dire, mais je suis très en colère contre moi même.", "C'est pas faux.", "JE NE MANGE PAS DE GRAINES !", "Qu'est-ce qui est petit et marron ?", "Et si je vous dis que vous êtes deux glands, là, vous avez du péremptoire. C'est vous qui voyez.", "Donc, pour résumer, je suis souvent victime des colibris, sous-entendu des types qu'oublient toujours tout", "Vous nous utilisez bon gré malgré pour arriver sur la fin.", "Lorsqu'on le tient par la partie sporadique, ou boulière, le fenouil est un objet redondant.", "Tout à l'heure, on a vu que le chapelet de saucisses n'était pas un objet redondant. Et pourtant, on a pu lui trouver une utilisation périmétrique en s'en servant comme un fouet.", "A chaque fois que vous parlez de lui, à partir de maintenant, dans les écritures, vous l’appellerez... Coco l’Asticot.", "Hé bah allez, une journée d'plus en moins. On va aller dormir et pi demain on recommence. Je peux vous dire que tavernier, c'est pas une sinécure.", "La prochaine fois que vous faites venir un barde, je lui ouvre le bide de là à là, j'lui sors les boyaux et je file sa langue à bouffer aux chiens. C'est clair, ça ?", "La patience est un plat qui se mange sans sauce."]

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", "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"]
+        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"]
         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: ["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"]
+        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"]

src/main/resources/en/mountain.yml

@@ -1,77 +0,0 @@
-en:
-  faker:
-    mountain:
-      range: [
-          "Himalayas",
-          "Karakoram",
-          "Hindu Kush",
-          "Pamirs",
-          "Hengduan Mountains",
-          "Tian Shan",
-          "Kunlun",
-          "Transhimalaya",
-          "Andes",
-          "Hindu Raj",
-          "Alaska Range",
-          "Saint Elias Mountains",
-          "Caucasus Mountains"
-      ]
-      name: [
-          "Everest",
-          "Cerro Aconcagua",
-          "Denali",
-          "Kilimanjaro",
-          "Elbrus",
-          "Vinson Massif",
-          "Puncak Jaya",
-          "K2",
-          "Kangchenjunga",
-          "Lhotse",
-          "Makalu",
-          "Mount Logan",
-          "Pico de Orizaba",
-          "Mount Saint Elias",
-          "Popocatépetl",
-          "Mount Foraker",
-          "Mount Lucania",
-          "Iztaccíhuatl",
-          "King Peak",
-          "Mount Bona",
-          "Cristobal Colon",
-          "Citlaltepetl",
-          "Mount Blanc",
-          "Damavand",
-          "Klyuchevskaya",
-          "Nanga Parbat",
-          "Mauna Kea",
-          "Jengish Chokusu (Pik Pobeda)",
-          "Chimborazo",
-          "Bogda Shan",
-          "Namcha Barwa",
-          "Kinabalu",
-          "Mount Rainier",
-          "Ras Dashen",
-          "Tajumulco",
-          "Pico Bolivar",
-          "Mount Fairweather",
-          "Margherita",
-          "Kangchenjunga",
-          "Tirich Mir",
-          "Koryaksky",
-          "Gunung Agung",
-          "Popocatepetl",
-          "Mount Whitney",
-          "Haleakala",
-          "Shiveluch",
-          "Nanda Devi",
-          "Mount Waddington",
-          "Mount Marcus Baker",
-          "Manaslu",
-          "Ojos del Salado",
-          "Monte San Valentin",
-          "Mount Fuji",
-          "Mount Kenya",
-          "Mount Ararat",
-          "Dhaulagiri I",
-          "Etna"
-      ]

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,5 +26,4 @@ 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]
-      blood_group: [O-, O+, A-, A+, B-, B+, AB-, AB+]
+        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]