Add progress text and tidy up localization files

1 files changed, 41 insertions, 72 deletions

diff --git a/l10n/po/pt_BR.po b/l10n/po/pt_BR.po
index 6281867..9ed367e 100644
--- a/l10n/po/pt_BR.po
+++ b/l10n/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: win32-loader (20080210)\n"
 "Report-Msgid-Bugs-To: win32-loader@packages.debian.org\n"
-"POT-Creation-Date: 2019-05-22 22:56+0200\n"
+"POT-Creation-Date: 2019-09-01 11:42+0200\n"
 "PO-Revision-Date: 2012-06-23 22:56-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -256,55 +256,36 @@ msgid "Text install"
 msgstr "Instalação texto"
 
 #: win32-loader.c:120
-#, c-format
-msgid "Downloading %s"
-msgstr "Baixando %s"
-
-#: win32-loader.c:121
 msgid "Connecting ..."
 msgstr "Conectando ..."
 
-#: win32-loader.c:122
-msgid "second"
-msgstr "segundo"
-
-#: win32-loader.c:123
-msgid "minute"
-msgstr "minuto"
-
-#: win32-loader.c:124
-msgid "hour"
-msgstr "hora"
-
 #. translate:
-#. This string is appended to "second", "minute" or "hour" to make plurals.
-#. I know it's quite unfortunate.  An alternate method for translating NSISdl
-#. has been proposed [1] but in the meantime we'll have to cope with this.
-#. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
+#. $(^Byte), $0, $1, $4 must not be translated.
+#. These are substitutes as the following:
+#. $(^Byte) -> B
+#. $0 -> unit prefix such as G (giga), M (mega), K (kilo) or empty
+#. $1 -> estimated time remaining for the download
+#. It includes the unit. Examples are 1h, 5m, 3s
+#. $2 -> current size of downloaded content
+#. $4 -> total size of file
+#. Example: 3s left - 49.2 of 55.0 MB (2.2 MB/s)
 #.
-#: win32-loader.c:132
-msgid "s"
-msgstr "s"
-
+#. Former values:
+#. "%dkB (%d%%) de %dkB a %d,%01dkB/s"
+#. " (%d %s%s faltando)"
 #: win32-loader.c:133
-#, c-format
-msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
-msgstr "%dkB (%d%%) de %dkB a %d,%01dkB/s"
+msgid "$1 left - $2 of $4$0$(^Byte) ($3$0$(^Byte)/s)"
+msgstr ""
 
 #: win32-loader.c:134
-#, c-format
-msgid " (%d %s%s remaining)"
-msgstr " (%d %s%s faltando)"
-
-#: win32-loader.c:135
 msgid "Select which version of Debian-Installer to use:"
 msgstr "Selecione qual versão do Instalador Debian usar:"
 
-#: win32-loader.c:136
+#: win32-loader.c:135
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr "Versão estável. Será instalado o Debian \"stable\"."
 
-#: win32-loader.c:137
+#: win32-loader.c:136
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
@@ -318,7 +299,7 @@ msgstr ""
 #. translate:
 #. You might want to mention that so-called "known issues" page is only available in English.
 #.
-#: win32-loader.c:142
+#: win32-loader.c:141
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
@@ -326,7 +307,7 @@ msgstr ""
 "É recomendado que você verifique problemas conhecidos antes de usar uma "
 "imagem construída diariamente. Você gostaria de fazer isso agora?"
 
-#: win32-loader.c:143
+#: win32-loader.c:142
 msgid ""
 "The following parameters will be used.  Do NOT change any of these unless "
 "you know what you're doing."
@@ -334,37 +315,37 @@ msgstr ""
 "Os seguintes parâmetros serão usados. NÃO mude nenhum deles a menos que você "
 "saiba o que está fazendo."
 
-#: win32-loader.c:144
+#: win32-loader.c:143
 msgid "Proxy settings (host:port):"
 msgstr "Configurações de proxy (máquina:porta):"
 
-#: win32-loader.c:145
+#: win32-loader.c:144
 msgid "Location of boot.ini:"
 msgstr "Localização do boot.ini:"
 
-#: win32-loader.c:146
+#: win32-loader.c:145
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "URL base para imagens \"netboot\" (linux e initrd.gz):"
 
-#: win32-loader.c:147
+#: win32-loader.c:146
 msgid "Error"
 msgstr "Erro"
 
