Merge pull request #349

6d6a985 add Germany and Italian wordlists (Riccardo Spagni)
514047d fix portuguese wordlist (Riccardo Spagni)
b5c0308 fix license on English wordlist (Riccardo Spagni)

src/mnemonics/CMakeLists.txt

@@ -34,6 +34,8 @@ set(mnemonics_headers)
 set(mnemonics_private_headers
   electrum-words.h
   english.h
+  german.h
+  italian.h
   japanese.h
   language_base.h
   old_english.h

src/mnemonics/electrum-words.cpp

@@ -52,6 +52,8 @@
 #include <boost/algorithm/string/join.hpp>
 
 #include "english.h"
+#include "italian.h"
+#include "german.h"
 #include "spanish.h"
 #include "portuguese.h"
 #include "japanese.h"
@@ -78,6 +80,8 @@ namespace
     std::vector<Language::Base*> language_instances({
       Language::Singleton<Language::English>::instance(),
       Language::Singleton<Language::Spanish>::instance(),
+      Language::Singleton<Language::German>::instance(),
+      Language::Singleton<Language::Italian>::instance(),
       Language::Singleton<Language::Portuguese>::instance(),
       Language::Singleton<Language::Japanese>::instance(),
       Language::Singleton<Language::OldEnglish>::instance()
@@ -293,6 +297,14 @@ namespace crypto
       {
         language = Language::Singleton<Language::Japanese>::instance();
       }
+      else if (language_name == "Italian")
+      {
+        language = Language::Singleton<Language::Italian>::instance();
+      }
+      else if (language_name == "German")
+      {
+        language = Language::Singleton<Language::German>::instance();
+      }
       else
       {
         return false;
@@ -340,6 +352,8 @@ namespace crypto
       std::vector<Language::Base*> language_instances({
         Language::Singleton<Language::English>::instance(),
         Language::Singleton<Language::Spanish>::instance(),
+        Language::Singleton<Language::German>::instance(),
+        Language::Singleton<Language::Italian>::instance(),
         Language::Singleton<Language::Portuguese>::instance(),
         Language::Singleton<Language::Japanese>::instance()
       });

src/mnemonics/english.h

@@ -1,5 +1,3 @@
-// Word list originally created as part of the Electrum project, Copyright (C) 2014 Thomas Voegtlin
-// 
 // Copyright (c) 2014-2015, The Monero Project
 // 
 // All rights reserved.

src/mnemonics/portuguese.h

@@ -587,7 +587,7 @@ namespace Language
         "feerico",
         "feixe",
         "felicidade",
-        "felipe",
+        "felpudo",
         "feltro",
         "femur",
         "fenotipo",
@@ -712,7 +712,7 @@ namespace Language
         "gume",
         "guru",
         "gustativo",
-        "gustavo",
+        "grelhado",
         "gutural",
         "habitue",
         "haitiano",
@@ -1334,7 +1334,7 @@ namespace Language
         "rins",
         "rios",
         "riqueza",
-        "riquixa",
+        "respeito",
         "rissole",
         "ritualistico",
         "rivalizar",