Regenerate .pot files and merge .po files with them

1 files changed, 144 insertions, 100 deletions

diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 234e0de57..f3d09d792 100644
--- a/dselect/po/pt.po
+++ b/dselect/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2014-08-09 12:48+0200\n"
+"POT-Creation-Date: 2014-08-15 03:51+0200\n"
 "PO-Revision-Date: 2008-12-27 16:05+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -80,53 +80,53 @@ msgstr "falhou bloquear SIGWINCH"
 msgid "failed to set new SIGWINCH sigact"
 msgstr "falhou definir o novo SIGWINCH sigact"
 
-#: dselect/baselist.cc:136
+#: dselect/baselist.cc:174
 msgid "failed to allocate colour pair"
 msgstr "falhou alocar par de cores"
 
-#: dselect/baselist.cc:165
+#: dselect/baselist.cc:203
 msgid "failed to create title window"
 msgstr "falhou criar o título da janela"
 
-#: dselect/baselist.cc:169
+#: dselect/baselist.cc:207
 msgid "failed to create whatinfo window"
 msgstr "falhou criar a janela whatinfo"
 
-#: dselect/baselist.cc:173
+#: dselect/baselist.cc:211
 msgid "failed to create baselist pad"
 msgstr "falhou ao criar baselist pad"
 
-#: dselect/baselist.cc:176
+#: dselect/baselist.cc:214
 msgid "failed to create heading pad"
 msgstr "falhou ao criar heading pad"
 
-#: dselect/baselist.cc:180
+#: dselect/baselist.cc:218
 msgid "failed to create thisstate pad"
 msgstr "falhou ao criar thisstate pad"
 
-#: dselect/baselist.cc:184
+#: dselect/baselist.cc:222
 msgid "failed to create info pad"
 msgstr "falhou ao criar info pad"
 
-#: dselect/baselist.cc:189
+#: dselect/baselist.cc:227
 msgid "failed to create query window"
 msgstr "falhou ao criar janela de query"
 
-#: dselect/baselist.cc:258
+#: dselect/baselist.cc:298
 msgid "Keybindings"
 msgstr "Keybindings"
 
-#: dselect/baselist.cc:307
+#: dselect/baselist.cc:347
 #, c-format
 msgid "  -- %d%%, press "
 msgstr "  -- %d%%, pressione "
 
-#: dselect/baselist.cc:310
+#: dselect/baselist.cc:350
 #, c-format
 msgid "%s for more"
 msgstr "%s para mais"
 
-#: dselect/baselist.cc:314
+#: dselect/baselist.cc:354
 #, c-format
 msgid "%s to go back"
 msgstr "%s para voltar atrás"
@@ -279,6 +279,38 @@ msgid "Keystrokes"
 msgstr "Combinações de teclas"
 
 #: dselect/helpmsgs.cc:29
+#, fuzzy
+#| msgid ""
+#| "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
+#| "  j, Down-arrow         k, Up-arrow             move highlight\n"
+#| "  N, Page-down, Space   P, Page-up, Backspace   scroll list by 1 page\n"
+#| "  ^n                    ^p                      scroll list by 1 line\n"
+#| "  t, Home               e, End                  jump to top/end of list\n"
+#| "  u                     d                       scroll info by 1 page\n"
+#| "  ^u                    ^d                      scroll info by 1 line\n"
+#| "  B, Left-arrow         F, Right-arrow          pan display by 1/3 "
+#| "screen\n"
+#| "  ^b                    ^f                      pan display by 1 "
+#| "character\n"
+#| "\n"
+#| "Mark packages for later processing:\n"
+#| " +, Insert  install or upgrade      =, H  hold in present state\n"
+#| " -, Delete  remove                  :, G  unhold: upgrade or leave "
+#| "uninstalled\n"
+#| " _          remove & purge config\n"
+#| "                                             Miscellaneous:\n"
+#| "Quit, exit, overwrite (note capitals!):       ?, F1 request help (also "
+#| "Help)\n"
+#| " Return  Confirm, quit (check dependencies)   i, I  toggle/cycle info "
+#| "displays\n"
+#| "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
+#| "options\n"
+#| " X, Esc  eXit, abandoning any changes made    v, V  change status display "
+#| "opts\n"
+#| "   R     Revert to state before this list      ^l   redraw display\n"
+#| "   U     set all to sUggested state             /   search (Return to "
+#| "cancel)\n"
+#| "   D     set all to Directly requested state  n, \\  repeat last search\n"
 msgid ""
 "Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n"
 "  j, Down-arrow         k, Up-arrow             move highlight\n"