-#: win32-loader.c:148
+#: win32-loader.c:147
 msgid "Error: failed to copy $0 to $1."
 msgstr "Erro: falhou ao copiar $0 para $1."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:153
+#: win32-loader.c:152
 msgid "Checking GPG signature on $0."
 msgstr "Verificando assinatura GPG em $0."
 
 #. translate:
 #. $0 will be "Release" (it is a filename).
 #.
-#: win32-loader.c:158
+#: win32-loader.c:157
 msgid "The downloaded $0 file cannot be trusted! Aborting."
 msgstr "O arquivo $0 baixado não é confiável! Abortando."
 
@@ -372,7 +353,7 @@ msgstr "O arquivo $0 baixado não é confiável! Abortando."
 #. This appears in a MessageBox when the md5 checksum verification failed. $0 is a url; $2 is the filename $1 is the
 #. computed checksum and $4 is the expected one.
 #.
-#: win32-loader.c:164
+#: win32-loader.c:163
 msgid "Checksum mismatch for $0/$2. Got $1 when expecting $4. Aborting."
 msgstr ""
 "Soma de verificação falhou para $0/$2. Obtido $1 quando o esperado era $4. "
@@ -381,43 +362,43 @@ msgstr ""
 #. translate:
 #. $2 is a filename
 #.
-#: win32-loader.c:169
+#: win32-loader.c:168
 msgid "Computing checksum for $2"
 msgstr "Computando soma de verificação para $2"
 
-#: win32-loader.c:170
+#: win32-loader.c:169
 msgid "Generating $0"
 msgstr "Gerando $0"
 
-#: win32-loader.c:171
+#: win32-loader.c:170
 msgid "Appending preseeding information to $0"
 msgstr "Anexando informação de pré-configuração a $0"
 
-#: win32-loader.c:172
+#: win32-loader.c:171
 msgid "Error: unable to run $0."
 msgstr "Erro: incapaz de executar $0."
 
-#: win32-loader.c:173
+#: win32-loader.c:172
 msgid "Disabling NTFS compression in bootstrap files"
 msgstr "Desabilitando compressão NTFS nos arquivos de \"bootstrap\""
 
-#: win32-loader.c:174
+#: win32-loader.c:173
 msgid "Registering in NTLDR"
 msgstr "Registrando no NTLDR"
 
-#: win32-loader.c:175
+#: win32-loader.c:174
 msgid "Registering in BootMgr"
 msgstr "Registrando no BootMgr"
 
-#: win32-loader.c:176
+#: win32-loader.c:175
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr "Erro: falhou ao analisar a saída do bcdedit.exe."
 
-#: win32-loader.c:177
+#: win32-loader.c:176
 msgid "Error: $0 not found.  Is this really Windows $windows_version?"
 msgstr "Erro: $0 não encontrado. Este é realmente o Windows $windows_version?"
 
-#: win32-loader.c:178
+#: win32-loader.c:177
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr "NOTÍCIA MUITA IMPORTANTE:\\n\\n"
 
@@ -427,7 +408,7 @@ msgstr "NOTÍCIA MUITA IMPORTANTE:\\n\\n"
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:186
+#: win32-loader.c:185
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
@@ -437,7 +418,7 @@ msgstr ""
 "confirmação, este programa reinicializará o Windows no modo DOS, e "
 "automaticamente carregará a próxima parte do processo de instalação.\\n\\n"
 
-#: win32-loader.c:187
+#: win32-loader.c:186
 msgid ""
 "You need to reboot in order to proceed with the install process.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -447,7 +428,7 @@ msgstr ""
 "Durante a próxima inicialização, você será questionado se quer iniciar o "
 "Windows ou continuar com o processo de instalação.\\n\\n"
 
-#: win32-loader.c:188
+#: win32-loader.c:187
 msgid ""
 "During the install process, you will be offered the possibility of either "
 "reducing your Windows partition or completely replacing it.  In both cases, "
@@ -466,18 +447,6 @@ msgstr ""
 "carregador através da opção Adicionar/Remover Programas no Painel de "
 "Controle."
 
-#: win32-loader.c:189
+#: win32-loader.c:188
 msgid "Do you want to reboot now?"
 msgstr "Você gostaria de reinicializar agora?"
-
-#~ msgid "Desktop environment:"
-#~ msgstr "Ambiente de área de trabalho:"
-
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "Debian Installer"
-#~ msgstr "Instalador Debian"
-
-#~ msgid "Debconf preseed line:"
-#~ msgstr "Linha de pré-configuração (\"preseed\") debconf:"