changeset 23424:b97b2fbf525c stable

i18n-pt_BR: synchronized with 3bd577a3283e
author Wagner Bruna <wbruna@softwareexpress.com.br>
date Mon, 01 Dec 2014 11:21:30 -0200
parents c6329a0e8f94
children 2b1ffaaab01f
files i18n/pt_BR.po
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/i18n/pt_BR.po	Sat Nov 29 14:32:12 2014 +0900
+++ b/i18n/pt_BR.po	Mon Dec 01 11:21:30 2014 -0200
@@ -12497,6 +12497,9 @@
 msgid "free the working state lock (DANGEROUS)"
 msgstr "libera o lock do working state (PERIGOSO)"
 
+msgid "[OPTION]..."
+msgstr "[OPÇÃO]..."
+
 msgid "show or modify state of locks"
 msgstr "mostra ou modifica o estado dos locks"
 
@@ -12722,9 +12725,6 @@
 msgid "sort by saved mtime"
 msgstr "ordena por mtime armazenado"
 
-msgid "[OPTION]..."
-msgstr "[OPÇÃO]..."
-
 msgid "show the contents of the current dirstate"
 msgstr "mostra o conteúdo do dirstate atual"
 
@@ -14130,8 +14130,8 @@
 msgid "[-P] [-f] [[-r] REV]"
 msgstr "[-P] [-f] [[-r] REV]"
 
-msgid "merge working directory with another revision"
-msgstr "mescla o diretório de trabalho com outra revisão"
+msgid "merge another revision into working directory"
+msgstr "mescla uma outra revisão com o diretório de trabalho"
 
 msgid ""
 "    The current working directory is updated with all changes made in\n"
@@ -20039,7 +20039,7 @@
 
 msgid ""
 "``reportoldssl``\n"
-"    Warn if an SSL certificate is unable to be due to using Python\n"
+"    Warn if an SSL certificate is unable to be used due to using Python\n"
 "    2.5 or earlier. True or False. Default is True."
 msgstr ""
 "``reportoldssl``\n"