po: Regenerate .pot files and merge .po files with them

1 files changed, 26 insertions, 20 deletions

diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 20d4b9e84..831c62c40 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2016-11-06 06:04+0100\n"
+"POT-Creation-Date: 2016-11-07 03:31+0100\n"
 "PO-Revision-Date: 2016-10-17 05:10+0200\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -9302,15 +9302,16 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (enabled and injected by default by gcc on the amd64, arm64, "
-"armel, armhf, i386, mips, mipsel, mips64el, ppc64el and s390x architectures, "
-"since dpkg 1.18.11) adds the required options if needed to enable or disable "
-"PIE. When enabled and injected by gcc, adds nothing. When enabled and not "
-"injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
-"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-fPIE -pie> to "
-"B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-PIE> to "
-"B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> "
-"and B<FCFLAGS>, and B<-no-pie> to B<LDFLAGS>."
+"This setting (enabled by default since dpkg 1.18.11, and injected by default "
+"by gcc on the amd64, arm64, armel, armhf, i386, mips, mipsel, mips64el, "
+"ppc64el and s390x Debian architectures) adds the required options if needed "
+"to enable or disable PIE. When enabled and injected by gcc, adds nothing. "
+"When enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. When disabled and injected by "
+"gcc, adds B<-fno-PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
+"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-"
+"pie> to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -9320,17 +9321,19 @@ msgid ""
 "Space Layout Randomization, supported by some kernel versions. While ASLR "
 "can already be enforced for data areas in the stack and heap (brk and mmap), "
 "the code areas must be compiled as position-independent. Shared libraries "
-"already do this (-fPIC), so they gain ASLR automatically, but binary .text "
-"regions need to be build PIE to gain ASLR. When this happens, ROP (Return "
-"Oriented Programming) attacks are much harder since there are no static "
-"locations to bounce off of during a memory corruption attack."
+"already do this (B<-fPIC>), so they gain ASLR automatically, but binary ."
+"text regions need to be build PIE to gain ASLR. When this happens, ROP "
+"(Return Oriented Programming) attacks are much harder since there are no "
+"static locations to bounce off of during a memory corruption attack."
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This is not compatible with B<-fPIC> so care must be taken when building "
-"shared objects."
+"PIE is not compatible with B<-fPIC>, so in general care must be taken when "
+"building shared objects. But because the PIE flags emitted get injected via "
+"gcc specs files, it should always be safe to unconditionally set them "
+"regardless of the object type being compiled or linked."
 msgstr ""
 
 #. type: Plain text
@@ -9360,7 +9363,7 @@ msgstr "B<-G>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "Can be linked into any program, but not a shared library."
+msgid "Can be linked into any program, but not a shared library (recommended)."
 msgstr ""
 
 #. type: TP
@@ -9377,14 +9380,17 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"Unconditionally passing B<-fPIE>, B<-fpie> or B<-pie> to a build-system "
-"using libtool is safe as these flags will get stripped when building shared "
+"If there is a need to set these flags manually, bypassing the gcc specs "
+"injection, there are several things to take into account. Unconditionally "
+"and explicitly passing B<-fPIE>, B<-fpie> or B<-pie> to a build-system using "
+"libtool is safe as these flags will get stripped when building shared "
 "libraries.  Otherwise on projects that build both programs and shared "
 "libraries you might need to make sure that when building the shared "
 "libraries B<-fPIC> is always passed last (so that it overrides any previous "
 "B<-PIE>) to compilation flags such as B<CFLAGS>, and B<-shared> is passed "
 "last (so that it overrides any previous B<-pie>) to linking flags such as "
-"B<LDFLAGS>."
+"B<LDFLAGS>. B<Note:> This should not be needed with the default gcc specs "
+"machinery."
 msgstr ""
 
 #. type: Plain text