Amended software licenses for Portuguese and Spanish

3 files changed, 92 insertions, 28 deletions

diff --git a/src/mnemonics/japanese.h b/src/mnemonics/japanese.h
index 09d05d132..d5ab4bc84 100644
--- a/src/mnemonics/japanese.h
+++ b/src/mnemonics/japanese.h
@@ -1,23 +1,43 @@
-// Word list originally created by dabura667

-// 

-// Copyright (c) 2014-2017, The Monero Project

-// 

+// Word list originally created by dabura667 and released under The MIT License (MIT)

+//

+// The MIT License (MIT)

+//

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+//

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+// Code surrounding the word list is Copyright (c) 2014-2017, The Monero Project

 // All rights reserved.

-// 

+//

 // Redistribution and use in source and binary forms, with or without modification, are

 // permitted provided that the following conditions are met:

-// 

+//

 // 1. Redistributions of source code must retain the above copyright notice, this list of

 //    conditions and the following disclaimer.

-// 

+//

 // 2. Redistributions in binary form must reproduce the above copyright notice, this list

 //    of conditions and the following disclaimer in the documentation and/or other

 //    materials provided with the distribution.

-// 

+//

 // 3. Neither the name of the copyright holder nor the names of its contributors may be

 //    used to endorse or promote products derived from this software without specific

 //    prior written permission.

-// 

+//

 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL

diff --git a/src/mnemonics/portuguese.h b/src/mnemonics/portuguese.h
index 09d7132f5..f9d66afc4 100644
--- a/src/mnemonics/portuguese.h
+++ b/src/mnemonics/portuguese.h
@@ -1,21 +1,44 @@
-// Copyright (c) 2014-2017, The Monero Project

-// 

+// Word list originally created by dabura667 and released under The MIT License (MIT)

+//

+// The MIT License (MIT)

+//

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+//

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+// Code surrounding the word list is Copyright (c) 2014-2017, The Monero Project

+//

 // All rights reserved.

-// 

+//

 // Redistribution and use in source and binary forms, with or without modification, are

 // permitted provided that the following conditions are met:

-// 

+//

 // 1. Redistributions of source code must retain the above copyright notice, this list of

 //    conditions and the following disclaimer.

-// 

+//

 // 2. Redistributions in binary form must reproduce the above copyright notice, this list

 //    of conditions and the following disclaimer in the documentation and/or other

 //    materials provided with the distribution.

-// 

+//

 // 3. Neither the name of the copyright holder nor the names of its contributors may be

 //    used to endorse or promote products derived from this software without specific

 //    prior written permission.

-// 

+//

 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL

diff --git a/src/mnemonics/spanish.h b/src/mnemonics/spanish.h
index 4b386a968..117890ada 100644
--- a/src/mnemonics/spanish.h
+++ b/src/mnemonics/spanish.h
@@ -1,23 +1,44 @@
-// Word list originally created as part of the Electrum project, Copyright (C) 2014 Thomas Voegtlin

-// 

-// Copyright (c) 2014-2017, The Monero Project

-// 

+// Word list originally created by dabura667 and released under The MIT License (MIT)

+//

+// The MIT License (MIT)

+//

+// Permission is hereby granted, free of charge, to any person obtaining

+// a copy of this software and associated documentation files (the

+// "Software"), to deal in the Software without restriction, including

+// without limitation the rights to use, copy, modify, merge, publish,

+// distribute, sublicense, and/or sell copies of the Software, and to

+// permit persons to whom the Software is furnished to do so, subject to

+// the following conditions:

+//

+// The above copyright notice and this permission notice shall be

+// included in all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+// Code surrounding the word list is Copyright (c) 2014-2017, The Monero Project

+//

 // All rights reserved.

-// 

+//

 // Redistribution and use in source and binary forms, with or without modification, are

 // permitted provided that the following conditions are met:

-// 

+//

 // 1. Redistributions of source code must retain the above copyright notice, this list of

 //    conditions and the following disclaimer.

-// 

+//

 // 2. Redistributions in binary form must reproduce the above copyright notice, this list

 //    of conditions and the following disclaimer in the documentation and/or other

 //    materials provided with the distribution.

-// 

+//

 // 3. Neither the name of the copyright holder nor the names of its contributors may be

 //    used to endorse or promote products derived from this software without specific

 //    prior written permission.

-// 

+//

 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY

 // EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL

@@ -1678,11 +1699,11 @@ namespace Language
         "risa",

         "ritmo",

         "rito"

-      }), 4)
-    {
+      }), 4)

+    {

       populate_maps(ALLOW_SHORT_WORDS);

     }

   };

 }

 

-#endif
+#endif