Merge remote-tracking branch 'mchehab/master' into master

Conflicts:
	AndorsTrail/res/values/authors.xml
	AndorsTrailEdit/AndorsTrailTranslations.js

diff --cc AndorsTrail/res/values/authors.xml
index 66c62574d0582baebcfd7324c265c449c71df2bb,15c0d0a8429a369847bf8a4535f544d1ae084a64..3388585c358c66f7ebc5a558b4044939f79dfd15
--- 1/AndorsTrail/res/values/authors.xml
--- 2/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@@ -29,10 -29,9 +29,11 @@@
                German translation by Bomber, Samuel Plentz and cngunners14<br />
                English proofreading by taws34<br />
                English proofreading and testing by Stephen Stalnaker<br />
 +              English proofreading by Elyon<br />
                Hebrew translation by eitanbm<br />
-               Portugese translation by mira<br />
+               Portugese(PT) translation by mira<br />
+               Portugese(BR) translation by Mauro Carvalho Chehab<br />
 +              Japanese translation by surgecurrent<br />
                Forum moderated by Tim Davis<br />
                Forum moderated by Josh Kloos<br />
                Forum moderated by Travis Miller<br />

diff --cc AndorsTrailEdit/AndorsTrailTranslations.js
index 88e827b68c2561421481b1bb51100d50139a9462,a54f5cb0d95c34ec7a284a7073471a83af951269..9f4b8bc6f67b559772f7b73c2b9d9fcd9cfaef9e
--- 1/AndorsTrailEdit/AndorsTrailTranslations.js
--- 2/AndorsTrailEdit/AndorsTrailTranslations.js
+++ b/AndorsTrailEdit/AndorsTrailTranslations.js
@@@ -58,9 -55,13 +58,17 @@@ var translations = 
                'content_monsterlist.xml', 
                'strings.xml'
        ]},
 +      { name: 'Japanese', id: 'values-ja', files: [ 
 +              'content_conversationlist.xml', 
 +              'strings.xml'
++      ]},
+       { name: 'Brazilian Portugese', id: 'values-pt-rBR', files: [
+               'content_actorconditions.xml',
+               'content_conversationlist.xml',
+               'content_itemlist.xml',
+               'content_monsterlist.xml',
+               'content_questlist.xml',
+               'strings.xml'
        ]}
  ];