Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / pt_Latn_BR.ISO-8859-1.php

diff --git a/nucleus/locales/pt_Latn_BR.ISO-8859-1.php b/nucleus/locales/pt_Latn_BR.ISO-8859-1.php
index 7b4ce89..1980557 100644 (file)
--- a/nucleus/locales/pt_Latn_BR.ISO-8859-1.php
+++ b/nucleus/locales/pt_Latn_BR.ISO-8859-1.php
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: pt_Latn_BR.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: pt_Latn_BR.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -828,6 +832,10 @@ define('_COMMENTFORM_YOUARE',              'Voc
 define('_COMMENTFORM_SUBMIT',          'Envia');
 define('_COMMENTFORM_COMMENT',         'Seu comentário');
 define('_COMMENTFORM_NAME',                    'Nome');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail ou site');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'auto-completar na próxima visita');
 
 // loginform