@@ -302,7 +334,7 @@ msgid ""
 "displays\n"
 "   Q     Confirm, quit (override dep.s)       o, O  cycle through sort "
 "options\n"
-" X, Esc  eXit, abandoning any changes made    v, V  change status display "
+" X, Esc  eXit, abandoning any changes made   v, A, V  change status display "
 "opts\n"
 "   R     Revert to state before this list      ^l   redraw display\n"
 "   U     set all to sUggested state             /   search (Return to "
@@ -917,39 +949,39 @@ msgstr "Atributos:\n"
 msgid "couldn't open debug file `%.255s'\n"
 msgstr "não pode abrir ficheiro de debug `%.255s'\n"
 
-#: dselect/main.cc:254
+#: dselect/main.cc:253
 #, fuzzy, c-format
 #| msgid "Invalid %s `%s'\n"
 msgid "invalid %s '%s'"
 msgstr "%s inválido `%s'\n"
 
-#: dselect/main.cc:273
+#: dselect/main.cc:272
 msgid "screen part"
 msgstr "screen part"
 
-#: dselect/main.cc:279
+#: dselect/main.cc:278
 #, fuzzy
 #| msgid "Null colour specification\n"
 msgid "null colour specification"
 msgstr "Especificação de cor nula\n"
 
-#: dselect/main.cc:287 dselect/main.cc:292
+#: dselect/main.cc:286 dselect/main.cc:291
 msgid "colour"
 msgstr "cor"
 
-#: dselect/main.cc:300
+#: dselect/main.cc:299
 msgid "colour attribute"
 msgstr "atributo de cor"
 
-#: dselect/main.cc:334
+#: dselect/main.cc:333
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr "O terminal não parece suportar endereçamento do cursor.\n"
 
-#: dselect/main.cc:336
+#: dselect/main.cc:335
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr "O terminal não parece suportar highlighting\n"
 
-#: dselect/main.cc:338
+#: dselect/main.cc:337
 #, c-format
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
@@ -958,11 +990,11 @@ msgstr ""
 "Defina correctamente a veriável TERM, utilize um terminal melhor,\n"
 "ou faça-o com a ferramente de gestão por pacote %s.\n"
 
-#: dselect/main.cc:341
+#: dselect/main.cc:340
 msgid "terminal lacks necessary features, giving up"
 msgstr "o terminal carece de funcionalidades necessárias, desistindo"
 
-#: dselect/main.cc:426
+#: dselect/main.cc:425
 msgid ""
 "\n"
 "\n"
@@ -975,7 +1007,7 @@ msgstr ""
 "Mova-se com ^P e ^N, teclas de cursor, letras iniciais, ou digitos;\n"
 "Carregue em <enter> para confirmar a selecção.   ^L re-desenha o ecrã.\n"
 
-#: dselect/main.cc:431
+#: dselect/main.cc:430
 msgid ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
@@ -983,7 +1015,7 @@ msgstr ""
 "Copyright (C) 1994-1996 Ian Jackson.\n"
 "Copyright (C) 2000,2001 Wichert Akkerman.\n"
 
-#: dselect/main.cc:437
+#: dselect/main.cc:436
 msgid ""
 "\n"
 "\n"
@@ -993,15 +1025,23 @@ msgstr ""
 "\n"
 "Acesso apenas de leitura: só está disponível a visualização!"
 
-#: dselect/main.cc:456
+#: dselect/main.cc:455
 msgid "failed to getch in main menu"
 msgstr "falhou o getch no menu principal"
 
-#: dselect/main.cc:539
+#: dselect/main.cc:538
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr "string de acção desconhecida `%.50s'"
 
+#: dselect/methlist.cc:66
+msgid "Abbrev."
+msgstr "Abrev."
+
+#: dselect/methlist.cc:67 dselect/pkgdisplay.cc:188 dselect/pkginfo.cc:110
+msgid "Description"
+msgstr "Descrição"
+
 #: dselect/methlist.cc:73
 msgid "dselect - list of access methods"
 msgstr "dselect - lista de métodos de acesso"
