Merge pull request #696 from snuyanzin/mountains

Add mountains support

.github/ISSUE_TEMPLATE/bug_report.md

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

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

.travis.yml

@@ -1,17 +1,17 @@
 language: java
-dist: trusty
+dist: xenial
 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:cobertura
-
+- mvn clean cobertura:cobertura coveralls:report
+env:
+  global:
+    secure: GIdF3itH9owJXPEb/ri984853yRRIDeWbSZW7yMh6XOymGWAi0+3fGssBbHqjS/s3QgiDhnrKfDjF7UhHE1aeYCxgHM5QGOjfHUhOKevhUE4u0h4ysFS4wbh7zYODMzxdFpiKwdnNF+TvMctIReH5IVDu8gUxbNrcSXN6PQgvlM=

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# 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.0</version>
+    <version>1.0.2</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.0'
+    implementation 'com.github.javafaker:javafaker:1.0.2'
 }
 
 ```
@@ -56,37 +56,45 @@ 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
@@ -96,6 +104,7 @@ Fakers
 * IdNumber
 * Internet
 * Job
+* Kaamelott
 * LeagueOfLegends
 * Lebowski
 * LordOfTheRings
@@ -103,10 +112,12 @@ Fakers
 * Matz
 * Music
 * Name
+* Nation
 * Number
 * Options
 * Overwatch
 * PhoneNumber
+* Photography
 * Pokemon
 * Princess Bride
 * Relationship Terms
@@ -114,8 +125,10 @@ Fakers
 * Robin
 * RockBand
 * Shakespeare
+* Sip
 * SlackEmoji
 * Space
+* StarCraft
 * StarTrek
 * Stock
 * Superhero
@@ -165,6 +178,7 @@ 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.1-SNAPSHOT</version>
+    <version>1.0.3-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.
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.23</version>
+            <version>1.26</version>
             <classifier>android</classifier>
         </dependency>
         <dependency>

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

@@ -35,6 +35,10 @@ 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/AquaTeenHungerForce.java

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

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

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

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

@@ -0,0 +1,17 @@
+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(new Object[]{
+        return join(
                 "www",
                 ".",
                 FakerIDN.toASCII(domainName()),
                 ".",
                 domainSuffix()
-        });
+        );
     }
 
     private String domainName(){

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

@@ -144,34 +144,40 @@ 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.
+     * Generates a random birthday between 65 and 18 years ago from now.
      *
-     * @return a random birthday between 65 and 18 years ago.
+     * @return a random birthday between 65 and 18 years ago from now.
      */
     public Date birthday() {
         return birthday(DEFAULT_MIN_AGE, DEFAULT_MAX_AGE);
     }
 
     /**
-     * Generates a random birthday between two ages.
+     * Generates a random birthday between two ages from now.
      *
      * @param minAge
      *            the minimal age
      * @param maxAge
      *            the maximal age
-     * @return a random birthday between {@code minAge} and {@code maxAge} years ago.
+     * @return a random birthday between {@code minAge} and {@code maxAge} years ago from now.
      * @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);
-        Calendar from = new GregorianCalendar(currentYear - maxAge, 0, 1);
-        Calendar to = new GregorianCalendar(currentYear - minAge, 11, 31);
+        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);
 
         return between(from.getTime(), to.getTime());
     }

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

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

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

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

@@ -35,4 +35,7 @@ public class ElderScrolls {
     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

@@ -0,0 +1,18 @@
+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,9 +42,11 @@ 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;
@@ -91,13 +93,27 @@ public class Faker {
     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, null);
+        this(locale, (Random)null);
     }
 
     public Faker(Random random) {
@@ -105,8 +121,16 @@ public class Faker {
     }
 
     public Faker(Locale locale, Random random) {
-        this.randomService = new RandomService(random);
-        this.fakeValuesService = new FakeValuesService(locale, randomService);
+        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.ancient = new Ancient(this);
         this.app = new App(this);
@@ -138,6 +162,7 @@ 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);
@@ -145,6 +170,7 @@ 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);
@@ -183,6 +209,20 @@ public class Faker {
         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);
     }
 
     /**
@@ -407,6 +447,10 @@ public class Faker {
         return code;
     }
 
+    public Coin coin() {
+        return coin;
+    }
+
     public File file() {
         return file;
     }
@@ -427,6 +471,10 @@ public class Faker {
         return gameOfThrones;
     }
 
+    public Gender gender() {
+        return gender;
+    }
+
     public DateAndTime date() {
         return dateAndTime;
     }
@@ -467,9 +515,7 @@ public class Faker {
         return team;
     }
 
-    public Beer beer() {
-        return beer;
-    }
+    public Beer beer() { return beer; }
 
     public University university() {
         return university;
@@ -579,14 +625,20 @@ public class Faker {
         return lebowski;
     }
 
-    public Medical medical(){return medical;}
+    public Medical medical() {
+        return medical;
+    }
 
-    public Country country(){ return country;}
+    public Country country() {
+        return country;
+    }
 
-    public Animal animal(){ return animal; }
+    public Animal animal() {
+        return animal;
+    }
 
     public BackToTheFuture backToTheFuture() {
-        return  backToTheFuture;
+        return backToTheFuture;
     }
 
     public PrincessBride princessBride() {
@@ -596,7 +648,49 @@ public class Faker {
     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 new StringBuilder(dir).append(sep).append(name).append(".").append(ext).toString();
+        return dir + sep + name + "." + ext;
     }
 }

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

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

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

@@ -0,0 +1,41 @@
+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,4 +22,12 @@ 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(new Object[]{
+        return join(
                 "www",
                 ".",
                 FakerIDN.toASCII(
@@ -61,7 +61,7 @@ public class Internet {
                 ),
                 ".",
                 domainSuffix()
-        });
+        );
     }
 
     /**

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

@@ -0,0 +1,17 @@
+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).charAt(0);
+        return characters(1, includeUppercase).charAt(0);
     }
 
     public String characters() {
@@ -28,7 +28,7 @@ public class Lorem {
     }
 
     public String characters(boolean includeUppercase) {
-        return characters(255, false);
+        return characters(255, includeUppercase);
     }
 
     public String characters(int minimumLength, int maximumLength) {

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

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+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 +1,60 @@
-package com.github.javafaker;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.apache.commons.lang3.ArrayUtils;
-
-public class Relationships {
-    private final Faker faker;
-
-    protected Relationships(final Faker faker) {
-        this.faker = faker;
-    }
-
-    public String direct() {
-        return faker.resolve("relationship.familial.direct");
-    }
-    
-    public String extended() {
-        return faker.resolve("relationship.familial.extended");
-    }
-    
-    public String inLaw() {
-        return faker.resolve("relationship.in_law");
-    }
-
-    public String spouse() {
-        return faker.resolve("relationship.spouse");
-    }
-    
-    public String parent() {
-        return faker.resolve("relationship.parent");
-    }
-    
-    public String sibling() {
-        return faker.resolve("relationship.sibling");
-    }
-    
-    public String any() {
-        Method currentMethod = Relationships.class.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());
-        }
-    }
-    
-}
+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

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

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

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

@@ -2,6 +2,7 @@ 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;
@@ -75,6 +76,11 @@ 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_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?((?:,?'([^']+)')*)\\}");
+    private static final Pattern EXPRESSION_ARGUMENTS_PATTERN = Pattern.compile("(?:'(.*?)')");
 
     private final Logger log = Logger.getLogger("faker");
 
@@ -72,7 +72,7 @@ public class FakeValuesService {
                 }
                 all.add(fakeValuesGrouping);
             } else {
-                all.add(new FakeValues(locale));
+                all.add(new FakeValues(l));
             }
         }
 
@@ -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,9 +347,11 @@ 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>();
-            for (int i = 2; i < matcher.groupCount() + 1 && matcher.group(i) != null; i++) {
-                args.add(matcher.group(i));
+            while (argsMatcher.find()) {
+                args.add(argsMatcher.group(1));
             }
 
             // resolve the expression and reprocess it to handle recursive templates
@@ -573,7 +575,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 class MethodAndCoercedArgs {
+    private static class MethodAndCoercedArgs {
 
         private final Method method;
 

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

@@ -60,11 +60,18 @@ public class RandomService {
     }
 
     public String hex(int length) {
-        char[] hexValues = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-        StringBuilder hexString = new StringBuilder();
-        for(int i = 0; i < length; i++) {
-            hexString.append(hexValues[nextInt(hexValues.length)]);
+        if (length <= 0) {
+            return ""; // Keep the existing behavior instead of throwing an error.
         }
-        return hexString.toString();
+        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);
     }
 }

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

@@ -35,7 +35,9 @@ 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",
@@ -62,6 +64,7 @@ public class EnFile {
             "demographic.yml",
             "dessert.yml",
             "device.yml",
+            "disease.yml",
             "dota.yml",
             "dr_who.yml",
             "dragon_ball.yml",
@@ -71,6 +74,7 @@ public class EnFile {
             "elder_scrolls.yml",
             "electrical_components.yml",
             "esport.yml",
+            "englandfootball.yml",
             "fallout.yml",
             "family_guy.yml",
             "famous_last_words.yml",
@@ -116,6 +120,7 @@ public class EnFile {
             "military.yml",
             "most_interesting_man_in_the_world.yml",
             "movie.yml",
+            "mountain.yml",
             "music.yml",
             "myst.yml",
             "name.yml",
@@ -127,6 +132,7 @@ public class EnFile {
             "parks_and_rec.yml",
             "phish.yml",
             "phone_number.yml",
+            "photography.yml",
             "pokemon.yml",
             "princess_bride.yml",
             "programming_language.yml",
@@ -142,11 +148,13 @@ 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",
@@ -170,6 +178,7 @@ public class EnFile {
             "verbs.yml",
             "weather.yml",
             "witcher.yml",
+            "kaamelott.yml",
             "world_cup.yml",
             "world_of_warcraft.yml",
             "yoda.yml",

src/main/resources/en/address.yml

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

src/main/resources/en/animal.yml

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

src/main/resources/en/barcode.yml

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

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

src/main/resources/en/beer.yml

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

src/main/resources/en/cannabis.yml

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

src/main/resources/en/coin.yml

@@ -1,6 +1,5 @@
 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', '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']
+        adjective: ['Amazing', 'Awesome', 'Cool', 'Good', 'Great', 'Incredible', 'Killer', 'Premium', 'Special', 'Stellar', 'Sweet']
+        noun: ['Code', 'Deal', 'Discount', 'Price', 'Promo', 'Promotion', 'Sale', 'Savings']

src/main/resources/en/construction.yml

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

src/main/resources/en/country.yml

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

src/main/resources/en/culture_series.yml

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

src/main/resources/en/dc_comics.yml

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

src/main/resources/en/disease.yml

@@ -0,0 +1,12 @@
+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,4 +10,3 @@ en:
         coat_length: ["hairless", "short", "medium", "long", "wire", "curly"]
         size: ["small", "medium", "large", "extra large"]
         gender: ["female", "male"]
-

src/main/resources/en/dota.yml

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

src/main/resources/en/elder_scrolls.yml

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

src/main/resources/en/englandfootball.yml

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

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

src/main/resources/en/gender.yml

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

src/main/resources/en/grateful_dead.yml

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

src/main/resources/en/heroes_of_the_storm.yml

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

src/main/resources/en/kaamelott.yml

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

src/main/resources/en/mountain.yml

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

src/main/resources/en/opera.yml

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

src/main/resources/en/photography.yml

@@ -0,0 +1,31 @@
+en:
+ faker:
+    photography:
+      term: ["aperture", "exposure", "focal length", "film", "flash", "mirror", "reflection", "viewfinder", "hotshoe", "shutter", "lens", "35mm", "grain", "bokeh", "focus", "aberration", "b/w", "ISO", "DOF", "SLR", "DSLR", "Low key", "High key", "HDR"]
+      brand: ["Agfa", "Fujifilm", "Petnax", "Canon", "Casio", "Nikon", "Hama", "Olympus", "Sony", "Konica", "Minolta", "Konica Minolta", "Lumix", "Praktika", "Polaroid", "Panasonic", "Samsung", "Ricoh", "Tamron", "Sigma", "Arsenal", "BelOMO", "KMZ", "Leica", "LOMO", "FED", "Kodak", "Hasselblad", "llford", "Exacta", "Carl Zeiss", "Tokina", "Kenko", "Goerz", "Yashica", "Soligor GmbH", "VOMZ", "LOGP"]
+      camera: ["FED 1","FED 2","FED 3","FED 4","FED 5","KMZ Moskva-1","KMZ Moskva-2","KMZ Moskva-2A","KMZ Moskva-3","KMZ Moskva-4","KMZ Moskva-5", "KMZ Iskra", "KMZ Iskra-2", "Zorki", "Zorki-2", "Zorki-3", "Zorki-4", "Zorki-10","Zorki-11","Zorki-12","Zorki-15","Zorki-16", "MIR",
+               "Zenit-200A",  "Zenit-200AF",  "Zenit-200AF-U",  "Zenit-200-2AF",  "Zenit-200-Zoom",  "Zenit-compact",  "Zenit-104",  "Zenit-501P",  "Zenit-502P",  "Zenit-503H",  "Zenit-504G",  "Zenit-510",  "Zenit-520",  "Zenit-610",  "Zenit-620",  "Zenit-630",
+               "ZENIT-APS", "ZENIT-96", "ZENIT-E", "ZENIT-E2", "ZENIT-U", "ZENIT-V", "ZENIT-EM", "ZENIT-EM2", "ZENIT-VM", "ZENIT-T1", "ZENIT-ET", "ZENIT-VE", "ZENIT-10", "ZENIT-11", "ZENIT-50", "ZENIT-M", "ZENIT-2",
+               "Zenit-DM3","Zenit-DM5", "ZENIT-Z1",
+               "Moment-20","Moment-20U",  "ZENIT-70",  "Foton",  "Foton-2",  "Foton-3",  "Foton-M",  "Foton-E",  "Foton-PAK",  "Foton-automat",  "Foton-UFM (Moskva-UFM)",  "Foton-5",  "Foton-23",  "Foton-super",  "Panorama",
+               "Horizon-202-1", "Horizon-202-S", "Horizon-kompakt", "Horizon-S3", "Horizon-203", "PanArt-S3", "Horizon-203-U500",  "Horizon-S3-sport",  "Horizon-perfekt",  "Horizon-205",
+               "Start",  "Start-2", "Start-3",  "ZENIT-7", "ZENIT-D", "ZENIT-8", "ZENIT-9", "ZENIT-20", "ZENIT-21", "ZENIT-MK", "ZENIT-22", "ZENIT-23", "ZENIT-MTL", "ZENIT-7000",
+               "Photosniper", "Photosniper FS-3", "Photosniper FS-4", "Photosniper FS-4M", "Photosniper FS-5", "Photosniper FS-12", "Photosniper FS-14", "Photosniper FS-122",
+               "Smena","Smena 2","Smena 3","Smena 4","Smena 6","Smena 8","Smena 11","Smena 12","Smena 7","Smena 9",
+               "Kiev 2","Kiev 3","Kiev 4","Kiev 5","Kiev 6","Kiev 10","Kiev 15","Kiev 17","Kiev 20","Kiev 88","Kiev 90","Salyut S","Mirage 19M",
+               "LOMO-130A","LOMO-135M","LOMO-Compact", "Almaz 104", "Almaz 101",
+               "Canon EOS 1000D", "Canon EOS 1100D", "Canon EOS 1300D", "Canon EOS 2000D", "Canon EOS 4000D", "Canon EOS 300D", "Canon EOS 350D", "Canon EOS 400D", "Canon EOS 450D", "Canon EOS 500D", "Canon EOS 550D", "Canon EOS 600D", "Canon EOS 650D", "Canon EOS 700D", "Canon EOS 750D", "Canon EOS 760D", "Canon EOS 800D", "Canon EOS 10D", "Canon EOS 20D", "Canon EOS 30D", "Canon EOS 40D", "Canon EOS 50D", "Canon EOS 60D", "Canon EOS 70D", "Canon EOS 77D", "Canon EOS 80D", "Canon EOS 90D", "Canon EOS-1D", "Canon EOS-1D Mark II", "Canon EOS-1D Mark III", "Canon EOS-1D Mark IV", "Canon EOS-1Ds", "Canon EOS-1D X", "Canon EOS-1Ds", "Canon EOS-1Ds Mark II", "Canon EOS-1Ds Mark III", "Canon EOS 5D", "Canon EOS 5D Mark II", "Canon EOS 5D Mark III", "Canon EOS 5D Mark IV", "Canon EOS 5DS", "Canon EOS 6D", "Canon EOS 7D", "Canon EOS 7D Mark II", "Canon EOS M", "Canon EOS M2", "Canon EOS M3", "Canon EOS M5", "Canon EOS M6", "Canon EOS M50", "Canon EOS M100", "Canon PowerShot", "Canon PowerShot G", "Canon IXUS",
+               "Canon 7",  "Canon II",  "Canon P",  "Canon VT",  "Canonet",  "Canonet G-III QL17",   "Canon EOS R", "Canon EOS RP", "Canon EOS C200", "Canon EOS C300",  "Canon EOS C500",  "Canon EOS C100",  "Canon EOS C300 Mark II",  "Canon A-1",  "Canon AE-1",  "Canon AE-1 Program",  "Canon AL-1",  "Canon AT-1",  "Canon AV-1",  "Canon F-1",  "Canon New F-1",  "Canon FTb",  "Canon TLb",  "Canon TX",  "Canon T50",  "Canon T60",  "Canon T70",  "Canon T80",  "Canon T90",  "Canon FP",  "Canon FT QL",  "Canon FX",  "Canon Pellix",  "Canon Canonflex",  "Canon ELPH 490Z",
+               "Nikon D1", "Nikon D1H", "Nikon D1X", "Nikon D2H", "Nikon D2Hs", "Nikon D2X", "Nikon D2Xs", "Nikon D3", "Nikon D3S", "Nikon D3X", "Nikon D4", "Nikon D4S", "Nikon D5", "Nikon D40", "Nikon D40x", "Nikon D50",  "Nikon D60", "Nikon D70", "Nikon D70s", "Nikon D80", "Nikon D90", "Nikon D100", "Nikon D200", "Nikon D300", "Nikon D300S", "Nikon D500", "Nikon D600",  "Nikon D610", "Nikon D700", "Nikon D750", "Nikon D800", "Nikon D800E", "Nikon D810", "Nikon D810A", "Nikon D850", "Nikon D3000", "Nikon D3100", "Nikon D3200", "Nikon D3300", "Nikon D3400", "Nikon D3500", "Nikon D5000", "Nikon D5100", "Nikon D5200", "Nikon D5300", "Nikon D5500", "Nikon D5600", "Nikon D7000", "Nikon D7100", "Nikon D7200", "Nikon D7500", "Nikon E2", "Nikon E2N", "Nikon E2NS", "Nikon E2S", "Nikon E3", "Nikon E3s",
+               "Nikon F3AF", "Nikon F4", "Nikonos RS", "Nikon F5", "Nikon F6", "Nikon F-501", "Nikon F-801", "Nikon F-801S", "Nikon F90", "Nikon F90X", "Nikon F80", "Nikon F100", "Nikon F-601", "Nikon F70", "Nikon F75", "Nikon F-401", "Nikon F-401S", "Nikon F-401X", "Nikon F50", "Nikon F60", "Nikon F65", "Nikon F55", "Nikon I","Nikon M","Nikon S","Nikon S2","Nikon SP","Nikon S3","Nikon S4","Nikon S3M","Nikon S3","Nikon SP",
+               "Leica S", "Leica S-E", "Leica S2","Leica II",
+               "Pentax 645D", "Pentax 645Z","Pentax *ist D","Pentax *ist DL","Pentax *ist DL2","Pentax *ist DS","Pentax *ist DS2", "Pentax K-1","Pentax K-3","Pentax K-3 II","Pentax K-5","Pentax K-5 II","Pentax K-30","Pentax K-50","Pentax K-70", "Pentax K-r","Pentax K-S1","Pentax K-S2","Pentax K-x","Pentax K-7","Pentax K10D","Pentax K20D","Pentax K100D","Pentax K100D Super",  "Pentax K110D","Pentax K200D","Pentax K2000","Pentax KP","Pentax MZ-D",
+               "Olympus E-1", "Olympus E-3", "Olympus E-5", "Olympus E-10", "Olympus E-20", "Olympus E-30", "Olympus E-300", "Olympus E-330", "Olympus E-400", "Olympus E-410", "Olympus E-420", "Olympus E-450", "Olympus E-500", "Olympus E-510", "Olympus E-520", "Olympus E-620",
+               "Fujix DS-560", "Fujix DS-565", "FinePix IS Pro", "FinePix S1 Pro", "FinePix S2 Pro", "FinePix S3 Pro", "FinePix S3 Pro UVIR", "FinePix S5 Pro",
+               "Sony Alpha 100", "Sony Alpha 200", "Sony Alpha 230", "Sony Alpha 290", "Sony Alpha 300", "Sony Alpha 330", "Sony Alpha 350", "Sony α390",      "Sony Alpha 500", "Sony Alpha 550", "Sony Alpha 580", "Sony Alpha 700", "Sony Alpha 850", "Sony Alpha 900", "Sony DSLR-A100", "Sony DSLR-A100/B", "Sony DSLR-A100/S", "Sony DSLR-A200", "Sony DSLR-A230", "Sony DSLR-A290", "Sony DSLR-A300", "Sony DSLR-A300/N", "Sony DSLR-A330", "Sony DSLR-A330/T", "Sony DSLR-A350", "Sony DSLR-A350/N", "Sony DSLR-A380", "Sony DSLR-A390", "Sony DSLR-A450", "Sony DSLR-A500", "Sony DSLR-A550", "Sony DSLR-A560", "Sony DSLR-A580", "Sony DSLR-A700", "Sony DSLR-A850", "Sony DSLR-A900"]
+      lens: ["500mm/8", "17mm/2.0", "35mm/1.8", "50mm/1.2", "50mm/1.4", "50mm/1.8", "17-85mm/4.0-8.0", "85mm/1.2", "40mm/2.8", "70–300mm/4.5–5.6", "300mm/2.8", "35-350mm/3.5-5.6", "75-300mm/4-5.6", "24mm/1.4", "17–40mm/4", "24–105mm/4", "70–200mm/2.8", "70–200mm/4", "200-400mm/4", "85mm/1.8", "135mm/4", "600mm/4", "800mm/5.6", "18–55mm/3.5–5.6", "55–250mm/4–5.6", "10-24mm/3.5-4.5", "12-24mm/4", "16-85mm/3.5-5.6", "17-55mm/2.8", "18-55mm/3.5-5.6", "18-70mm/3.5-4.5", "18-105mm/3.5-5.6", "18-140mm/3.5-5.6", "18-200mm/3.5-5.6", "18-300mm/3.5-5.6", "18-300mm/3.5-6.3", "55-200mm/4-5.6", "fisheye", "tele", "wide-angle"]
+      genre: ["Abstract", "Portrait", "Landscape", "Techno", "Transportation", "Aviation", "Trains", "Ships", "Automobiles", "Bikes", "Army", "Navy", "Flora", "Fauna", "Sports", "Street", "City", "Village", "Country side", "Architecture", "Interior", "Food", "Wedding", "Stock", "Paparazzi", "Social", "Fashion", "Beauty", "Nude", "Science", "Space", "Aerial", "Industrial", "Artistic", "Underwater", "Night", "Low key", "High key", "Lomo", "Panoramic", "Macro", "Micro", "nano"]
+      imagetag: ["B/W", "wall", "sky", "clouds", "grass", "wood", "street", "city", "techno", "cars", "planes", "people", "tea", "coffee", "restaurant", "forest", "meadow", "mountain", "water", "river", "sunny", "cloudy", "rainy", "rain", "wave", "drop", "girl", "brick", "ocean", "sea", "river", "spring", "festival", "celebration", "show", "dances", "universe", "stars", "galaxy", "MIR", "ISS", "rocket", "jet", "fighter", "singer", "action", "show", "theater", "performance"]
+      aperture: ["f/0.5", "f/0.65", "f/0.7", "f/0.75", "f/0.85", "f/0.87", "f/0.95", "f/1.0", "f/1.2", "f/1.4", "f/1.8", "f/2.0", "f/2.8", "f/3.2", "f/4.0", "f/4.5", "f/5.0", "f/5.6", "f/6.3", "f/7.1", "f/8.0", "f/9.0", "f/10", "f/11", "f/13", "f/14", "f/16", "f/18", "f/20", "f/22", "f/25", "f/29", "f/32", "f/45", "f/64"]
+      shutter: ["32000", "16000", "8000", "6400", "5000", "4000", "3200", "2500", "2000", "1600", "1250", "1000", "800", "640", "500", "400", "320", "250", "200", "160", "125", "100", "80", "60", "50", "40", "1/30", "1/25", "1/20", "1/15", "1/13", "1/10", "1/8", "1/6", "1/5", "1/4", "1/2", "1", "2", "4", "8", "15", "30"]
+      iso: ["50", "64", "100", "125", "160", "200", "250", "320", "400", "500", "640", "800", "1000", "1250", "1600", "2000", "2500", "3200", "4000", "5000", "6400", "8000", "10000", "12800", "16000", "20000", "25600", "52200", "104400"]

src/main/resources/en/rupaul.yml

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

src/main/resources/en/sip.yml

@@ -0,0 +1,101 @@
+---
+en:
+  faker:
+    sip:
+      methods: ["INVITE", "ACK", "BYE", "CANCEL", "REGISTER", "OPTIONS", "PRACK", "SUBSCRIBE", "NOTIFY", "PUBLISH", "INFO", "REFER", "MESSAGE", "UPDATE"]
+      content:
+        types: [
+          "application/sdp",
+          "application/resource-lists",
+          "application/pkcs7-mime",
+          "application/pkcs7-signature",
+          "application/x-private",
+          "application/xml",
+          "multipart/mixed",
+          "multipart/alternative",
+          "multipart/related",
+          "text/html"]
+      response:
+        codes:
+          provisional: ["100", "180", "181", "182", "183", "199"]
+          success: ["200", "202"]
+          redirection: ["300", "301", "302", "305", "380"]
+          clientError: [
+            "400",
+            "401",
+            "402",
+            "403",
+            "404",
+            "405",
+            "406",
+            "407",
+            "408",
+            "409",
+            "410",
+            "413",
+            "414",
+            "415",
+            "416",
+            "420",
+            "421",
+            "422",
+            "423",
+            "480",
+            "481",
+            "482",
+            "483",
+            "484",
+            "485",
+            "486",
+            "487",
+            "488",
+            "491",
+            "493"]
+          serverError: ["500", "501", "502", "503", "504", "505", "513", "555", "580"]
+          globalError: ["600", "603", "604", "606", "607"]
+        phrases:
+          provisional: ["Trying", "Ringing", "Call Is Being Forwarded", "Queued", "Session Progress", "Early Dialog Terminated"]
+          success: ["OK", "accepted"]
+          redirection: ["Multiple Choices", "Moved Permanently", "Moved Temporarily", "Use Proxy", "Alternative Service"]
+          clientError: [
+            "Bad Request",
+            "Unauthorized",
+            "Payment Required",
+            "Forbidden",
+            "Not Found",
+            "Method Not Allowed",
+            "Not Acceptable",
+            "Proxy Authentication Required",
+            "Request Timeout",
+            "Conflict",
+            "Gone",
+            "Request Entity Too Large",
+            "Request-URI Too Long",
+            "Unsupported Media Type",
+            "Unsupported URI Scheme",
+            "Bad Extension",
+            "Extension Required",
+            "Session Interval Too Small",
+            "Interval Too Brief",
+            "Temporarily Unavailable",
+            "Call/Transaction Does Not Exist",
+            "Loop Detected",
+            "Too Many Hops",
+            "Address Incomplete",
+            "Ambiguous",
+            "Busy Here",
+            "Request Terminated",
+            "Not Acceptable Here",
+            "Request Pending",
+            "Undecipherable"]
+          serverError: [
+            "Server Internal Error",
+            "Not Implemented",
+            "Bad Gateway",
+            "Service Unavailable",
+            "Server Time-out",
+            "Version Not Supported",
+            "Message Too Large",
+            "Push Notification Service Not Supported",
+            "Precondition Failure"]
+          globalError: ["Busy Everywhere", "Decline", "Does Not Exist Anywhere", "Not Acceptable", "Unwanted"]

src/main/resources/en/space.yml

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

src/main/resources/en/star_trek.yml

@@ -5,3 +5,4 @@ en:
       location: ["Qo'noS", "Romulus", "Bajor", "Vulcan", "Neutral Zone", "Alpha Quadrant", "Beta Quadrant", "Delta Quadrant", "Gamma Quadrant", "Tau Ceti Prime", "Wolf 359", "Thalos VII", "Cardassia", "Trillius Prime", "Badlands", "Betazed", "Risa", "Deep Space Nine", "Ferenginar", "The Briar Patch", "Khitomer"]
       specie: ["Breen", "El-Aurian", "Jem'Hadar", "Kazon", "Ocampa", "Q", "Ferengi", "Klingon", "Talaxian", "Vidiian", "Cardassian", "Vulcan", "Borg", "Romulan", "Vorta", "Andorian", "Bajoran", "Betazoid"]
       villain: ["Q", "Gorn", "Khan Noonien Singh", "Ru'afo", "Maltz", "Kruge", "Ayel", "Admiral Marcus", "Martia", "Lt. Valeris", "V'ger", "God of Sha Ka Ree", "Admiral Dougherty", "Nero", "Krall", "Tolian Soran", "Shinzon", "General Chang", "Lursa", "B'Etor", "Borg Queen"]
+      klingon: ["tlhIngan maH", "bogh tlhInganpu', SuvwI'pu' moj, Hegh", "SuvmeH 'ej charghmeH bogh tlhInganpu'", "DabuQlu'DI' yISuv", "qa' wIje'meH maSuv", "bI'IQchugh yIvang", "tIqIpqu' 'ej nom tIqIp", "lumbe' tlhInganpu'.", "Dubotchugh yIpummoH", "mataHmeH maSachnIS"]

src/main/resources/en/star_wars.yml

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

src/main/resources/en/starcraft.yml

@@ -0,0 +1,352 @@
+en:
+  faker:
+    starcraft:
+      units: [
+        "Archon",
+        "Carrier",
+        "Colossus",
+        "Dark Templar",
+        "High Templar",
+        "Immortal",
+        "Mothership",
+        "Observer",
+        "Phoenix",
+        "Probe",
+        "Sentry",
+        "Stalker",
+        "Void Ray",
+        "Warp Prism",
+        "Zealot",
+        "Oracle",
+        "Tempest",
+        "Mothership Core",
+        "Adept",
+        "Disruptor",
+        "Banshee",
+        "Battlecruiser",
+        "Ghost",
+        "Hellion",
+        "Marauder",
+        "Marine",
+        "Medivac Dropship",
+        "MULE",
+        "Raven",
+        "Reaper",
+        "SCV",
+        "Siege Tank",
+        "Thor",
+        "Viking",
+        "Auto-Turret",
+        "Point Defense Drone",
+        "Hellbat",
+        "Widow Mine",
+        "Liberator",
+        "Cyclone",
+        "Corruptor",
+        "Brood lord",
+        "Drone",
+        "Hydralisk",
+        "Infestor",
+        "Larva",
+        "Mutalisk",
+        "Overlord",
+        "Overseer",
+        "Queen",
+        "Roach",
+        "Ultralisk",
+        "Zergling",
+        "Baneling",
+        "Broodling",
+        "Changeling",
+        "Infested terran",
+        "Swarm Host",
+        "Viper",
+        "Lurker",
+        "Ravager"
+      ]
+      buildings: [
+        "Assimilator",
+        "Cybernetics Core",
+        "Dark Shrine",
+        "Fleet Beacon",
+        "Forge",
+        "Gateway",
+        "Nexus",
+        "Photon Cannon",
+        "Pylon",
+        "Robotics Facility",
+        "Robotics Bay",
+        "Shield Battery",
+        "Stargate",
+        "Templar Archives",
+        "Twilight Council",
+        "Warp Gate",
+        "Armory",
+        "Barracks",
+        "Bunker",
+        "Command Center",
+        "Orbital Command",
+        "Planetary Fortress",
+        "Engineering Bay",
+        "Factory",
+        "Fusion Core",
+        "Ghost Academy",
+        "Missile turret",
+        "Refinery",
+        "Sensor Tower",
+        "Starport",
+        "Supply Depot",
+        "Reactor",
+        "Tech Lab",
+        "Baneling Nest",
+        "Creep Tumor",
+        "Evolution Chamber",
+        "Extractor",
+        "Hatchery",
+        "Lair",
+        "Hive",
+        "Hydralisk Den",
+        "Infestation Pit",
+        "Nydus Network",
+        "Nydus Worm",
+        "Roach Warren",
+        "Spawning Pool",
+        "Spine Crawler",
+        "Spire",
+        "Greater Spire",
+        "Spore Crawler",
+        "Ultralisk Cavern",
+        "Lurker Den"
+      ]
+      characters: [
+        "Abathur",
+        "Alarak",
+        "Aldaris",
+        "Amon",
+        "Artanis",
+        "Daggoth",
+        "Carolina Davis",
+        "Dehaka",
+        "Gerard DuGalle",
+        "Edmund",
+        "Duke",
+        "Samir Duran",
+        "Emil Narud",
+        "Fenix",
+        "Tychus Findlay",
+        "Ariel Hanson",
+        "Matt Horner",
+        "Izsha",
+        "Karax",
+        "Sarah Kerrigan",
+        "Arcturus Mengsk",
+        "Valerian Mengsk",
+        "Overmind",
+        "Raszagal",
+        "Jim Raynor",
+        "Reigel",
+        "Rohana",
+        "Selendis",
+        "Egon Stetmann",
+        "Alexei Stukov",
+        "Rory Swann",
+        "Talandar",
+        "Tassadar",
+        "Nova Terra",
+        "Gabriel Tosh",
+        "Vorazun",
+        "Horace Warfield",
+        "Zagara",
+        "Zasz",
+        "Zeratul",
+        "Zurvan"
+      ]
+      planets: [
+        "Abaddon",
+        "Adena",
+        "Aeneas",
+        "Agria",
+        "Aiur",
+        "Alamar",
+        "Albion",
+        "Aleun",
+        "Alpha Draconis",
+        "Altara",
+        "Altheon",
+        "Anselm",
+        "Antiga Prime",
+        "Aridas",
+        "Artesia Prime",
+        "Artika",
+        "Ash'Arak",
+        "Ashrigo",
+        "Aspar",
+        "Asteria",
+        "Astrid III",
+        "Atrias",
+        "Atticus Minor",
+        "Avernus",
+        "Bel'Shir",
+        "Bellum IV",
+        "Beta Saul",
+        "Bhekar Ro",
+        "Boone",
+        "Borea",
+        "Bountiful",
+        "Braken",
+        "Braxis",
+        "Braxis Alpha",
+        "Brokas Hur",
+        "Brontes",
+        "Brontes IV",
+        "Bukari V",
+        "Calus",
+        "Candore",
+        "Cantar",
+        "Castanar",
+        "Cavir",
+        "Char",
+        "Chau Sara",
+        "Chiron",
+        "Planet Christmas",
+        "Cirion",
+        "Cruxas III",
+        "Dannuth VII",
+        "Dark planet",
+        "Dead Man's Rock",
+        "Demon's Fair",
+        "Dylar IV",
+        "Earth",
+        "Eldersthine",
+        "Exgelia IV",
+        "Feronis",
+        "Formicia",
+        "G-2275",
+        "Gamma Dorian",
+        "Gantris VI",
+        "Gantuan VI",
+        "Garrxax",
+        "Gelgaris",
+        "Glacius",
+        "Gohbus",
+        "Goldilocks",
+        "Great Bend",
+        "Grissom IV",
+        "Grnaki Prime",
+        "Gyras",
+        "Gystt",
+        "Halcyon",
+        "Haven",
+        "Heimdall IV",
+        "Helioc III",
+        "Helios",
+        "Hydrax",
+        "Icarus IV",
+        "Ignus",
+        "J'larre",
+        "Jarban Minor",
+        "Jontur II",
+        "Jotun",
+        "Ketill IV",
+        "Korhal",
+        "Krydon",
+        "Lakius",
+        "Lerilak Crest",
+        "Lorcadia",
+        "Luria IV",
+        "LV-555",
+        "Maltair IV",
+        "Mar Sara",
+        "Marek V",
+        "Marlowe",
+        "Mehlus IV",
+        "Meinhoff",
+        "Melkora",
+        "Midr IV",
+        "Miranar",
+        "Mistaff IV",
+        "Moria",
+        "Nelyth",
+        "Nemaka",
+        "Nephor II",
+        "New Folsom",
+        "New Sydney",
+        "New Trinidad",
+        "Nidhogg",
+        "Nidhogg III",
+        "Norris VI",
+        "Old Faithful",
+        "Onuru Sigma",
+        "Orna III",
+        "Paralta",
+        "Parragos",
+        "Pegasus",
+        "Phaeton",
+        "Pho-Rekh",
+        "Pike's Peak",
+        "Port Zion",
+        "Pridewater",
+        "Raydin III",
+        "Raydin IV",
+        "Redstone III",
+        "Revan II",
+        "Revera",
+        "Reynif II",
+        "Roxara",
+        "Saluset",
+        "Samiku",
+        "Sammy",
+        "Scoria",
+        "Seti",
+        "Shakuras",
+        "Shi",
+        "Shiloh",
+        "Sigmaris Prime",
+        "Sirocco",
+        "Slayn",
+        "Sonyan",
+        "Sorona",
+        "Sutur V",
+        "Swampus",
+        "Tal Qirat",
+        "Talvaria",
+        "TarKossia",
+        "Tarsonis",
+        "Tashai",
+        "Taurus IV",
+        "Tepperus",
+        "Thalon VII",
+        "Thanix III",
+        "Thys",
+        "Timul IV",
+        "Tiria",
+        "Torenis Prime",
+        "Torus",
+        "Turaxis II",
+        "Typhon XI",
+        "Tyrador VIII",
+        "Tyrador III",
+        "Tyrador IX",
+        "Uilel IV",
+        "Uilila IV",
+        "Ullalah II",
+        "Umoja",
+        "Urona Sigma",
+        "Van Osten's Moon",
+        "Vanass",
+        "Vardona",
+        "Veridia Prime",
+        "Vyctor 5",
+        "Vygoire",
+        "Warrant VI",
+        "Wotan II",
+        "Xil",
+        "XT39323",
+        "Ynoth",
+        "Zanadar Prime",
+        "Zenn",
+        "Zeph III",
+        "Zerus",
+        "Zhakul",
+        "Zz'gash"
+      ]

src/main/resources/en/stargate.yml

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

src/main/resources/en/subscription.yml

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

src/main/resources/en/super_smash_bros.yml

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

src/main/resources/en/witcher.yml

@@ -6,40 +6,6 @@ en:
         witchers: ["Geralt of Rivia", "Coën", "Vesemir", "Eskel", "Lambert", "Letho of Gulet","Ciri","George of Kagen","Jerome Moreau","Auckes","Serrit","Kolgrim","Ivar Evil-Eye","Junod of Belhaven","Gerd"]
         schools: ["Wolf", "Griffin", "Cat", "Viper", "Manticore", "Bear"]
         locations: ["Aedd Gynvael","Aldersberg","Beauclair","Cidaris","Cintra","Gors Velen","Maribor","Novigrad","Oxenfurt","Tretogor","Vengerberg","Vizima","Ard Carraigh","Bremervoord","Brugge","Claremont","Creyden","Fen Aspra","Hengfors","Lan Exeter","Pont Vanis","Lyria","Maecht","Malleore","Metinna","Nilfgaard","Neunreuth","Rakverelin","Rivia","Thurn","Acorn Bay","Anchor","Assengard","Attre","Ban Ard","Ban Gleán","Barefield","Belhaven","Blaviken","Brenna","Breza","Burdorff","Caelf","Carreras","Craag An","Crinfrid","Daevon","Dillingen","Dorian","Druigh","Dudno","Duén Canell","Dun Dâre","Ellander","Eysenlaan","Fano","Foam","Forgeham","Fox Hollow","Ghelibol","Glyswen","Gulet","Hochebuz","Jealousy","Kaczan","Kagen","Kerack","Kernow","Klucz","Knotweed Meadow","Little Marsh","Lower Posada","Malhoun","Mirt","Murivel","New Ironworks","Porog","Riedbrune","Rinde","Roggeveen","Tegamo","Tigg","Tridam","Tyffi","Unicorn","Upper Posada","Vattweir","Vole","White Bridge","Zavada","Armeria","Baldhorn","Ban Gleán","Beauclair","Bodrog","Carcano","Castel Ravello","Darn Dyffra","Darn Rowan","Darn Ruach","Dillingen","Dorndal","Drakenborg","Fen Aspra","Glevitzingen","Gwendeith","Hagge","Houtborg","Kaer Morhen","Kaer Trolde","Leyda","Loc Grim","Mayena","Mirt","Montecalvo","Montsalvat","Nastrog","Razwan","Red Binduga","Rocayne","Rhys-Rhun","Riedbrune","Rozrog","Sarda","Scala","Schwemmland","Spalla","Stygga","Tigg","Vartburg","Vedette","Vidort","Winneburg","Zurbarran","Est Haemlet","Loc Muinne","Shaerrawedd"]
-        quotes: [
-          "Just five more minutes… Is it 1358 yet? No? Then fuck off!",
-          "Finish all your business before you die. Bid loved ones farewell. Write your will. Apologize to those you’ve wronged. Otherwise, you’ll never truly leave this world.",
-          "Hide the wenches, Witcher's coming!!","Oh year... the Elder Blood can be fiery",
-          "Damn, Eskel... you got an hourglass figure","No Lollygagin'!",
-          "You get what you get and be happy with it","I'll stick me boot so far up yer arse your tongue'll taste like wench twat",
-          "Evil is evil, Stregobor. Lesser, greater, middling, it's all the same. Proportions are negotiated, boundaries blurred. I'm not a pious hermit, I haven't done only good in my life. But if I'm to choose between one evil and another, then I prefer not to choose at all.",
-          "One hand washes the other. Freedom and contempt have their limits. In the end, it is always the case that one is someone else's tool.",
-          "You cannot do it. You cannot do it, witcheress. In Kaer Morhen, they taught you to kill, so you kill like a machine. Instinctively. To kill yourself takes character, strength, determination and courage. But that, that they could not teach you.",
-          "Death, the final judgement. The Beast has met its end once. It doesn't fear death, it is death. How will you defeat human villainy? With your sword? You who died and still walk amongst the living?",
-          "Well, there’s a war, so there’s orphans. Didn’t [you] know that?",
-          "Know when a legend becomes a prophecy? When it gains believers.",
-          "You don’t need mutations to strip men of their humanity. I’ve seen plenty of examples.",
-          "To be neutral does not mean to be indifferent or insensitive. You don't have to kill your feelings. It's enough to kill hatred within yourself.",
-          "There is never a second opportunity to make a first impression.",
-          "People”—Geralt turned his head—“like to invent monsters and monstrosities. Then they seem less monstrous themselves.",
-          "A mother, you son-of-a-bitch, is sacred!",
-          "Only Evil and Greater Evil exist and beyond them, in the shadows, lurks True Evil. True Evil, Geralt, is something you can barely imagine, even if you believe nothing can still surprise you. And sometimes True Evil seizes you by the throat and demands that you choose between it and another, slightly lesser, Evil.",
-          "Only death can finish the fight, everything else only interrupts the fighting.",
-          "Mistakes,’ he said with effort, ‘are also important to me. I don’t cross them out of my life, or memory. And I never blame others for them.",
-          "What is truth? The negation of lies? Or the statement of a fact? And if the fact is a lie, what then is the truth?",
-          "They weren't lying. They firmly believed it all. Which doesn't change the facts.",
-          "There's a grain of truth in every fairy tale.",
-          "I need this conversation. They say silence is golden. Maybe it is, although I'm not sure it's worth that much. It has its price certainly; you have to pay for it.",
-          "You’ve mistaken the stars reflected on the surface of the lake at night for the heavens.",
-          "It is easy to kill with a bow, girl. How easy it is to release the bowstring and think, it is not I, it is the arrow. The blood of that boy is not on my hands. The arrow killed him, not I. But the arrow does not dream anything in the night.",
-          "The sword of destiny has two edges. You are one of them.",
-          "When you know about something it stops being a nightmare. When you know how to fight something, it stops being so threatening.",
-          "As usual, cats and children noticed him first.",
-          "That’s the role of poetry, Ciri. To say what others cannot utter.",
-          "No one wants to suffer. But that is the fate of each. And some suffer more. Not necessarily of their own volition. It's not about to enduring the suffering. It's about how you endure it.",
-          "Destiny has many faces. Mine is beautiful on the outside and hideous on the inside. She has stretched her bloody talons toward me—",
-          "A coward,' he declared with dignity, when he'd stopped coughing and had got his breath back, 'dies a hundred times. A brave man dies but once. But Dame Fortune favours the brave and holds the coward in contempt.'",
-          "I thought I was choosing the lesser evil. I chose the lesser evil. Lesser evil! I’m Geralt! Witcher…I’m the Butcher of Blaviken—"
-        ]
+        quotes: ["Just five more minutes… Is it 1358 yet? No? Then fuck off!","Finish all your business before you die. Bid loved ones farewell. Write your will. Apologize to those you’ve wronged. Otherwise, you’ll never truly leave this world.","Hide the wenches, Witcher's coming!!","Oh year... the Elder Blood can be fiery","Damn, Eskel... you got an hourglass figure","No Lollygagin'!","You get what you get and be happy with it","I'll stick me boot so far up yer arse your tongue'll taste like wench twat"]
         monsters: ["Archespore","Berserker","Botchling","Lubberkin","Ulfhedinn","Werewolf","The Toad Prince","Basilisk","Cockatrice","Forktail","Royal Wyvern","Shrieker","Silver Basilisk","Slyzard Matriarch","Slyzard","Dragon of Fyresdal","Wyvern","Djinn","Earth Elemental","Fire Elemental","Gargoyle","Golem","Hound of the Wild Hunt","Ice Elemental","Pixie","Apiarian Phantom","Therazane","Ekhidnae","Erynias","Griffin","Harpy","Melusine","Opinicus","Salma","Siren","Succubus","Arachas","Arachnomorph","Endrega Drone","Endrega Warrior","Endrega Worker","Giant Centipede","Kikimore","Kikimore Worker","Pale Widow","Abaya","Alghoul","Drowner","Foglet","Ghoul","Grave Hag","Ignis Fatuus","Mourntart","Mucknixer","Rotfiend","Scurver","Spotted Wight","Water Hag","Wight","Cloud Giant","Cyclopse","Golyat","Hagubman","Ice Giant","Ice Troll","Nekker","Rock Troll","Wham-a-Wham","Chort","Crone","Doppler","Fiend","Fugas","Godling","Grottore","Howler","Imp","Kernun","Leshen","Morvudd","Shaelmaar","Spriggan","Sylvan","The Caretaker","Barghests","Ethereal","Hym","Longlocks","Nightwraith","Noonwraith","Penitent","Plague Maiden","Umbra","Wraith","Alp","Bruxa","Ekimmara","Gael","Garkain","Higher Vampire","Katakan"]
 

src/main/resources/es-MX.yml

@@ -52,7 +52,7 @@ es-MX:
 
     name:
       first_name: [José Luis, Juan, Francisco, José, Antonio, Jesús, Miguel Ángel, Pedro, Alejandro, Manuel, Juan Carlos, Roberto, Jorge, Carlos, Fernando, Ricardo, Miguel, Javier, Martín, Rafael, Raúl, Arturo, Daniel, Eduardo, Enrique, Mario, José Antonio, Sergio, Gerardo, Salvador, Marco Antonio, Alfredo, David, Armando, Alberto, Luis, Óscar, Ramón, Guillermo, Rubén, Jaime, Felipe, Julio César, Andrés, Pablo, Ángel, Gabriel, Héctor, Alfonso, José Guadalupe, Agustín, Ignacio, Víctor, Rogelio, Gustavo, Ernesto, Rodolfo, Luis Alberto, Gilberto, Vicente, Juan Antonio, Tomás, Israel, César, Adrián, Ismael, Santiago, Humberto, Gregorio, Joel, Esteban, José Alfredo, Nicolás, Omar, Moisés, Félix, Lorenzo, Samuel, Carlos Alberto, José Angel, Ramiro, Abel, Jorge Luis, Marcos, Mario Alberto, Rodrigo, Edgar, Isidro, José Alberto, Leonardo, Benjamín, Jorge Alberto, Julio, Raymundo, Víctor Hugo, Saúl, Benito, José Juan, Rigoberto, Hugo,  Guadalupe, María, Margarita, Verónica, María Elena, Josefina, Leticia, Teresa, Patricia, Rosa, Martha, Rosa María, Alicia, Yolanda, Francisca, Silvia, Elizabeth, Gloria, Ana María, Gabriela, Alejandra, María Luisa, María de Lourdes, Adriana, Araceli, Antonia, Lucía, Carmen, Irma, Claudia, Beatriz, Isabel, Laura, Maribel, Graciela, Virginia, Catalina, Esperanza, Angélica, Maricela, Cecilia, Susana, Cristina, Julia, Concepción, Victoria, Ofelia, Rocío, Carolina, Raquel, Petra, Lorena, Reyna, Sandra, Paula, Guillermina, Sara, Elvira, Manuela, Marisol, Mónica, Erika, Celia, Luz María, Irene, Magdalena, Estela, Ángela, Rosario, Esther, Eva, Norma, Aurora, Socorro, Consuelo, Lidia, Bertha, Sofía, Dolores, Elena, Rosalba, Liliana, Andrea, Adela, Mariana, Fabiola, Karina, Martina, Marcela, Miriam, Mercedes, Marina, Amalia, Olivia, Angelina, Sonia, Agustina, Edith, Lilia, Micaela]
-      last_name: [Hernández, García, Martínez, López, González, Rodríguez, Pérez, Sánchez, Ramírez, Cruz, Flores, Gómez, Morales, Vázquez, Reyes, Jímenez, Torres, Díaz, Gutiérrez, Mendoza, Ruiz, Aguilar, Ortiz, Castillo, Moreno, Romero, Álvarez, Chávez, Rivera, Juárez, Ramos, Méndez, Domínguez, Herrera, Medina, Vargas, Castro, Guzmán, Velázquez, Muñoz, Rojas, Contreras, Salazar, Luna, de la Cruz, Ortega, Guerrero, Santiago, Estrada, Bautista, Cortés, Soto, Alvarado, Espinoza, Lara, Ávila, Ríos, Cervantes, Silva, Delgado, Vega, Márquez, Sandoval, Fernández, León, Carrillo, Mejía, Solís, Núñez, Rosas, Valdez, Ibarra, Campos, Santos, Camacho, Peña, Maldonado, Navarro, Rosales, Acosta, Miranda, Trejo, Cabrera, Valencia, Nava, Castañeda, Pacheco, Robles, Molina, Rangel, Fuentes, Huerta, Meza, Aguirre, Cárdenas, Orozco, Padilla, Espinosa, Ayala, Salas, Valenzuela, Zúñiga, Ochoa, Salinas, Mora, Tapia, Serrano, Durán, Olvera, Macías, Zamora, Calderón, Arellano, Suárez, Barrera, Zavala, Villegas, Gallegos, Lozano, Galván, Figueroa, Beltrán, Franco, Villanueva, Sosa, Montes, Andrade, Velasco, Arias, Marín, Corona, Garza, Ponce, Esquivel, Pineda, Alonso, Palacios, Antonio, Vásquez, Trujillo, Cortez, Rocha, Rubio, Bernal, Benítez, Escobar, Villa, Galindo, Cuevas, Bravo, Cano, Osorio, Mata, Carmona, Montoya, de Jesús, Enríquez, Cisneros, Rivas, Parra, Reséndiz, Téllez, Zárate, Salgado, de la Rosa, Vera, Tovar, Arroyo, Córdova, Leyva, Quintero, Becerra, Quiroz, Barajas, Ávalos, Peralta, Román, Esparza, Murillo, Guevara, Olivares, Félix, de León, Castellanos, Villarreal, Villalobos, Lugo, Ángeles, Montiel, Segura, Magaña, Saucedo, Gallardo, Mercado, Navarrete, Reyna, Paredes, Dávila, Leal, Guerra, Saldaña, Guillén, Santana, Uribe, Monroy, Piña, Yáñez, Nieto, Islas, Granados, Escobedo, Zapata, Caballero, del Ángel, Solano, Barron, Zepeda, Acevedo, Arriaga, Barrios, Mondragón, Galicia, Godínez, Ojeda, Duarte, Alfaro, Medrano, Rico, Aguilera, Gil, Ventura, Balderas, Arredondo, Coronado, Escamilla, Nájera, Palma, Amador, Blanco, Ocampo, Garduño, Barragán, Gámez, Francisco, Meléndez, Carbajal, Hurtado, Carrasco, Bonilla, Correa, Sierra, Anaya, Carranza, Romo, Valdés, Armenta, Alcántara, Escalante, Arreola, Quezada, Alarcón, Gaytán, Rentería, Vidal, Báez, de los Santos, Toledo, Colín, May, Carrera, Jaramillo, Santillán, Valle, Varela, Arenas, Rendón, Treviño, Venegas, Soriano, Zaragoza, Morán, Áviles, Aranda, Lira, Quintana, Arteaga, Valadez, Cordero, Sotelo, de la Torre, Muñiz, Hidalgo, Cázares, Covarrubias, Zamudio, Ordoñez, Aparicio, Baltazar, Gálvez, Madrigal]
+      last_name: [Hernández, García, Martínez, López, González, Rodríguez, Pérez, Sánchez, Ramírez, Cruz, Flores, Gómez, Morales, Vázquez, Reyes, Jímenez, Torres, Díaz, Gutiérrez, Mendoza, Ruiz, Aguilar, Ortiz, Castillo, Moreno, Romero, Álvarez, Chávez, Rivera, Juárez, Ramos, Méndez, Domínguez, Herrera, Medina, Vargas, Castro, Guzmán, Velázquez, Muñoz, Rojas, Contreras, Salazar, Luna, de la Cruz, Ortega, Guerrero, Santiago, Estrada, Bautista, Cortés, Soto, Alvarado, Espinoza, Lara, Ávila, Ríos, Cervantes, Silva, Delgado, Vega, Márquez, Sandoval, Fernández, León, Carrillo, Mejía, Solís, Núñez, Rosas, Valdez, Ibarra, Campos, Santos, Camacho, Peña, Maldonado, Navarro, Rosales, Acosta, Miranda, Trejo, Cabrera, Valencia, Nava, Castañeda, Pacheco, Robles, Molina, Rangel, Fuentes, Huerta, Meza, Aguirre, Cárdenas, Orozco, Padilla, Espinosa, Ayala, Salas, Valenzuela, Zúñiga, Ochoa, Salinas, Mora, Tapia, Serrano, Durán, Olvera, Macías, Zamora, Calderón, Arellano, Suárez, Barrera, Zavala, Villegas, Gallegos, Lozano, Galván, Figueroa, Beltrán, Franco, Villanueva, Sosa, Montes, Andrade, Velasco, Arias, Marín, Corona, Garza, Ponce, Esquivel, Pineda, Alonso, Palacios, Antonio, Vásquez, Trujillo, Cortez, Rocha, Rubio, Bernal, Benítez, Escobar, Villa, Galindo, Cuevas, Bravo, Cano, Osorio, Mata, Carmona, Montoya, de Jesús, Enríquez, Cisneros, Rivas, Parra, Reséndiz, Téllez, Zárate, Salgado, de la Rosa, Vera, Tovar, Arroyo, Córdova, Leyva, Quintero, Becerra, Quiroz, Barajas, Ávalos, Peralta, Román, Esparza, Murillo, Guevara, Olivares, Félix, de León, Castellanos, Villarreal, Villalobos, Lugo, Ángeles, Montiel, Segura, Magaña, Saucedo, Gallardo, Mercado, Navarrete, Reyna, Paredes, Dávila, Leal, Guerra, Saldaña, Guillén, Santana, Uribe, Monroy, Piña, Yáñez, Nieto, Islas, Granados, Escobedo, Zapata, Caballero, del Ángel, Solano, Barron, Zepeda, Acevedo, Arriaga, Barrios, Mondragón, Galicia, Godínez, Ojeda, Duarte, Alfaro, Medrano, Rico, Aguilera, Gil, Ventura, Balderas, Arredondo, Coronado, Escamilla, Nájera, Palma, Amador, Blanco, Ocampo, Garduño, Barragán, Gámez, Francisco, Meléndez, Carbajal, Hurtado, Carrasco, Bonilla, Correa, Sierra, Anaya, Carranza, Romo, Valdés, Armenta, Alcántara, Escalante, Arreola, Quezada, Alarcón, Gaytán, Rentería, Vidal, Báez, de los Santos, Toledo, Colín, May, Carrera, Jaramillo, Santillán, Valle, Varela, Arenas, Rendón, Treviño, Venegas, Soriano, Zaragoza, Morán, Áviles, Aranda, Lira, Quintana, Arteaga, Valadez, Cordero, Sotelo, de la Torre, Muñiz, Hidalgo, Cázares, Covarrubias, Zamudio, Ordoñez, Aparicio, Baltazar, Gálvez, Madrigal,Ibañez,De Romaña,Ormeño]
       prefix: [Sr., Sra., Srita., Dr., Ing.]
       suffix: [Jr., Sr., I, II, III, IV, V]
       title:

src/main/resources/fr-CH.yml

@@ -60,7 +60,7 @@ fr-CH:
         - "#{first_name} #{last_name} #{last_name}"
         
     phone_number:
-      formats: ['', '02########', '03########', '04########', '05########', '09########', '+41 1########', '+41 2########', '+41 3########', '+41 4########', '+41 5########', '+41 9########', '01 ## ## ## ##', '02 ## ## ## ##', '03 ## ## ## ##', '04 ## ## ## ##', '05 ## ## ## ##', '09 ## ## ## ##', '+41 1 ## ## ## ##', '+41 2 ## ## ## ##', '+41 3 ## ## ## ##', '+41 4 ## ## ## ##', '+41 5 ## ## ## ##', '+41 9 ## ## ## ##']
+      formats: ['02########', '03########', '04########', '05########', '09########', '+41 1########', '+41 2########', '+41 3########', '+41 4########', '+41 5########', '+41 9########', '01 ## ## ## ##', '02 ## ## ## ##', '03 ## ## ## ##', '04 ## ## ## ##', '05 ## ## ## ##', '09 ## ## ## ##', '+41 1 ## ## ## ##', '+41 2 ## ## ## ##', '+41 3 ## ## ## ##', '+41 4 ## ## ## ##', '+41 5 ## ## ## ##', '+41 9 ## ## ## ##']
 
     cell_phone:
       formats: ['#####.######', '+41.####.######']

src/main/resources/fr.yml

@@ -7,7 +7,7 @@ fr:
       secondary_address: ['Apt. ###', '# étage']
       postcode: ['#####']
       state: ['Alsace', 'Aquitaine', 'Auvergne', 'Basse-Normandie', 'Bourgogne', 'Bretagne', 'Centre', 'Champagne-Ardenne', 'Corse', 'Franche-Comté', 'Guadeloupe', 'Guyane', 'Haute-Normandie', 'Île-de-France', 'La Réunion', 'Languedoc-Roussillon', 'Limousin', 'Lorraine', 'Martinique', 'Mayotte', 'Midi-Pyrénées', 'Nord-Pas-de-Calais', 'Pays de la Loire', 'Picardie', 'Poitou-Charentes', "Provence-Alpes-Côte d'Azur", 'Rhône-Alpes']
-      city_name: ["Paris", "Marseille", "Lyon", "Toulouse", "Nice", "Nantes", "Strasbourg", "Montpellier", "Bordeaux", "Lille", "Rennes", "Reims", "Le Havre", "Saint-Étienne", "Toulon", "Grenoble", "Dijon", "Angers", "Saint-Denis", "Villeurbanne", "Le Mans", "Aix-en-Provence", "Brest", "Nîmes", "Limoges", "Clermont-Ferrand", "Tours", "Amiens", "Metz", "Perpignan", "Besançon", "Orléans", "Boulogne-Billancourt", "Mulhouse", "Rouen", "Caen", "Nancy", "Saint-Denis", "Saint-Paul", "Montreuil", "Argenteuil", "Roubaix", "Dunkerque14", "Tourcoing", "Nanterre", "Avignon", "Créteil", "Poitiers", "Fort-de-France", "Courbevoie", "Versailles", "Vitry-sur-Seine", "Colombes", "Pau", "Aulnay-sous-Bois", "Asnières-sur-Seine", "Rueil-Malmaison", "Saint-Pierre", "Antibes", "Saint-Maur-des-Fossés", "Champigny-sur-Marne", "La Rochelle", "Aubervilliers", "Calais", "Cannes", "Le Tampon", "Béziers", "Colmar", "Bourges", "Drancy", "Mérignac", "Saint-Nazaire", "Valence", "Ajaccio", "Issy-les-Moulineaux", "Villeneuve-d'Ascq", "Levallois-Perret", "Noisy-le-Grand", "Quimper", "La Seyne-sur-Mer", "Antony", "Troyes", "Neuilly-sur-Seine", "Sarcelles", "Les Abymes", "Vénissieux", "Clichy", "Lorient", "Pessac", "Ivry-sur-Seine", "Cergy", "Cayenne", "Niort", "Chambéry", "Montauban", "Saint-Quentin", "Villejuif", "Hyères", "Beauvais", "Cholet"]
+      city_name: ["Paris", "Marseille", "Lyon", "Toulouse", "Nice", "Nantes", "Strasbourg", "Montpellier", "Bordeaux", "Lille", "Rennes", "Reims", "Le Havre", "Saint-Étienne", "Toulon", "Grenoble", "Dijon", "Angers", "Saint-Denis", "Villeurbanne", "Le Mans", "Aix-en-Provence", "Brest", "Nîmes", "Limoges", "Clermont-Ferrand", "Tours", "Amiens", "Metz", "Perpignan", "Besançon", "Orléans", "Boulogne-Billancourt", "Mulhouse", "Rouen", "Caen", "Nancy", "Saint-Denis", "Saint-Paul", "Montreuil", "Argenteuil", "Roubaix", "Dunkerque", "Tourcoing", "Nanterre", "Avignon", "Créteil", "Poitiers", "Fort-de-France", "Courbevoie", "Versailles", "Vitry-sur-Seine", "Colombes", "Pau", "Aulnay-sous-Bois", "Asnières-sur-Seine", "Rueil-Malmaison", "Saint-Pierre", "Antibes", "Saint-Maur-des-Fossés", "Champigny-sur-Marne", "La Rochelle", "Aubervilliers", "Calais", "Cannes", "Le Tampon", "Béziers", "Colmar", "Bourges", "Drancy", "Mérignac", "Saint-Nazaire", "Valence", "Ajaccio", "Issy-les-Moulineaux", "Villeneuve-d'Ascq", "Levallois-Perret", "Noisy-le-Grand", "Quimper", "La Seyne-sur-Mer", "Antony", "Troyes", "Neuilly-sur-Seine", "Sarcelles", "Les Abymes", "Vénissieux", "Clichy", "Lorient", "Pessac", "Ivry-sur-Seine", "Cergy", "Cayenne", "Niort", "Chambéry", "Montauban", "Saint-Quentin", "Villejuif", "Hyères", "Beauvais", "Cholet"]
       city:
         - "#{city_name}"
       street_suffix: ["de l'Abbaye", "Adolphe Mille", "d'Alésia", "d'Argenteuil", "d'Assas", "du Bac", "de Paris", "La Boétie", "Bonaparte", "de la Bûcherie", "de Caumartin", "Charlemagne", "du Chat-qui-Pêche", "de la Chaussée-d'Antin", "du Dahomey", "Dauphine", "Delesseux", "du Faubourg Saint-Honoré", "du Faubourg-Saint-Denis", "de la Ferronnerie", "des Francs-Bourgeois", "des Grands Augustins", "de la Harpe", "du Havre", "de la Huchette", "Joubert", "Laffitte", "Lepic", "des Lombards", "Marcadet", "Molière", "Monsieur-le-Prince", "de Montmorency", "Montorgueil", "Mouffetard", "de Nesle", "Oberkampf", "de l'Odéon", "d'Orsel", "de la Paix", "des Panoramas", "Pastourelle", "Pierre Charron", "de la Pompe", "de Presbourg", "de Provence", "de Richelieu", "de Rivoli", "des Rosiers", "Royale", "d'Abbeville", "Saint-Honoré", "Saint-Bernard", "Saint-Denis", "Saint-Dominique", "Saint-Jacques", "Saint-Séverin", "des Saussaies", "de Seine", "de Solférino", "Du Sommerard", "de Tilsitt", "Vaneau", "de Vaugirard", "de la Victoire", "Zadkine"]
@@ -58,6 +58,10 @@ fr:
         - "#{Name.last_name} #{suffix}"
         - "#{Name.last_name} et #{Name.last_name}"
 
+    creature:
+      animal:
+        name: ["agneau", "aigle", "albatros", "alligator", "alpaga", "anaconda", "ane", "antilope", "araignée", "autruche", "babouin", "baleine", "belette", "béluga", "biche", "bison", "blaireau", "boa", "boeuf", "bonobo", "bouquetin", "brebis", "buffle", "cachalot", "canard", "capucin", "capybara", "caribou", "carpe", "castor", "cerf", "chacal", "chameau", "chamois", "chat", "chauve-souris", "cheval", "chèvre", "chevreuil", "chien", "chimpanzé", "chinchilla", "chouette", "cigogne", "civette", "coati", "cobaye", "coccinelle", "cochon", "coq", "coyote", "crabe", "crocodile", "cygne", "daim", "dauphin", "dinde", "dindon", "dingo", "drill", "dromadaire", "écureuil", "élan", "éléphant", "émeu", "epaulard", "escargot", "espadon", "faisan", "faon", "faucon", "fennec", "flamant rose", "fouine", "fourmilier", "furet", "gazelle", "gerbille", "gerboise", "gibbon", "girafe", "glouton", "gnou", "goret", "gorille", "grenouille", "grizzly", "grue", "guépard", "hamster", "hérisson", "hermine", "héron", "hibou", "hippocampe", "hippopotame", "hirondelle", "hyène", "ibis", "iguane", "impala", "isard", "isatis", "jaguar", "kangourou", "kiwi", "koala", "lamantin", "lamas", "lapin", "lemming", "lémurien", "léopard", "lézard", "lièvre", "lion", "loir", "loup", "loutre", "lynx", "macaque", "mammouth", "manchot", "mandrill", "mangouste", "marmotte", "marsouin", "mésange", "morse", "mouette", "moufette", "mouflon", "mouton", "mulet", "mulot", "musaraigne", "narval", "nasique", "ocelot", "oie", "okapi", "opossum", "ornithorynque", "orque", "oryx", "otarie", "ouistiti", "ours", "pandas", "pangolin", "panthère", "paon", "paresseux", "pélican", "perroquet", "phacochère", "phoque", "pie", "pingouin", "pipistrelle", "poney", "porc", "porc-épic", "poule", "poulet", "poulpe", "poussin", "puma", "putois", "python", "quetzal", "ragondin", "rat", "raton laveur", "renard", "requin", "requin baleine", "rhésus", "rhinocéros", "roussette", "salamandre", "sanglier", "serpent", "serval", "singe", "souris", "sphynx", "suricate", "tamanoir", "tamarin", "tapir", "tatou", "taupe", "taureau", "tigre", "tortue", "toucan", "unau", "urubu", "vache", "varan", "vautour", "veau", "vipère", "vison", "wallaby", "wapiti", "wombat", "yack", "zèbre", "zébu", "zibeline", "zorille"]
+        
     demographic:
       sex: ["Homme", "Femme"]
 

src/main/resources/it.yml

@@ -63,7 +63,7 @@ it:
     phone_number:
       formats: ['+## ### ## ## ####', '+## ## #######', '+## ## ########', '+## ### #######', '+## ### ########', '+## #### #######', '+## #### ########', '0## ### ####', '+39 0## ### ###', '3## ### ###', '+39 3## ### ###']
     subscription:
-      plans: ["Prova gratuita", "Basico", "Starter", "Essential", "Studente", Bronze", "Standard", "Silver", "Gold", "Platinum", "Profesional", "Business", "Diamond", "Premium"]
+      plans: ["Prova gratuita", "Basico", "Starter", "Essential", "Studente", "Bronze", "Standard", "Silver", "Gold", "Platinum", "Profesional", "Business", "Diamond", "Premium"]
       statuses: ["Attivo", "Inattivo", "Bloccato", "In sospeso"]
       payment_methods: ["Carta di credito", "Carta di debito", "Paypal", "Contanti", "Bonifico", "Bitcoins", "Assegno", "Apple Pay", "Google Pay", "WeChat Pay", "Alipay", "Visa Checkout"]
       subscription_terms: ["Quotidiano", "Settimanale", "Mensile", "Annuale", "Biennale", "Triennale", "Quinquennale", "Abbonamento a vita"]

src/main/resources/pt-BR.yml

@@ -694,4 +694,7 @@ pt-BR:
         TO: ["MV[L-Z]-####", "MW?-####", "MX[A-G]-####", "OL[H-N]-####", "OY[A-C]-####", "QK[A-M]-####"]
     gender:
       types: ["Feminino", "Masculino", "Não Binário", "Agênero", "Gênero Fluido", "Gênero queer", "Bigênero", "Poligênero"]
-      binary_types: ["Feminino", "Masculino"]
+      binary_types: ["Feminino", "Masculino"]
+    creature:
+      animal:
+        name: ["jacaré", "crocodilo", "alpaca", "formiga", "antílope", "macaco", "tatu", "burro", "babuíno", "texugo", "morcego", "urso", "castor", "abelha", "besouro", "búfalo", "borboleta", "camelo", "búfalo-asiático", "caribu", "gato", "gado", "guepardo", "chimpanzé", "chinchila", "cigarra", "amêijoa", "barata", "bacalhau", "coiote", "caranguejo", "grilo", "corvo", "corvo-comum", "cervo", "dinossauro", "cachorro", "golfinho", "toninha", "pato", "águia", "enguia", "elefante", "alce", "furão", "peixe", "mosca", "raposa", "sapo", "rã" , "gerbilo", "girafa", "mosquito", "gnu", "gnu-cauda-preta", "cabra", "peixe-dourado", "ganso", "gorila", "gafanhoto", "porquinho da índia", "hamster", "lebre", "ouriço", "arenque", "hipopótamo", "vespa", "cavalo", "cão de caça", "hiena", "impala", "chacal", "água-viva", "canguru", "wallaby", "coala", "leopardo", "leão", "lagarto", "lhama", "gafanhoto", "piolho", "arara", "pato selvagem", "mamute", "peixe-boi", "marta", "vison", "vairão", "toupeira", "macaco", "alce", "mosquito", "rato", "ratazana", "mula", "rato almiscarado", "lontra", "boi", "ostra", "panda", "porco", "ornitorrinco", "porco-espinho", "cão da pradaria", "pug", "coelho", "guaxinim", "rena", "rinoceronte", "salmão", "sardinha", "escorpião", "foca", "leão-marinho", "serval", "tubarão", "ovelha", "gambá", "caracol", "cobra", "aranha", "esquilo", "cisne", "cupim", "tigre", "truta", "tartaruga", "jabuti", "morsa", "vespa", "doninha", "baleia", "lobo", "vombate", "marmota", "minhoca", "iaque", "vespa", "zebra"]

src/main/resources/pt.yml

@@ -2,8 +2,6 @@ pt:
   faker:
     address:
       city_name: [Abrantes,Agualva-Cacém,Águeda,Albergaria-a-Velha,Albufeira,Alcácer do Sal,Alcobaça,Alfena,Almada,Almeirim,Alverca do Ribatejo,Amadora,Amarante,Amora,Anadia,Angra do Heroísmo,Aveiro,Barcelos,Barreiro,Beja,Borba,Braga,Bragança,Caldas da Rainha,Câmara de Lobos,Caniço,Cantanhede,Cartaxo,Castelo Branco,Chaves,Coimbra,Costa da Caparica,Covilhã,Elvas,Entroncamento,Ermesinde,Esmoriz,Espinho,Esposende,Estarreja,Estremoz,Évora,Fafe,Faro,Fátima,Felgueiras,Figueira da Foz,Fiães,Freamunde,Funchal,Fundão,Gafanha da Nazaré,Gandra,Gondomar,Gouveia,Guarda,Guimarães,Horta,Ílhavo,Lagoa,Lagoa,Lagos,Lamego,Leiria,Lisboa,Lixa,Loulé,Loures,Lourosa,Macedo de Cavaleiros,Machico,Maia,Mangualde,Marco de Canaveses,Marinha Grande,Matosinhos,Mealhada,Mêda,Miranda do Douro / Miranda de l Douro,Mirandela,Montemor-o-Novo,Montijo,Moura,Odivelas,Olhão da Restauração,Oliveira de Azeméis,Oliveira do Bairro,Oliveira do Hospital,Ourém,Ovar,Paços de Ferreira,Paredes,Penafiel,Peniche,Peso da Régua,Pinhel,Pombal,Ponta Delgada,Ponte de Sor,Portalegre,Portimão,Porto,Póvoa de Santa Iria,Póvoa de Varzim,Praia da Vitória,Quarteira,Queluz,Rebordosa,Reguengos de Monsaraz,Ribeira Grande,Rio Maior,Rio Tinto,Sabugal,Sacavém,Samora Correia,Santa Comba Dão,Santa Cruz,Santa Maria da Feira,Santana,Santarém,Santiago do Cacém,Santo Tirso,São João da Madeira,São Mamede de Infesta,São Pedro do Sul,Lordelo,Seia,Seixal,Senhora da Hora,Serpa,Setúbal,Silves,Sines,Tarouca,Tavira,Tomar,Tondela,Torres Novas,Torres Vedras,Trancoso,Trofa,Valbom,Vale de Cambra,Valença,Valongo,Valpaços,Vendas Novas,Viana do Castelo,Vila Baleira,Vila do Conde,Vila Franca de Xira,Vila Nova de Famalicão,Vila Nova de Foz Côa,Vila Nova de Gaia,Vila Nova de Santo André,Vila Real,Vila Real de Santo António,Viseu,Vizela]
-      city_prefix: ""
-      city_suffix: ""
       city:
         - "#{city_name}"
       country: [ "Afeganistão", "Albânia", "Algéria", "Samoa", "Andorra", "Angola", "Anguilla", "Antigua and Barbada", "Argentina", "Armênia", "Aruba", "Austrália", 

src/main/resources/ru.yml

@@ -74,3 +74,26 @@ ru:
         - "#{prefix} #{Address.city_name}#{suffix}"
         - "#{prefix} #{Address.city_name}#{suffix}#{suffix}"
         - "#{prefix} #{Address.city_name}#{suffix}#{suffix}#{suffix}"
+
+  photography:
+    term: ["диафрагма", "выдержка", "фокусное расстояние", "плёнка", "вспышка", "зеркало", "отражение", "видоискатель", "горячий башмак", "затвор", "объектив", "35мм", "зерно", "боке", "фокус", "аберрации", "Ч/Б", "ISO", "ГРИПП", "зеркалка", "цифрозеркалка", "чёрный ключ", "белый ключ", "БДД", "чувствительность", "ISO"]
+    brand: ["Agfa", "Fujifilm", "Petnax", "Canon", "Casio", "Nikon", "Hama", "Olympus", "Sony", "Konica", "Minolta", "Konica Minolta", "Lumix", "Praktika", "Polaroid", "Panasonic", "Samsung", "Ricoh", "Tamron", "Sigma", "Арсенал", "БелОМО", "КМЗ", "Leica", "ЛОМО", "ФЭД", "Kodak", "Hasselblad", "llford", "Exacta", "Carl Zeiss", "Tokina", "Kenko", "Goerz", "Yashica", "Soligor GmbH", "ВОМЗ", "ЛЗОС"]
+    camera: ["ФЭД 1","ФЭД 2","ФЭД 3","ФЭД 4","ФЭД 5","КМЗ Москва-1","КМЗ Москва-2","КМЗ Москва-2A","КМЗ Москва-3","КМЗ Москва-4","КМЗ Москва-5", "КМЗ Искра", "КМЗ Искра-2", "Зоркий", "Зоркий-2", "Зоркий-3", "Зоркий-4", "Зоркий-10","Зоркий-11","Зоркий-12","Зоркий-15","Зоркий-16", "МИР",
+             "Зенит-200A",  "Зенит-200АФ",  "Зенит-200АФ-У",  "Зенит-200-2AФ",  "Зенит-200-Zoom",  "Зенит-компакт",  "Зенит-104",  "Зенит-501Р",  "Зенит-502Р",  "Зенит-503Х",  "Зенит-504Г",  "Зенит-510",  "Зенит-520",  "Зенит-610",  "Зенит-620",  "Зенит-630", "Зенит-АПС", "Зенит-96", "Зенит-E", "Зенит-E2", "Зенит-У", "Зенит-В", "Зенит-ЕМ", "Зенит-ЕМ2", "Зенит-ВМ", "Зенит-T1", "Зенит-ЕТ", "Зенит-ВЕ", "Зенит-10", "Зенит-11", "Зенит-50", "Зенит-М", "Зенит-2", "Зенит-ДМ3","Зенит-ДМ5", "Зенит-З1",
+             "Момент-20","Момент-20У",  "Зенит-70",  "Фотон",  "Фотон-2",  "Фотон-3",  "Фотон-M",  "Фотон-E",  "Фотон-ПАК",  "Фотон-автомат",  "Фотон-УФМ (Москва-УФМ)",  "Фотон-5",  "Фотон-23",  "Фотон-супер", "Панорама",
+             "Горизонт-202-1", "Горизонт-202-С", "Горизонт-компакт", "Горизонт-S3", "Горизонт-203", "ПанАрт-С3", "Горизонт-203-У500",  "Горизонт-С3-спорт",  "Горизонт-перфект",  "Горизонт-205",
+             "Старт",  "Старт-2", "Старт-3",  "Зенит-7", "Зенит-D", "Зенит-8", "Зенит-9", "Зенит-20", "Зенит-21", "Зенит-MK", "Зенит-22", "Зенит-23", "Зенит-MTL", "Зенит-7000",
+             "Фотоснайпер", "Фотоснайпер ФС-3", "Фотоснайпер ФС-4", "Фотоснайпер ФС-4M", "Фотоснайпер ФС-5", "Фотоснайпер ФС-12", "Фотоснайпер ФС-14", "Фотоснайпер ФС-122",
+             "Смена","Смена 2","Смена 3","Смена 4","Смена 6","Смена 8","Смена 11","Смена 12","Смена 7","Смена 9",
+             "Киев 2","Киев 3","Киев 4","Киев 5","Киев 6","Киев 10","Киев 15","Киев 17","Киев 20","Киев 88","Киев 90","Салют S","Мираж 19M",
+             "ЛОМО-130A","ЛОМО-135M","ЛОМО-Компакт", "Алмаз 104", "Алмаз 101",
+             "Canon EOS 1000D", "Canon EOS 1100D", "Canon EOS 1300D", "Canon EOS 2000D", "Canon EOS 4000D", "Canon EOS 300D", "Canon EOS 350D", "Canon EOS 400D", "Canon EOS 450D", "Canon EOS 500D", "Canon EOS 550D", "Canon EOS 600D", "Canon EOS 650D", "Canon EOS 700D", "Canon EOS 750D", "Canon EOS 760D", "Canon EOS 800D", "Canon EOS 10D", "Canon EOS 20D", "Canon EOS 30D", "Canon EOS 40D", "Canon EOS 50D", "Canon EOS 60D", "Canon EOS 70D", "Canon EOS 77D", "Canon EOS 80D", "Canon EOS 90D", "Canon EOS-1D", "Canon EOS-1D Mark II", "Canon EOS-1D Mark III", "Canon EOS-1D Mark IV", "Canon EOS-1Ds", "Canon EOS-1D X", "Canon EOS-1Ds", "Canon EOS-1Ds Mark II", "Canon EOS-1Ds Mark III", "Canon EOS 5D", "Canon EOS 5D Mark II", "Canon EOS 5D Mark III", "Canon EOS 5D Mark IV", "Canon EOS 5DS", "Canon EOS 6D", "Canon EOS 7D", "Canon EOS 7D Mark II", "Canon EOS M", "Canon EOS M2", "Canon EOS M3", "Canon EOS M5", "Canon EOS M6", "Canon EOS M50", "Canon EOS M100", "Canon PowerShot", "Canon PowerShot G", "Canon IXUS",  "Canon 7",  "Canon II",  "Canon P",  "Canon VT",  "Canonet",  "Canonet G-III QL17",   "Canon EOS R", "Canon EOS RP", "Canon EOS C200", "Canon EOS C300",  "Canon EOS C500",  "Canon EOS C100",  "Canon EOS C300 Mark II",  "Canon A-1",  "Canon AE-1",  "Canon AE-1 Program",  "Canon AL-1",  "Canon AT-1",  "Canon AV-1",  "Canon F-1",  "Canon New F-1",  "Canon FTb",  "Canon TLb",  "Canon TX",  "Canon T50",  "Canon T60",  "Canon T70",  "Canon T80",  "Canon T90",  "Canon FP",  "Canon FT QL",  "Canon FX",  "Canon Pellix",  "Canon Canonflex",  "Canon ELPH 490Z",
+             "Nikon D1", "Nikon D1H", "Nikon D1X", "Nikon D2H", "Nikon D2Hs", "Nikon D2X", "Nikon D2Xs", "Nikon D3", "Nikon D3S", "Nikon D3X", "Nikon D4", "Nikon D4S", "Nikon D5", "Nikon D40", "Nikon D40x", "Nikon D50",  "Nikon D60", "Nikon D70", "Nikon D70s", "Nikon D80", "Nikon D90", "Nikon D100", "Nikon D200", "Nikon D300", "Nikon D300S", "Nikon D500", "Nikon D600",  "Nikon D610", "Nikon D700", "Nikon D750", "Nikon D800", "Nikon D800E", "Nikon D810", "Nikon D810A", "Nikon D850", "Nikon D3000", "Nikon D3100", "Nikon D3200", "Nikon D3300", "Nikon D3400", "Nikon D3500", "Nikon D5000", "Nikon D5100", "Nikon D5200", "Nikon D5300", "Nikon D5500", "Nikon D5600", "Nikon D7000", "Nikon D7100", "Nikon D7200", "Nikon D7500", "Nikon E2", "Nikon E2N", "Nikon E2NS", "Nikon E2S", "Nikon E3", "Nikon E3s", "Nikon F3AF", "Nikon F4", "Nikonos RS", "Nikon F5", "Nikon F6", "Nikon F-501", "Nikon F-801", "Nikon F-801S", "Nikon F90", "Nikon F90X", "Nikon F80", "Nikon F100", "Nikon F-601", "Nikon F70", "Nikon F75", "Nikon F-401", "Nikon F-401S", "Nikon F-401X", "Nikon F50", "Nikon F60", "Nikon F65", "Nikon F55", "Nikon I","Nikon M","Nikon S","Nikon S2","Nikon SP","Nikon S3","Nikon S4","Nikon S3M","Nikon S3","Nikon SP",
+             "Leica S", "Leica S-E", "Leica S2","Leica II",
+             "Pentax 645D", "Pentax 645Z","Pentax *ist D","Pentax *ist DL","Pentax *ist DL2","Pentax *ist DS","Pentax *ist DS2", "Pentax K-1","Pentax K-3","Pentax K-3 II","Pentax K-5","Pentax K-5 II","Pentax K-30","Pentax K-50","Pentax K-70", "Pentax K-r","Pentax K-S1","Pentax K-S2","Pentax K-x","Pentax K-7","Pentax K10D","Pentax K20D","Pentax K100D","Pentax K100D Super",  "Pentax K110D","Pentax K200D","Pentax K2000","Pentax KP","Pentax MZ-D",
+             "Olympus E-1", "Olympus E-3", "Olympus E-5", "Olympus E-10", "Olympus E-20", "Olympus E-30", "Olympus E-300", "Olympus E-330", "Olympus E-400", "Olympus E-410", "Olympus E-420", "Olympus E-450", "Olympus E-500", "Olympus E-510", "Olympus E-520", "Olympus E-620",
+             "Fujix DS-560", "Fujix DS-565", "FinePix IS Pro", "FinePix S1 Pro", "FinePix S2 Pro", "FinePix S3 Pro", "FinePix S3 Pro UVIR", "FinePix S5 Pro",
+             "Sony Alpha 100", "Sony Alpha 200", "Sony Alpha 230", "Sony Alpha 290", "Sony Alpha 300", "Sony Alpha 330", "Sony Alpha 350", "Sony α390",      "Sony Alpha 500", "Sony Alpha 550", "Sony Alpha 580", "Sony Alpha 700", "Sony Alpha 850", "Sony Alpha 900", "Sony DSLR-A100", "Sony DSLR-A100/B", "Sony DSLR-A100/S", "Sony DSLR-A200", "Sony DSLR-A230", "Sony DSLR-A290", "Sony DSLR-A300", "Sony DSLR-A300/N", "Sony DSLR-A330", "Sony DSLR-A330/T", "Sony DSLR-A350", "Sony DSLR-A350/N", "Sony DSLR-A380", "Sony DSLR-A390", "Sony DSLR-A450", "Sony DSLR-A500", "Sony DSLR-A550", "Sony DSLR-A560", "Sony DSLR-A580", "Sony DSLR-A700", "Sony DSLR-A850", "Sony DSLR-A900"]
+    lens: ["500мм/8", "17мм/2.0", "35мм/1.8", "50мм/1.2", "50мм/1.4", "50мм/1.8", "17-85мм/4.0-8.0", "85мм/1.2", "40мм/2.8", "70–300мм/4.5–5.6", "300мм/2.8", "35-350мм/3.5-5.6", "75-300мм/4-5.6", "24мм/1.4", "17–40мм/4", "24–105мм/4", "70–200мм/2.8", "70–200мм/4", "200-400мм/4", "85мм/1.8", "135мм/4", "600мм/4", "800мм/5.6", "18–55мм/3.5–5.6", "55–250мм/4–5.6", "10-24мм/3.5-4.5", "12-24мм/4", "16-85мм/3.5-5.6", "17-55мм/2.8", "18-55мм/3.5-5.6", "18-70мм/3.5-4.5", "18-105мм/3.5-5.6", "18-140мм/3.5-5.6", "18-200мм/3.5-5.6", "18-300мм/3.5-5.6", "18-300мм/3.5-6.3", "55-200мм/4-5.6", "рыбий глаз", "теле", "широкоугольный"]
+    genre: ["Абстракция", "Портрет", "Пейзаж", "Техника", "Транспорт", "Авиация", "Поезда", "Корабли", "Автомобили", "Велосипеды", "Армейское", "ВМФ", "Флора", "Фауна", "Спорт", "Улица", "Город", "Деревня", "за городом", "Архитектура", "Интерьер", "Пища", "Свадьба", "Из готового", "Папарацци", "Общественное", "Мода", "Красота", "Ню", "Наука", "Космос", "Воздушное", "Промышленное", "Искусство", "Под водой", "Ночь", "чёрный ключ", "белый ключ", "ЛОМО", "Панорама", "Макро", "Микро", "Нано"]
+    imagetag: ["Ч/Б", "стена", "небо", "облака", "трава", "дерево", "улица", "город", "техника", "самобеги", "вагоны", "повозки", "самолёты", "люди", "чай", "кофе", "ресторан", "лес", "луг", "гора", "вода", "река", "солнечно", "облачно", "дождливо", "дождь", "волна", "капля", "девушка", "кирпич", "океан", "море", "речушка", "весна", "пружина", "фестиваль", "празднование", "представление", "танцы", "вселенная", "звёзды", "галактика", "МИР", "МКС", "ракета", "реактивный самолёт", "боец", "истребитель", "певец", "действие", "показ", "театр", "представление"]