diff --git a/mural/locale/pt_BR/LC_MESSAGES/django.po b/mural/locale/pt_BR/LC_MESSAGES/django.po
index fd5b0b0..b4a70ed 100644
--- a/mural/locale/pt_BR/LC_MESSAGES/django.po
+++ b/mural/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 17:01-0300\n"
+"POT-Creation-Date: 2017-03-28 22:35-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,13 +39,14 @@ msgid "Action"
 msgstr "Ação"
 
 #: mural/models.py:21 mural/models.py:105 mural/models.py:119
+#: mural/templates/mural/_form_comment.html:66
 #: mural/templates/mural/_view_comment.html:14
 msgid "Comment"
-msgstr "Comentou"
+msgstr "Comentar"
 
 #: mural/models.py:21
 msgid "Ask for Help"
-msgstr "Pediu ajuda"
+msgstr "Pedir ajuda"
 
 #: mural/models.py:22 mural/models.py:107 mural/models.py:118
 #: mural/models.py:127
@@ -95,18 +96,24 @@ msgstr ""
 
 #: mural/templates/mural/_form.html:76
 #: mural/templates/mural/_form_comment.html:42
-msgid "Click or drop the file here"
-msgstr "Clique ou solte o arquivo aqui"
+#, fuzzy
+#| msgid "Click or drop the file here"
+msgid "Click or drop the picture here"
+msgstr "Clique ou solte a imagem aqui"
 
 #: mural/templates/mural/_form.html:78
 #: mural/templates/mural/_form_comment.html:44
-msgid "The file could not exceed 5MB."
-msgstr "O arquivo não pode exceder 5MB."
+#, fuzzy
+#| msgid "The file could not exceed 5MB."
+msgid "The picture could not exceed 5MB."
+msgstr "A imagem não pode exceder 5MB."
 
 #: mural/templates/mural/_form.html:100
-#: mural/templates/mural/_form_comment.html:66
-msgid "Save"
-msgstr "Salvar"
+#, fuzzy
+#| msgid "Post"
+msgctxt "button"
+msgid "Post"
+msgstr "Postar"
 
 #: mural/templates/mural/_form.html:101
 #: mural/templates/mural/_form_comment.html:67
@@ -364,3 +371,6 @@ msgstr "Seu comentário foi editado com sucesso!"
 #: mural/views.py:1519
 msgid "Comment deleted successfully!"
 msgstr "Comentário deletado com sucesso!"
+
+#~ msgid "Save"
+#~ msgstr "Salvar"
diff --git a/mural/templates/mural/_form.html b/mural/templates/mural/_form.html
index d1cea06..96b5990 100644
--- a/mural/templates/mural/_form.html
+++ b/mural/templates/mural/_form.html
@@ -73,9 +73,9 @@
 					{% render_field form.image %}
 
 				    <div class="filedrag">
-			    		{% trans 'Click or drop the file here' %}<br />
+			    		{% trans 'Click or drop the picture here' %}<br />
 
-			      		<small>{% trans 'The file could not exceed 5MB.' %}</small>
+			      		<small>{% trans 'The picture could not exceed 5MB.' %}</small>
 			  		</div>
 
 					<span id="helpBlock" class="help-block">{{ form.image.help_text }}</span>
@@ -97,7 +97,7 @@
 		</div>
 		<div class="modal-footer">
 			<div class="col-md-12">
-				<button type="submit" id="button" form="post-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Save" %}</button>
+				<button type="submit" id="button" form="post-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Post" context "button"%}</button>
 				<button type="button" class="btn btn-raised btn-default pull-right" data-dismiss="modal">{% trans "Cancel" %}</button>
 			</div>
 		</div>
diff --git a/mural/templates/mural/_form_comment.html b/mural/templates/mural/_form_comment.html
index 7442c42..2c7362b 100644
--- a/mural/templates/mural/_form_comment.html
+++ b/mural/templates/mural/_form_comment.html
@@ -11,7 +11,7 @@
 					{% render_field form.comment class='form-control text_simple_wysiwyg' %}
 
 					<span id="helpBlock" class="help-block">{{ form.post.help_text }}</span>
-						
+
 					{% if form.comment.errors %}
 						<div class="alert alert-danger alert-dismissible" role="alert">
 								<button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -28,7 +28,7 @@
 
 				<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
 					{% render_field form.image %}
-					
+
 					<div class="input-group common-file-input">
 				      	<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
 				      	<span class="input-group-btn input-group-sm">
@@ -39,13 +39,13 @@
 				    </div>
 
 				    <div class="filedrag">
-			    		{% trans 'Click or drop the file here' %}<br />
-			      		
-			      		<small>{% trans 'The file could not exceed 5MB.' %}</small>
+			    		{% trans 'Click or drop the picture here' %}<br />
+
+			      		<small>{% trans 'The picture could not exceed 5MB.' %}</small>
 			  		</div>
 
 					<span id="helpBlock" class="help-block">{{ form.image.help_text }}</span>
-						
+
 					{% if form.image.errors %}
 						<div class="alert alert-danger alert-dismissible" role="alert">
 								<button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -63,7 +63,7 @@
 		</div>
 		<div class="modal-footer">
 			<div class="col-md-12">
-				<button type="submit" id="button" form="comment-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Save" %}</button>
+				<button type="submit" id="button" form="comment-form" class="btn btn-success btn-raised post-button pull-left">{% trans "Comment" %}</button>
 				<button type="button" class="btn btn-raised btn-default pull-right" data-dismiss="modal">{% trans "Cancel" %}</button>
 			</div>
 		</div>
@@ -118,7 +118,7 @@
 
 			      		$(node).addClass('marked_user');
 			      		$(node).html(value);
-			      		
+
 			      		var code = context.invoke('code');
 
 			      		var new_code = $(code).append(node).append("&nbsp;");
@@ -130,7 +130,7 @@
 			    }
 	  		});
 
-		  	return button.render();   // return button as jquery object 
+		  	return button.render();   // return button as jquery object
 		}
 
 		$('.text_simple_wysiwyg').summernote({
@@ -155,7 +155,7 @@
 	});
 
 	var typingSearchTimer;                //timer identifier
-	var doneTypingSearchInterval = 1000; 
+	var doneTypingSearchInterval = 1000;
 
 	function typing_search(field) {
 		clearTimeout(typingSearchTimer);
@@ -178,7 +178,7 @@
 	function searchUsers (field) {
 		var url = $('.suggestions').data('url'),
 			param = field.val();
-	    
+
 	    $.ajax({
 	    	url: url,
 	    	data: {'param': param},
@@ -206,7 +206,7 @@
 		var small = $("#id_image"),
 			filedrag = $(".filedrag"),
 			common = $(".common-file-input");
-			
+
 		// file select
 		small.on("change", FileSelectHandler);
 
--
libgit2 0.21.2