@@ -1011,35 +1051,27 @@ msgstr "dselect - lista de métodos de acesso"
 msgid "Access method `%s'."
 msgstr "Método de acesso `%s'."
 
-#: dselect/methlist.cc:116
-msgid "Abbrev."
-msgstr "Abrev."
-
-#: dselect/methlist.cc:117 dselect/pkginfo.cc:110 dselect/pkgtop.cc:293
-msgid "Description"
-msgstr "Descrição"
-
-#: dselect/methlist.cc:160 dselect/pkglist.cc:585
+#: dselect/methlist.cc:161 dselect/pkglist.cc:587
 msgid "doupdate failed"
 msgstr "falhou doupdate"
 
-#: dselect/methlist.cc:163 dselect/pkglist.cc:588
+#: dselect/methlist.cc:164 dselect/pkglist.cc:590
 msgid "failed to unblock SIGWINCH"
 msgstr "falha ao desbloquear SIGWINCH"
 
-#: dselect/methlist.cc:168 dselect/pkglist.cc:593
+#: dselect/methlist.cc:169 dselect/pkglist.cc:595
 msgid "failed to re-block SIGWINCH"
 msgstr "falhou re-bloquear SIGWINCH"
 
-#: dselect/methlist.cc:169 dselect/pkglist.cc:595
+#: dselect/methlist.cc:170 dselect/pkglist.cc:597
 msgid "getch failed"
 msgstr "falhou getch"
 
-#: dselect/methlist.cc:186
+#: dselect/methlist.cc:187
 msgid "Explanation"
 msgstr "Explicação de "
 
-#: dselect/methlist.cc:196
+#: dselect/methlist.cc:197
 msgid "No explanation available."
 msgstr "Sem explicação disponível."
 
@@ -1431,67 +1463,119 @@ msgstr "Instalado"
 msgid "Purged"
 msgstr "Purgado"
 
-#: dselect/pkgdisplay.cc:193
+#: dselect/pkgdisplay.cc:138
+msgid "Error"
+msgstr "Erro"
+
+#: dselect/pkgdisplay.cc:139
+msgid "Installed?"
+msgstr "Instalado?"
+
+#: dselect/pkgdisplay.cc:140
+msgid "Old mark"
+msgstr "Marca antiga"
+
+#: dselect/pkgdisplay.cc:141
+msgid "Marked for"
+msgstr "Marcado para"
+
+#: dselect/pkgdisplay.cc:143
+msgid "EIOM"
+msgstr "EIOM"
+
+#: dselect/pkgdisplay.cc:147 dselect/pkgdisplay.cc:150
+msgid "Section"
+msgstr "Secção"
+
+#: dselect/pkgdisplay.cc:148
+msgid "Priority"
+msgstr "Prioridade"
+
+#: dselect/pkgdisplay.cc:152
+msgid "Package"
+msgstr "Pacote"
+
+#: dselect/pkgdisplay.cc:161 dselect/pkgdisplay.cc:165
+#, fuzzy
+#| msgid "Avail.ver"
+msgid "Avail.arch"
+msgstr "Ver.Dispon."
+
+#: dselect/pkgdisplay.cc:164
+#, fuzzy
+#| msgid "Inst.ver"
+msgid "Inst.arch"
+msgstr "Vers.Inst"
+
+#: dselect/pkgdisplay.cc:178 dselect/pkgdisplay.cc:182
+msgid "Avail.ver"
+msgstr "Ver.Dispon."
+
+#: dselect/pkgdisplay.cc:181
+msgid "Inst.ver"
+msgstr "Vers.Inst"
+
+#: dselect/pkgdisplay.cc:197
 msgid "dselect - recursive package listing"
 msgstr "dselect - listagem recursiva de pacotes"
 
-#: dselect/pkgdisplay.cc:195
+#: dselect/pkgdisplay.cc:199
 msgid "dselect - inspection of package states"
 msgstr "dselect - inspecção de estado dos pacotes"
 
-#: dselect/pkgdisplay.cc:196
+#: dselect/pkgdisplay.cc:200
 msgid "dselect - main package listing"
 msgstr "dselect - lista principal de pacotes"
 
-#: dselect/pkgdisplay.cc:204
+#: dselect/pkgdisplay.cc:208
 msgid " (by section)"
 msgstr " (por secção)"
 
-#: dselect/pkgdisplay.cc:207
+#: dselect/pkgdisplay.cc:211
 msgid " (avail., section)"
 msgstr " (disp., secção)"
 
-#: dselect/pkgdisplay.cc:210
+#: dselect/pkgdisplay.cc:214
 msgid " (status, section)"
 msgstr " (status, secção)"
 
-#: dselect/pkgdisplay.cc:219
+#: dselect/pkgdisplay.cc:223
 msgid " (by priority)"
 msgstr "(por prioridade)"
 
-#: dselect/pkgdisplay.cc:222
+#: dselect/pkgdisplay.cc:226
 msgid " (avail., priority)"
 msgstr " (disp., proioridade)"
 
-#: dselect/pkgdisplay.cc:225
+#: dselect/pkgdisplay.cc:229
 msgid " (status, priority)"
 msgstr " (status, prioridade)"
 
-#: dselect/pkgdisplay.cc:234
+#: dselect/pkgdisplay.cc:238
 msgid " (alphabetically)"
 msgstr " (alfabeticamente)"
 
-#: dselect/pkgdisplay.cc:237
+#: dselect/pkgdisplay.cc:241
 msgid " (by availability)"
 msgstr " (por disponibilidade)"
 
-#: dselect/pkgdisplay.cc:240
+#: dselect/pkgdisplay.cc:244
 msgid " (by status)"
 msgstr " (por status)"
 
-#: dselect/pkgdisplay.cc:255
+#: dselect/pkgdisplay.cc:259
 msgid " mark:+/=/- terse:v help:?"
 msgstr " marca:+/=/- resumo:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:256
+#: dselect/pkgdisplay.cc:260
 msgid " mark:+/=/- verbose:v help:?"
 msgstr " marca:+/=/- detalhe:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:258
+#: dselect/pkgdisplay.cc:262
 msgid " terse:v help:?"
 msgstr " detalhe:v ajuda:?"
 
-#: dselect/pkgdisplay.cc:259
+#: dselect/pkgdisplay.cc:263
 msgid " verbose:v help:?"
 msgstr " detalhe:v ajuda:?"
 
@@ -1537,11 +1621,11 @@ msgstr "informação 'Available' do ficheiro de controle"
 msgid "there are no packages"
 msgstr "Pacotes instalados"
 
-#: dselect/pkglist.cc:519
+#: dselect/pkglist.cc:521
 msgid "invalid search option given"
 msgstr "fornecida opção de busca inválida"
 
-#: dselect/pkglist.cc:534
+#: dselect/pkglist.cc:536
 msgid "error in regular expression"
 msgstr "erro em expressão regular"
 
@@ -1591,46 +1675,6 @@ msgstr "%s %s pacotes na secção %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (foi: %s).  %s"
 
-#: dselect/pkgtop.cc:265
-msgid "Error"
-msgstr "Erro"
-
-#: dselect/pkgtop.cc:269
-msgid "Installed?"
-msgstr "Instalado?"
-
-#: dselect/pkgtop.cc:273
-msgid "Old mark"
-msgstr "Marca antiga"
-
-#: dselect/pkgtop.cc:277
-msgid "Marked for"
-msgstr "Marcado para"
-
-#: dselect/pkgtop.cc:280
-msgid "EIOM"
-msgstr "EIOM"
-
-#: dselect/pkgtop.cc:282
-msgid "Section"
-msgstr "Secção"
-
-#: dselect/pkgtop.cc:283
-msgid "Priority"
-msgstr "Prioridade"
-
-#: dselect/pkgtop.cc:284
-msgid "Package"
-msgstr "Pacote"
-
-#: dselect/pkgtop.cc:288
-msgid "Inst.ver"
-msgstr "Vers.Inst"
-
-#: dselect/pkgtop.cc:291
-msgid "Avail.ver"
-msgstr "Ver.Dispon."
-
 #~ msgid ""
 #~ "Actions:\n"
 #~ "  access update select install config remove quit\n"