Binary files /tmp/tmpwbk1_9d_/AdR0jOMKUc/language-pack-pt-base-22.04+20220323/data/extra.tar and /tmp/tmpwbk1_9d_/zuaMTXoELN/language-pack-pt-base-22.04+20220415/data/extra.tar differ diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/aa-enabled.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/aa-enabled.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/aa-enabled.po 2022-03-27 22:26:37.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/aa-enabled.po 2022-04-15 08:38:01.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-24 00:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 03:20+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: ../aa_enabled.c:26 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/acl.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/acl.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/acl.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/acl.po 2022-04-15 08:38:00.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:06+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:54+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: libacl/acl_error.c:33 msgid "Multiple entries of same type" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/adduser.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/adduser.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/adduser.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/adduser.po 2022-04-15 08:37:52.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:23+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:10+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. everyone can issue "--help" and "--version", but only root can go on diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/alsa-utils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/alsa-utils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/alsa-utils.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/alsa-utils.po 2022-04-15 08:37:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:11+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: alsamixer/card_select.c:77 alsamixer/device_name.c:127 msgid "Sound Card" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apparmorapplet.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apparmorapplet.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apparmorapplet.po 2022-03-27 22:26:37.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apparmorapplet.po 2022-04-15 08:38:01.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:04+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:57+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apparmor-parser.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apparmor-parser.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apparmor-parser.po 2022-03-27 22:26:32.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apparmor-parser.po 2022-04-15 08:37:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:03+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:57+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../parser_include.c:113 ../parser_include.c:111 ../parser_include.c:96 msgid "Error: Out of memory.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apparmor-utils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apparmor-utils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apparmor-utils.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apparmor-utils.po 2022-04-15 08:37:53.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:04+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:57+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: po\n" #: ../aa-genprof:56 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/app-install-data.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/app-install-data.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/app-install-data.po 2022-03-27 22:26:29.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/app-install-data.po 2022-04-15 08:37:53.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:07+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:01+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apport.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apport.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apport.po 2022-03-27 22:26:36.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apport.po 2022-04-15 08:38:00.000000000 +0000 @@ -7,23 +7,257 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-11 19:23+0000\n" +"POT-Creation-Date: 2022-04-13 20:33+0000\n" "PO-Revision-Date: 2022-02-25 10:49+0000\n" "Last-Translator: Hugo Carvalho \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:52+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:45+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:139 +#: ../gtk/apport-gtk.py:146 ../debian/tmp/usr/share/apport/apport-kde.py:364 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/bin/apport-cli.py:166 ../bin/apport-cli.py:166 +#: ../kde/apport-kde.py:364 +msgid "(binary data)" +msgstr "(dados binários)" + +#: ../gtk/apport-gtk.py:161 ../debian/tmp/usr/share/apport/apport-gtk.py:161 +#, python-format +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "Lamentamos, a aplicação %s terminou inesperadamente." + +#: ../gtk/apport-gtk.py:164 ../debian/tmp/usr/share/apport/apport-gtk.py:164 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "Desculpe, %s fechou inesperadamente." + +#: ../gtk/apport-gtk.py:169 ../debian/tmp/usr/share/apport/apport-kde.py:201 +#: ../debian/tmp/usr/share/apport/apport-kde.py:239 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../kde/apport-kde.py:201 +#: ../kde/apport-kde.py:239 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "Desculpe, %s sofreu um erro interno." + +#: ../gtk/apport-gtk.py:181 ../debian/tmp/usr/share/apport/apport-kde.py:187 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:194 ../bin/apport-cli.py:194 +#: ../kde/apport-kde.py:187 +msgid "Send problem report to the developers?" +msgstr "Enviar o relatório do problema para os programadores?" + +#: ../gtk/apport-gtk.py:188 ../debian/tmp/usr/share/apport/apport-kde.py:195 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../kde/apport-kde.py:195 +msgid "Send" +msgstr "Enviar" + +#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575 +#: ../debian/tmp/usr/share/apport/apport-kde.py:293 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../kde/apport-kde.py:293 +msgid "Show Details" +msgstr "Mostrar Detalhes" + +#: ../gtk/apport-gtk.py:216 ../debian/tmp/usr/share/apport/apport-kde.py:232 +#: ../debian/tmp/usr/share/apport/apport-kde.py:245 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../kde/apport-kde.py:232 +#: ../kde/apport-kde.py:245 +msgid "Continue" +msgstr "Continuar" + +#: ../gtk/apport-gtk.py:239 ../debian/tmp/usr/share/apport/apport-gtk.py:239 +#, python-format +msgid "The application %s has stopped responding." +msgstr "A aplicação %s parou de responder." + +#: ../gtk/apport-gtk.py:243 ../debian/tmp/usr/share/apport/apport-gtk.py:243 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "O programa \"%s\" parou de responder." + +#: ../gtk/apport-gtk.py:259 ../debian/tmp/usr/share/apport/apport-kde.py:209 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../kde/apport-kde.py:209 +#, python-format +msgid "Package: %s" +msgstr "Pacote: %s" + +#: ../gtk/apport-gtk.py:265 ../debian/tmp/usr/share/apport/apport-kde.py:215 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../kde/apport-kde.py:215 +msgid "Sorry, a problem occurred while installing software." +msgstr "Desculpe, ocorreu um problema durante a instalação do software." + +#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289 +#: ../debian/tmp/usr/share/apport/apport-kde.py:221 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../kde/apport-kde.py:221 +#, python-format +msgid "The application %s has experienced an internal error." +msgstr "A aplicação %s sofreu um erro interno." + +#: ../gtk/apport-gtk.py:277 ../debian/tmp/usr/share/apport/apport-kde.py:224 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../kde/apport-kde.py:224 +#, python-format +msgid "The application %s has closed unexpectedly." +msgstr "A aplicação %s fechou inesperadamente." + +#: ../gtk/apport-gtk.py:297 ../debian/tmp/usr/share/apport/apport-kde.py:242 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../kde/apport-kde.py:242 +msgid "If you notice further problems, try restarting the computer." +msgstr "Se notar mais problemas, tente reiniciar o computador." + +#: ../gtk/apport-gtk.py:299 ../debian/tmp/usr/share/apport/apport-kde.py:246 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:246 +msgid "Ignore future problems of this type" +msgstr "Ignorar futuros problemas deste tipo" + +#: ../gtk/apport-gtk.py:579 ../debian/tmp/usr/share/apport/apport-kde.py:290 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../kde/apport-kde.py:290 +msgid "Hide Details" +msgstr "Esconder Detalhes" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:235 ../kde/apport-kde.py:235 +msgid "Leave Closed" +msgstr "Manter fechado" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:236 +#: ../debian/tmp/usr/share/apport/apport-kde.py:382 ../kde/apport-kde.py:236 +#: ../kde/apport-kde.py:382 +msgid "Relaunch" +msgstr "Reiniciar" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:316 ../kde/apport-kde.py:316 +msgid "Username:" +msgstr "Nome de utilizador:" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:317 ../kde/apport-kde.py:317 +msgid "Password:" +msgstr "Palavra-Passe:" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:407 ../kde/apport-kde.py:407 +msgid "Collecting Problem Information" +msgstr "A Recolher Informações sobre o Problema" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:408 +#: ../debian/tmp/usr/bin/apport-cli.py:254 ../bin/apport-cli.py:254 +#: ../kde/apport-kde.py:408 +msgid "Collecting problem information" +msgstr "A recolher informações sobre o problema" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:409 ../kde/apport-kde.py:409 +msgid "" +"The collected information can be sent to the developers to improve the " +"application. This might take a few minutes." +msgstr "" +"A informação recolhida pode ser enviada aos programadores para que a " +"aplicação possa ser melhorada. Isto pode demorar alguns minutos." + +#: ../debian/tmp/usr/share/apport/apport-kde.py:435 ../kde/apport-kde.py:435 +msgid "Uploading Problem Information" +msgstr "A Enviar Informações sobre o Problema" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:436 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 +#: ../debian/tmp/usr/bin/apport-cli.py:267 ../bin/apport-cli.py:267 +#: ../kde/apport-kde.py:436 +msgid "Uploading problem information" +msgstr "A enviar informações do problema" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:437 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19 +#: ../kde/apport-kde.py:437 +msgid "" +"The collected information is being sent to the bug tracking system. This " +"might take a few minutes." +msgstr "" +"A informação recolhida está a ser enviada ao sistema de rastreamento de " +"erros. Isto poderá demorar alguns minutos." + +#: ../debian/tmp/usr/share/apport/apport-kde.py:470 +#: ../debian/tmp/usr/share/apport/apport-kde.py:505 +#: ../debian/tmp/usr/share/apport/apport-kde.py:525 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 +#: ../kde/apport-kde.py:470 ../kde/apport-kde.py:505 ../kde/apport-kde.py:525 +msgid "Apport" +msgstr "Apport" + +#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "" +"O seu sistema pode ficar instável agora e poderá necessitar de ser " +"reiniciado." + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:200 +#: ../data/general-hooks/ubuntu.py:200 +msgid "" +"An Ubuntu package has a file conflict with a package that is not a genuine " +"Ubuntu package." +msgstr "" +"Um pacote Ubuntu tem um conflito de ficheiro com um pacote que não é genuíno " +"Ubuntu." + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:208 +#: ../data/general-hooks/ubuntu.py:208 +msgid "You have already encountered this package installation failure." +msgstr "Já foi encontrado o pacote de instalação negada." + +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:224 +#: ../data/general-hooks/ubuntu.py:224 +msgid "" +"Your system was initially configured with grub version 2, but you have " +"removed it from your system in favor of grub 1 without configuring it. To " +"ensure your bootloader configuration is updated whenever a new kernel is " +"available, open a terminal and run:\n" +"\n" +" sudo apt-get install grub-pc\n" +msgstr "" +"O seu sistema foi configurado inicialmente com o GRUB versão 2, mas você " +"removeu-o do sistema em favor do GRUB 1 sem o configurar. Para assegurar que " +"a configuração do bootloader é actualizada sempre que um novo kernel fica " +"disponível, abra a Consola e corra:\n" +"\n" +" sudo apt-get install grub-pc\n" + +#: ../data/apportcheckresume.py:67 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +msgid "" +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." +msgstr "" +"Isto ocorreu durante uma suspensão anterior, e não permitiu ao sistema " +"acordar corretamente." + +#: ../data/apportcheckresume.py:69 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +msgid "" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." +msgstr "" +"Isto ocorreu durante uma hibernação anterior, e não permitiu ao sistema " +"acordar corretamente." + +#: ../data/apportcheckresume.py:74 +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." +msgstr "" +"O processo foi terminado muito perto do final, e pareceu-nos que foi " +"completado normalmente." + +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:139 #: ../apport/ui.py:139 msgid "This package does not seem to be installed correctly" msgstr "Este pacote não parece estar instalado corretamente" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:144 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:144 #: ../apport/ui.py:144 #, python-format msgid "" @@ -35,7 +269,7 @@ "os índices dos pacotes disponíveis; se isso não funcionar, remova os pacotes " "de terceiros relacionados e tente novamente." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:166 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:166 #: ../apport/ui.py:166 #, python-format msgid "" @@ -49,25 +283,25 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:303 #: ../apport/ui.py:303 msgid "unknown program" msgstr "programa desconhecido" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:304 #: ../apport/ui.py:304 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "Desculpe, o programa %s fechou inesperadamente" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1471 -#: ../apport/ui.py:306 ../apport/ui.py:1471 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:306 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1472 +#: ../apport/ui.py:306 ../apport/ui.py:1472 #, python-format msgid "Problem in %s" msgstr "Problema em %s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:307 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:307 #: ../apport/ui.py:307 msgid "" "Your computer does not have enough free memory to automatically analyze the " @@ -76,85 +310,85 @@ "O seu computador não tem memória livre suficiente para analisar " "automáticamente o problema e enviar um relatório para os programadores." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:519 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:522 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:727 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1277 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1443 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1447 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:362 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:370 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:519 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:522 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:727 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1277 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1444 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1448 #: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:519 #: ../apport/ui.py:522 ../apport/ui.py:727 ../apport/ui.py:1277 -#: ../apport/ui.py:1443 ../apport/ui.py:1447 +#: ../apport/ui.py:1444 ../apport/ui.py:1448 msgid "Invalid problem report" msgstr "Relatório do problema inválido" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:363 #: ../apport/ui.py:363 msgid "You are not allowed to access this problem report." msgstr "Você não tem autorização para aceder ao relatório deste problema." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:366 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:366 #: ../apport/ui.py:366 msgid "Error" msgstr "Erro" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:367 #: ../apport/ui.py:367 msgid "There is not enough disk space available to process this report." msgstr "" "Não tem espaço livre suficiente no disco para processar este relatório." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:403 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:403 #: ../apport/ui.py:403 msgid "No PID specified" msgstr "PID não foi especificado" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:404 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:404 #: ../apport/ui.py:404 msgid "You need to specify a PID. See --help for more information." msgstr "Precisa especificar um PID. Veja --help para obter mais informação." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:411 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:500 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:411 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:500 #: ../apport/ui.py:411 ../apport/ui.py:500 msgid "Invalid PID" msgstr "PID inválido" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:412 #: ../apport/ui.py:412 msgid "The specified process ID does not exist." msgstr "O ID do processo especificado não existe." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:415 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:415 #: ../apport/ui.py:415 msgid "Not your PID" msgstr "Não é o seu PID" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:416 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:416 #: ../apport/ui.py:416 msgid "The specified process ID does not belong to you." msgstr "O ID do processo especificado não lhe pertence." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:467 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:467 #: ../apport/ui.py:467 msgid "No package specified" msgstr "Nenhum pacote especificado" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:468 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:468 #: ../apport/ui.py:468 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "" "Deve especificar um pacote ou um PID. Veja --help para mais informações." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:497 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:497 #: ../apport/ui.py:497 msgid "Permission denied" msgstr "Permissão negada" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:498 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:498 #: ../apport/ui.py:498 msgid "" "The specified process does not belong to you. Please run this program as the " @@ -163,40 +397,40 @@ "O processo especificado não lhe pertence. Por favor execute este programa " "como dono do processo ou como \"root\"." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:501 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:501 #: ../apport/ui.py:501 msgid "The specified process ID does not belong to a program." msgstr "O ID de processo especificado não pertence a um programa." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:520 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:520 #: ../apport/ui.py:520 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "O script de sintoma %s não determinou um pacote afetado." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:523 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:523 #: ../apport/ui.py:523 #, python-format msgid "Package %s does not exist" msgstr "O pacote %s não existe" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:552 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:731 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:752 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:757 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:552 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:731 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:752 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:757 #: ../apport/ui.py:552 ../apport/ui.py:731 ../apport/ui.py:752 #: ../apport/ui.py:757 msgid "Cannot create report" msgstr "Não foi possível criar relatório" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:567 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:613 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:629 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:567 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:613 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:629 #: ../apport/ui.py:567 ../apport/ui.py:613 ../apport/ui.py:629 msgid "Updating problem report" msgstr "Actualizando relatório de problemas" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:568 #: ../apport/ui.py:568 msgid "" "You are not the reporter or subscriber of this problem report, or the report " @@ -209,7 +443,7 @@ "\n" "Por favor, crie um novo relatório usando \"apport-bug\"." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:577 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:577 #: ../apport/ui.py:577 msgid "" "You are not the reporter of this problem report. It is much easier to mark a " @@ -230,29 +464,29 @@ "\n" "Deseja realmente continuar?" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:614 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:630 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:614 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:630 #: ../apport/ui.py:614 ../apport/ui.py:630 msgid "No additional information collected." msgstr "Nenhuma informação adicional colectada." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:681 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:681 #: ../apport/ui.py:681 msgid "What kind of problem do you want to report?" msgstr "Que tipo de problema quer reportar?" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:698 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:698 #: ../apport/ui.py:698 msgid "Unknown symptom" msgstr "Sintoma desconhecido" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:699 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:699 #: ../apport/ui.py:699 #, python-format msgid "The symptom \"%s\" is not known." msgstr "O sintoma \"%s\" não é conhecido" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:732 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:732 #: ../apport/ui.py:732 msgid "" "The window option cannot be used on Wayland.\n" @@ -272,7 +506,7 @@ "Sistema. No separador Processos, deslocar com o rato até encontrar a " "aplicação correcta. O ID de processo é o número listado no ID da coluna." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:743 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:743 #: ../apport/ui.py:743 msgid "" "After closing this message please click on an application window to report a " @@ -281,30 +515,30 @@ "Após fechar esta mensagem, clique por favor na janela da aplicação para " "relatar um problema sobre ela." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:758 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:753 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:758 #: ../apport/ui.py:753 ../apport/ui.py:758 msgid "xprop failed to determine process ID of the window" msgstr "xprop falhou ao determinar a ID do processo da janela" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:772 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:772 #: ../apport/ui.py:772 msgid "%prog " msgstr "%prog " -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:774 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:774 #: ../apport/ui.py:774 msgid "Specify package name." msgstr "Especifique o nome do pacote" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:776 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:828 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:776 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:828 #: ../apport/ui.py:776 ../apport/ui.py:828 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "" "Adicione uma marca extra ao relatório. Pode ser especificada várias vezes." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:807 #: ../apport/ui.py:807 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" @@ -312,7 +546,7 @@ "%prog [opções] [sintoma|pid|pacote|caminho do programa|ficheiro " ".apport/.crash]" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:810 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:810 #: ../apport/ui.py:810 msgid "" "Start in bug filing mode. Requires --package and an optional --pid, or just " @@ -323,19 +557,19 @@ "só um --pid. Se não for indicado nenhum, exibir uma lista de sintomas " "conhecidos. (Implícito se dor indicado um único argumento.)" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:812 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:812 #: ../apport/ui.py:812 msgid "Click a window as a target for filing a problem report." msgstr "" "Clique uma janela como alvo para preencher um relatório de problemas." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:814 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:814 #: ../apport/ui.py:814 msgid "Start in bug updating mode. Can take an optional --package." msgstr "" "Iniciar em modo de actualização de erros. Pode levar um --package opcional." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:816 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:816 #: ../apport/ui.py:816 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " @@ -344,7 +578,7 @@ "Submeter um relatório de bugs sobre um sintoma. (Implícito se for indicado " "um nome do sintoma como um único argumento.)" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:818 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:818 #: ../apport/ui.py:818 msgid "" "Specify package name in --file-bug mode. This is optional if a --pid is " @@ -354,7 +588,7 @@ "especificado. (Automático se um nome de pacote é fornecido como único " "argumento.)" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:820 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:820 #: ../apport/ui.py:820 msgid "" "Specify a running program in --file-bug mode. If this is specified, the bug " @@ -365,12 +599,12 @@ "especificado, o relatório de erros irá conter mais informações. (Implícito " "se pid for apenas argumento.)" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:822 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:822 #: ../apport/ui.py:822 msgid "The provided pid is a hanging application." msgstr "O pid fornecido é uma aplicação pendente." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:824 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:824 #: ../apport/ui.py:824 #, python-format msgid "" @@ -381,7 +615,7 @@ "arquivos pendentes em %s. (Automático se o arquivo é fornecido como único " "argumento)" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:826 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:826 #: ../apport/ui.py:826 msgid "" "In bug filing mode, save the collected information into a file instead of " @@ -392,40 +626,40 @@ "vez de a relatar. Este ficheiro pode ser relatado mais tarde a partir de uma " "máquina diferente." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:830 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:830 #: ../apport/ui.py:830 msgid "Print the Apport version number." msgstr "Imprime o número da versão do Apport" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:981 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:981 #: ../apport/ui.py:981 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "Vai ser lançado apport-retrace no terminal para examinar o erro." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:982 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:982 #: ../apport/ui.py:982 msgid "Run gdb session" msgstr "Executar sessão gdb" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:983 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:983 #: ../apport/ui.py:983 msgid "Run gdb session without downloading debug symbols" msgstr "Executar sessão gdb sem transferir símbolos de depuração" #. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:985 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:985 #: ../apport/ui.py:985 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "Atualização %s com o conjunto simbolico do stack trace." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1021 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1021 #: ../apport/ui.py:1021 msgid "Can't remember send report status settings" msgstr "Não me lembro de enviar o relatório estado de configurações" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1022 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1022 #: ../apport/ui.py:1022 msgid "" "Saving crash reporting state failed. Can't set auto or never reporting mode." @@ -433,8 +667,8 @@ "Falha ao guardar o relatório de estado de falhas. Impossível definir como " "automático ou no modo nunca relatar." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1081 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1091 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1081 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1091 #: ../apport/ui.py:1081 ../apport/ui.py:1091 msgid "" "This problem report applies to a program which is not installed any more." @@ -442,7 +676,7 @@ "Este relatório de problema aplica-se a um programa que já não se encontra " "instalado." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1106 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1106 #: ../apport/ui.py:1106 #, python-format msgid "" @@ -452,27 +686,27 @@ "O problema aconteceu com o programa %s que alterou desde que o crash " "ocorreu." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1153 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1449 -#: ../apport/ui.py:1153 ../apport/ui.py:1234 ../apport/ui.py:1449 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1153 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1234 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1450 +#: ../apport/ui.py:1153 ../apport/ui.py:1234 ../apport/ui.py:1450 msgid "This problem report is damaged and cannot be processed." msgstr "" "Este relatório de problema está danificado e não pode ser processado." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1158 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1158 #: ../apport/ui.py:1158 msgid "This report is about a package that is not installed." msgstr "Este relatório é sobre o pacote que não foi instalado." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1162 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1162 #: ../apport/ui.py:1162 msgid "An error occurred while attempting to process this problem report:" msgstr "" "Ocorreu um erro durante a tentativa de processamento deste relatório de " "problema:" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1172 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1172 #: ../apport/ui.py:1172 msgid "" "You have two versions of this application installed, which one do you want " @@ -480,19 +714,19 @@ msgstr "" "Tem duas versões instaladas deste programa, de qual quer reportar um erro?" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1173 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1173 #: ../apport/ui.py:1173 #, python-format msgid "%s snap" msgstr "snap %s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1174 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1174 #: ../apport/ui.py:1174 #, python-format msgid "%s deb package" msgstr "pacote deb %s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1207 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1207 #: ../apport/ui.py:1207 #, python-format msgid "" @@ -501,7 +735,7 @@ "%s é fornecido por um snap publicado por %s. Contacte-os através de %s para " "obter ajuda." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1209 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1209 #: ../apport/ui.py:1209 #, python-format msgid "" @@ -512,57 +746,57 @@ "endereço de contacto; visite o fórum em https://forum.snapcraft.io/ para " "obter ajuda." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1278 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1278 #: ../apport/ui.py:1278 msgid "Could not determine the package or source package name." msgstr "Não foi possível determinar o nome do pacote ou pacote fonte." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1296 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1296 #: ../apport/ui.py:1296 msgid "Unable to start web browser" msgstr "Não é possível iniciar o navegador web" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1297 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1297 #: ../apport/ui.py:1297 #, python-format msgid "Unable to start web browser to open %s." msgstr "Não é possível iniciar o navegador web para abrir %s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1397 -#: ../apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1398 +#: ../apport/ui.py:1398 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "" "Por favor, insira a informação da sua conta para o sistema de gestão de bugs " "%s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1409 -#: ../apport/ui.py:1409 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1410 +#: ../apport/ui.py:1410 msgid "Network problem" msgstr "Problema na rede" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1411 -#: ../apport/ui.py:1411 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1412 +#: ../apport/ui.py:1412 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "" "Não é possível estabelecer a ligação à base de dados de falhas, por favor " "verifique a sua ligação à Internet." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1438 -#: ../apport/ui.py:1438 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1439 +#: ../apport/ui.py:1439 msgid "Memory exhaustion" msgstr "Exaustão da memória" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1439 -#: ../apport/ui.py:1439 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1440 +#: ../apport/ui.py:1440 msgid "Your system does not have enough memory to process this crash report." msgstr "" "O seu sistema não tem memória suficiente para processar o relatório desta " "paragem." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1474 -#: ../apport/ui.py:1474 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1475 +#: ../apport/ui.py:1475 #, python-format msgid "" "The problem cannot be reported:\n" @@ -573,14 +807,14 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1530 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1537 -#: ../apport/ui.py:1530 ../apport/ui.py:1537 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1531 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1538 +#: ../apport/ui.py:1531 ../apport/ui.py:1538 msgid "Problem already known" msgstr "Problema já conhecido" -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1531 -#: ../apport/ui.py:1531 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1532 +#: ../apport/ui.py:1532 msgid "" "This problem was already reported in the bug report displayed in the web " "browser. Please check if you can add any further information that might be " @@ -590,333 +824,215 @@ "web. Por favor, verifique se poderá adicionar mais alguma informação que " "possa ser útil aos programadores." -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1538 -#: ../apport/ui.py:1538 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1539 +#: ../apport/ui.py:1539 msgid "This problem was already reported to developers. Thank you!" msgstr "Este problema já foi relatados aos programadores. Obrigado!" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../kde/apport-kde.py:469 -#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 ../gtk/apport-gtk.ui.h:1 -#: ../debian/tmp/usr/share/apport/apport-kde.py:469 -#: ../debian/tmp/usr/share/apport/apport-kde.py:504 -#: ../debian/tmp/usr/share/apport/apport-kde.py:524 -msgid "Apport" -msgstr "Apport" +#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34 +msgid "Do not put the new traces into the report, but write them to stdout." +msgstr "" +"Não colocar as novas análises no relatório, mas mostrá-las na saída padrão." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 -msgid "Cancel" -msgstr "Cancelar" +#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 +msgid "" +"Start an interactive gdb session with the report's core dump (-o ignored; " +"does not rewrite report)" +msgstr "" +"Iniciar uma sessão interativa do gdb com o core dump do relatório (-o " +"ignorado; não reescreve o relatório)" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 -msgid "OK" -msgstr "Ok" +#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 +msgid "" +"Write modified report to given file instead of changing the original report" +msgstr "" +"Escreve o relatório modificado para um determinado ficheiro ao invés de " +"alterar o relatório original" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 -msgid "Crash report" -msgstr "Relatório de crash" +#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 +msgid "Remove the core dump from the report after stack trace regeneration" +msgstr "" +"Remove o core dump do relatório após a regeneração da análise da pilha" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 -msgid "Sorry, an internal error happened." -msgstr "Desculpe,aconteceu um erro interno." +#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 +msgid "Override report's CoreFile" +msgstr "Substituir relatório CoreFile" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../bin/apport-cli.py:194 -#: ../kde/apport-kde.py:186 ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 ../gtk/apport-gtk.py:181 -#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-kde.py:186 -msgid "Send problem report to the developers?" -msgstr "Enviar o relatório do problema para os programadores?" +#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 +msgid "Override report's ExecutablePath" +msgstr "Substituir relatório ExecutablePath" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../kde/apport-kde.py:241 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 -#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-kde.py:241 -msgid "If you notice further problems, try restarting the computer." -msgstr "Se notar mais problemas, tente reiniciar o computador." +#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 +msgid "Override report's ProcMaps" +msgstr "Substituir relatório ProcMaps" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 -msgid "Remember this in future" -msgstr "Lembrar isto no futuro" +#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 +msgid "Rebuild report's Package information" +msgstr "Reconstruir o relatório de informação do pacote" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 ../gtk/apport-gtk.ui.h:9 -msgid "Ignore future problems of this program version" -msgstr "Ignorar problemas futuros desta versão do programa" +#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 +msgid "" +"Build a temporary sandbox and download/install the necessary packages and " +"debug symbols in there; without this option it assumes that the necessary " +"packages and debug symbols are already installed in the system. The argument " +"points to the packaging system configuration base directory; if you specify " +"\"system\", it will use the system configuration files, but will then only " +"be able to retrace crashes that happened on the currently running release." +msgstr "" +"Constrói uma sandbox temporária e download/instalar os pacotes e símbolos " +"depurados necessários; sem esta opção ele assume que os pacotes e símbolos " +"depurados necessários já se encontram instalados no sistema.Os pontos de " +"argumento para o directório base de configuração do sistema de " +"armazenamento;Se for especificado \"system\" ,ele irá usar o sistema de " +"configuração de ficheiros,mas só assim poderás refazer os crashes na " +"execução que vai decorrendo." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../gtk/apport-gtk.ui.h:10 -msgid "Relaunch this application" -msgstr "Reinicie esta aplicação" +#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 +msgid "" +"Build another temporary sandbox for installing gdb and its dependencies " +"using the same release as the report rather than whatever version of gdb you " +"have installed." +msgstr "" +"Criar outra \"sandbox\" temporária para a instalação de gdb e suas " +"dependências utilizando a mesma versão que o relatório em vez de qualquer " +"outra versão do gdb que instalou." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../kde/apport-kde.py:292 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:575 ../gtk/apport-gtk.ui.h:11 -#: ../debian/tmp/usr/share/apport/apport-kde.py:292 -msgid "Show Details" -msgstr "Mostrar Detalhes" +#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 +msgid "" +"Report download/install progress when installing packages into sandbox" +msgstr "" +"Apresentar o progresso download/instalar quando ao instalar os pacotes no " +"sandbox." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 -msgid "_Examine locally" -msgstr "_Examinar localmente" +#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 +msgid "Prepend timestamps to log messages, for batch operation" +msgstr "" +"Preceder timestamps para registar mensagens , para operação em lotes." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../gtk/apport-gtk.ui.h:13 -msgid "Don't send" -msgstr "Não enviar" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../kde/apport-kde.py:194 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 -#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-kde.py:194 -msgid "Send" -msgstr "Enviar" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 -msgid "Collecting problem information" -msgstr "A recolher informações sobre o problema" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16 +#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 msgid "" -"Information is being collected that may help the developers fix the problem " -"you report." +"Create and use third-party repositories from origins specified in reports" msgstr "" -"A informação está a ser recolhida para tentar ajudar os programadores a " -"corrigir o problema relatado." - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../bin/apport-cli.py:267 -#: ../kde/apport-kde.py:435 ../debian/tmp/usr/bin/apport-cli.py:267 -#: ../gtk/apport-gtk.ui.h:17 ../debian/tmp/usr/share/apport/apport-kde.py:435 -msgid "Uploading problem information" -msgstr "A enviar informações do problema" +"Cria e usa repositórios de terceiros de origens especificadas nos relatórios." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 -msgid "Uploading problem information" -msgstr "A enviar informação sobre o problema" +#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 +msgid "Cache directory for packages downloaded in the sandbox" +msgstr "Directoria temporária para pacotes transferidos no sandbox" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../kde/apport-kde.py:436 -#: ../gtk/apport-gtk.ui.h:19 ../debian/tmp/usr/share/apport/apport-kde.py:436 +#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 msgid "" -"The collected information is being sent to the bug tracking system. This " -"might take a few minutes." +"Directory for unpacked packages. Future runs will assume that any already " +"downloaded package is also extracted to this sandbox." msgstr "" -"A informação recolhida está a ser enviada ao sistema de rastreamento de " -"erros. Isto poderá demorar alguns minutos." - -#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 -msgid "Press any key to continue..." -msgstr "Prima qualquer tecla para continuar..." - -#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87 -msgid "What would you like to do? Your options are:" -msgstr "O que gostaria de fazer? As suas opções são:" - -#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100 -#, python-format -msgid "Please choose (%s):" -msgstr "Por favor escolha (%s):" - -#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164 -#, python-format -msgid "(%i bytes)" -msgstr "(%i bytes)" - -#: ../bin/apport-cli.py:166 ../kde/apport-kde.py:363 -#: ../debian/tmp/usr/bin/apport-cli.py:166 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 ../gtk/apport-gtk.py:146 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -msgid "(binary data)" -msgstr "(dados binários)" +"Diretório para os pacotes descompactados.Futuramente irá assumir que o " +"download dos pacotes é também extraído para este sandbox." -#: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195 +#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:65 msgid "" -"After the problem report has been sent, please fill out the form in the\n" -"automatically opened web browser." +"Install an extra package into the sandbox (can be specified multiple times)" msgstr "" -"Depois do relatório do problema ter sido enviado, por favor preencha o " -"formulário na\n" -"janela do navegador web que é aberta automaticamente." - -#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198 -#, python-format -msgid "&Send report (%s)" -msgstr "&Enviar relatório (%s)" - -#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202 -msgid "&Examine locally" -msgstr "&Examine localmente" - -#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206 -msgid "&View report" -msgstr "&Ver relatório" +"Instalar um pacote extra no sandbox (pode ser especificado várias vezes)" -#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207 -msgid "&Keep report file for sending later or copying to somewhere else" +#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 +msgid "" +"Path to a file with the crash database authentication information. This is " +"used when specifying a crash ID to upload the retraced stack traces (only if " +"neither -g, -o, nor -s are specified)" msgstr "" -"&Manter o ficheiro do relatório para enviar depois ou copiar para outro local" - -#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "Cancelar e &ignorar futuros erros desta versão da aplicação" - -#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 -#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210 -#: ../debian/tmp/usr/bin/apport-cli.py:287 -#: ../debian/tmp/usr/bin/apport-cli.py:319 -#: ../debian/tmp/usr/bin/apport-cli.py:340 -msgid "&Cancel" -msgstr "&Cancelar" - -#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 -msgid "Problem report file:" -msgstr "Ficheiro com o relatório do problema:" - -#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249 -#: ../debian/tmp/usr/bin/apport-cli.py:244 -#: ../debian/tmp/usr/bin/apport-cli.py:249 -msgid "&Confirm" -msgstr "&Confirmar" - -#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248 -#, python-format -msgid "Error: %s" -msgstr "Erro: %s" - -#: ../bin/apport-cli.py:254 ../kde/apport-kde.py:407 -#: ../debian/tmp/usr/bin/apport-cli.py:254 -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 -msgid "Collecting problem information" -msgstr "A recolher informações sobre o problema" +"Caminho para uma ficheiro com informação de autenticação da base de dados de " +"erros. Isto é usado ao especificar a ID de erros para enviar os rastreios de " +"erros rastreados (apenas se nem -g, -o, ou -s estarem especificados)" -#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255 +#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." +"Display retraced stack traces and ask for confirmation before sending them " +"to the crash database." msgstr "" -"A informação recolhida pode ser enviada aos programadores de modo a " -"melhorar\n" -"a aplicação. Isto pode demorar alguns minutos." +"Mostrar rastreios de erros rastreados e perguntar por confirmação antes de " +"os enviar para a base de dados de erros." -#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268 +#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." +"Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "" -"A informação recolhida está a ser enviada ao sistema de rastreio de erros.\n" -"Isto pode demorar alguns minutos." - -#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318 -msgid "&Done" -msgstr "&Concluído" - -#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324 -msgid "none" -msgstr "nenhum" - -#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 -#, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "Seleccionado: %s. Opções:" - -#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341 -msgid "Choices:" -msgstr "Escolhas:" - -#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 -msgid "Path to file (Enter to cancel):" -msgstr "Caminho para o ficheiro (Enter para cancelar):" - -#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 -msgid "File does not exist." -msgstr "O ficheiro não existe." +"Caminho para a base de dados de duplicados sqlite (por omissão: sem " +"verificação de duplicação)" -#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 -msgid "This is a directory." -msgstr "Isto é um directório." +#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 +msgid "Do not add StacktraceSource to the report." +msgstr "Não acrescente StacktraceSource ao relatório." -#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 -msgid "To continue, you must visit the following URL:" -msgstr "Para continuar, tem que visitar o seguinte URL:" +#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 +msgid "You cannot use -C without -S. Stopping." +msgstr "Não pode usar -C sem -S. A parar.." -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 -msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "" -"Pode iniciar um navegador agora, ou copiar este URL para um navegador noutro " -"computador." +#. translators: don't translate y/n, apport currently only checks for "y" +#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115 +msgid "OK to send these as attachments? [y/n]" +msgstr "OK para enviar estes como anexos? [y/n]" -#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "Iniciar um navegador agora" +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde-mime.desktop.in.h:1 +#: ../kde/apport-kde.desktop.in.h:1 +msgid "Report a problem..." +msgstr "Comunicar um problema..." -#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 -msgid "No pending crash reports. Try --help for more information." -msgstr "" -"Nenhum relatório de erro pendente. Tente --help para mais informações." +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde-mime.desktop.in.h:2 +#: ../kde/apport-kde.desktop.in.h:2 +msgid "Report a malfunction to the developers" +msgstr "Comunique um mau funcionamento aos programadores" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 -#, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "Lamentamos, a aplicação %s terminou inesperadamente." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 +msgid "Cancel" +msgstr "Cancelar" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "Desculpe, %s fechou inesperadamente." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 +msgid "OK" +msgstr "Ok" -#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169 -#: ../debian/tmp/usr/share/apport/apport-kde.py:200 -#: ../debian/tmp/usr/share/apport/apport-kde.py:238 -#, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "Desculpe, %s sofreu um erro interno." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 +msgid "Crash report" +msgstr "Relatório de crash" -#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216 -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-kde.py:244 -msgid "Continue" -msgstr "Continuar" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 +msgid "Sorry, an internal error happened." +msgstr "Desculpe,aconteceu um erro interno." -#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 -#, python-format -msgid "The application %s has stopped responding." -msgstr "A aplicação %s parou de responder." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 +msgid "Remember this in future" +msgstr "Lembrar isto no futuro" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "O programa \"%s\" parou de responder." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 ../gtk/apport-gtk.ui.h:9 +msgid "Ignore future problems of this program version" +msgstr "Ignorar problemas futuros desta versão do programa" -#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-gtk.py:259 -#: ../gtk/apport-gtk.py:259 ../debian/tmp/usr/share/apport/apport-kde.py:208 -#, python-format -msgid "Package: %s" -msgstr "Pacote: %s" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../gtk/apport-gtk.ui.h:10 +msgid "Relaunch this application" +msgstr "Reinicie esta aplicação" -#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-gtk.py:265 -#: ../gtk/apport-gtk.py:265 ../debian/tmp/usr/share/apport/apport-kde.py:214 -msgid "Sorry, a problem occurred while installing software." -msgstr "Desculpe, ocorreu um problema durante a instalação do software." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 +msgid "_Examine locally" +msgstr "_Examinar localmente" -#: ../kde/apport-kde.py:220 ../debian/tmp/usr/share/apport/apport-gtk.py:274 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 -#: ../gtk/apport-gtk.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:220 -#, python-format -msgid "The application %s has experienced an internal error." -msgstr "A aplicação %s sofreu um erro interno." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../gtk/apport-gtk.ui.h:13 +msgid "Don't send" +msgstr "Não enviar" -#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-gtk.py:277 -#: ../gtk/apport-gtk.py:277 ../debian/tmp/usr/share/apport/apport-kde.py:223 -#, python-format -msgid "The application %s has closed unexpectedly." -msgstr "A aplicação %s fechou inesperadamente." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 +msgid "Collecting problem information" +msgstr "A recolher informações sobre o problema" -#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-gtk.py:299 -#: ../gtk/apport-gtk.py:299 ../debian/tmp/usr/share/apport/apport-kde.py:245 -msgid "Ignore future problems of this type" -msgstr "Ignorar futuros problemas deste tipo" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16 +msgid "" +"Information is being collected that may help the developers fix the problem " +"you report." +msgstr "" +"A informação está a ser recolhida para tentar ajudar os programadores a " +"corrigir o problema relatado." -#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-gtk.py:579 -#: ../gtk/apport-gtk.py:579 ../debian/tmp/usr/share/apport/apport-kde.py:289 -msgid "Hide Details" -msgstr "Esconder Detalhes" +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 +msgid "Uploading problem information" +msgstr "A enviar informação sobre o problema" #: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 #, python-format @@ -927,16 +1043,6 @@ msgid "Destination directory exists and is not empty." msgstr "Directório de destino existe mas não está vazio" -#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 -msgid "Report a problem..." -msgstr "Comunicar um problema..." - -#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 -msgid "Report a malfunction to the developers" -msgstr "Comunique um mau funcionamento aos programadores" - #: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37 msgid "See man page for details." msgstr "Veja a página do man para detalhes" @@ -984,251 +1090,153 @@ "o executável que está a correr sob a ferramenta de verificação de memória " "valgrind para detecção de vazamento de memória" -#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-valgrind.py:66 -msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" -msgstr "" -"Instalar um pacote extra no sandbox (pode ser especificado várias vezes)" - #: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97 #, python-format msgid "Error: %s is not an executable. Stopping." msgstr "Erro: %s não é um executável. A parar." -#: ../data/general-hooks/ubuntu.py:200 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:200 -msgid "" -"An Ubuntu package has a file conflict with a package that is not a genuine " -"Ubuntu package." -msgstr "" -"Um pacote Ubuntu tem um conflito de ficheiro com um pacote que não é genuíno " -"Ubuntu." - -#: ../data/general-hooks/ubuntu.py:208 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:208 -msgid "You have already encountered this package installation failure." -msgstr "Já foi encontrado o pacote de instalação negada." - -#: ../data/general-hooks/ubuntu.py:224 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:224 -msgid "" -"Your system was initially configured with grub version 2, but you have " -"removed it from your system in favor of grub 1 without configuring it. To " -"ensure your bootloader configuration is updated whenever a new kernel is " -"available, open a terminal and run:\n" -"\n" -" sudo apt-get install grub-pc\n" -msgstr "" -"O seu sistema foi configurado inicialmente com o GRUB versão 2, mas você " -"removeu-o do sistema em favor do GRUB 1 sem o configurar. Para assegurar que " -"a configuração do bootloader é actualizada sempre que um novo kernel fica " -"disponível, abra a Consola e corra:\n" -"\n" -" sudo apt-get install grub-pc\n" - -#: ../data/apportcheckresume.py:67 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 -msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." -msgstr "" -"Isto ocorreu durante uma suspensão anterior, e não permitiu ao sistema " -"acordar corretamente." - -#: ../data/apportcheckresume.py:69 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 -msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." -msgstr "" -"Isto ocorreu durante uma hibernação anterior, e não permitiu ao sistema " -"acordar corretamente." +#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80 +msgid "Press any key to continue..." +msgstr "Prima qualquer tecla para continuar..." -#: ../data/apportcheckresume.py:74 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 -msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "" -"O processo foi terminado muito perto do final, e pareceu-nos que foi " -"completado normalmente." +#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87 +msgid "What would you like to do? Your options are:" +msgstr "O que gostaria de fazer? As suas opções são:" -#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 -msgid "Do not put the new traces into the report, but write them to stdout." -msgstr "" -"Não colocar as novas análises no relatório, mas mostrá-las na saída padrão." +#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100 +#, python-format +msgid "Please choose (%s):" +msgstr "Por favor escolha (%s):" -#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 -msgid "" -"Start an interactive gdb session with the report's core dump (-o ignored; " -"does not rewrite report)" -msgstr "" -"Iniciar uma sessão interativa do gdb com o core dump do relatório (-o " -"ignorado; não reescreve o relatório)" +#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164 +#, python-format +msgid "(%i bytes)" +msgstr "(%i bytes)" -#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 +#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195 msgid "" -"Write modified report to given file instead of changing the original report" -msgstr "" -"Escreve o relatório modificado para um determinado ficheiro ao invés de " -"alterar o relatório original" - -#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 -msgid "Remove the core dump from the report after stack trace regeneration" +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." msgstr "" -"Remove o core dump do relatório após a regeneração da análise da pilha" - -#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 -msgid "Override report's CoreFile" -msgstr "Substituir relatório CoreFile" - -#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 -msgid "Override report's ExecutablePath" -msgstr "Substituir relatório ExecutablePath" - -#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 -msgid "Override report's ProcMaps" -msgstr "Substituir relatório ProcMaps" +"Depois do relatório do problema ter sido enviado, por favor preencha o " +"formulário na\n" +"janela do navegador web que é aberta automaticamente." -#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 -msgid "Rebuild report's Package information" -msgstr "Reconstruir o relatório de informação do pacote" +#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198 +#, python-format +msgid "&Send report (%s)" +msgstr "&Enviar relatório (%s)" -#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 -msgid "" -"Build a temporary sandbox and download/install the necessary packages and " -"debug symbols in there; without this option it assumes that the necessary " -"packages and debug symbols are already installed in the system. The argument " -"points to the packaging system configuration base directory; if you specify " -"\"system\", it will use the system configuration files, but will then only " -"be able to retrace crashes that happened on the currently running release." -msgstr "" -"Constrói uma sandbox temporária e download/instalar os pacotes e símbolos " -"depurados necessários; sem esta opção ele assume que os pacotes e símbolos " -"depurados necessários já se encontram instalados no sistema.Os pontos de " -"argumento para o directório base de configuração do sistema de " -"armazenamento;Se for especificado \"system\" ,ele irá usar o sistema de " -"configuração de ficheiros,mas só assim poderás refazer os crashes na " -"execução que vai decorrendo." +#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202 +msgid "&Examine locally" +msgstr "&Examine localmente" -#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 -msgid "" -"Build another temporary sandbox for installing gdb and its dependencies " -"using the same release as the report rather than whatever version of gdb you " -"have installed." -msgstr "" -"Criar outra \"sandbox\" temporária para a instalação de gdb e suas " -"dependências utilizando a mesma versão que o relatório em vez de qualquer " -"outra versão do gdb que instalou." +#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206 +msgid "&View report" +msgstr "&Ver relatório" -#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 -msgid "" -"Report download/install progress when installing packages into sandbox" +#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207 +msgid "&Keep report file for sending later or copying to somewhere else" msgstr "" -"Apresentar o progresso download/instalar quando ao instalar os pacotes no " -"sandbox." +"&Manter o ficheiro do relatório para enviar depois ou copiar para outro local" -#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 -msgid "Prepend timestamps to log messages, for batch operation" -msgstr "" -"Preceder timestamps para registar mensagens , para operação em lotes." +#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "Cancelar e &ignorar futuros erros desta versão da aplicação" -#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 -msgid "" -"Create and use third-party repositories from origins specified in reports" -msgstr "" -"Cria e usa repositórios de terceiros de origens especificadas nos relatórios." +#: ../debian/tmp/usr/bin/apport-cli.py:210 +#: ../debian/tmp/usr/bin/apport-cli.py:287 +#: ../debian/tmp/usr/bin/apport-cli.py:319 +#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210 +#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340 +msgid "&Cancel" +msgstr "&Cancelar" -#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 -msgid "Cache directory for packages downloaded in the sandbox" -msgstr "Directoria temporária para pacotes transferidos no sandbox" +#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 +msgid "Problem report file:" +msgstr "Ficheiro com o relatório do problema:" -#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 -msgid "" -"Directory for unpacked packages. Future runs will assume that any already " -"downloaded package is also extracted to this sandbox." -msgstr "" -"Diretório para os pacotes descompactados.Futuramente irá assumir que o " -"download dos pacotes é também extraído para este sandbox." +#: ../debian/tmp/usr/bin/apport-cli.py:244 +#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244 +#: ../bin/apport-cli.py:249 +msgid "&Confirm" +msgstr "&Confirmar" -#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 -msgid "" -"Path to a file with the crash database authentication information. This is " -"used when specifying a crash ID to upload the retraced stack traces (only if " -"neither -g, -o, nor -s are specified)" -msgstr "" -"Caminho para uma ficheiro com informação de autenticação da base de dados de " -"erros. Isto é usado ao especificar a ID de erros para enviar os rastreios de " -"erros rastreados (apenas se nem -g, -o, ou -s estarem especificados)" +#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248 +#, python-format +msgid "Error: %s" +msgstr "Erro: %s" -#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255 msgid "" -"Display retraced stack traces and ask for confirmation before sending them " -"to the crash database." +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." msgstr "" -"Mostrar rastreios de erros rastreados e perguntar por confirmação antes de " -"os enviar para a base de dados de erros." +"A informação recolhida pode ser enviada aos programadores de modo a " +"melhorar\n" +"a aplicação. Isto pode demorar alguns minutos." -#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 +#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268 msgid "" -"Path to the duplicate sqlite database (default: no duplicate checking)" +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." msgstr "" -"Caminho para a base de dados de duplicados sqlite (por omissão: sem " -"verificação de duplicação)" +"A informação recolhida está a ser enviada ao sistema de rastreio de erros.\n" +"Isto pode demorar alguns minutos." -#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 -msgid "Do not add StacktraceSource to the report." -msgstr "Não acrescente StacktraceSource ao relatório." +#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318 +msgid "&Done" +msgstr "&Concluído" -#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 -msgid "You cannot use -C without -S. Stopping." -msgstr "Não pode usar -C sem -S. A parar.." +#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324 +msgid "none" +msgstr "nenhum" -#. translators: don't translate y/n, apport currently only checks for "y" -#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115 -msgid "OK to send these as attachments? [y/n]" -msgstr "OK para enviar estes como anexos? [y/n]" +#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 +#, python-format +msgid "Selected: %s. Multiple choices:" +msgstr "Seleccionado: %s. Opções:" -#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 -msgid "Leave Closed" -msgstr "Manter fechado" +#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341 +msgid "Choices:" +msgstr "Escolhas:" -#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381 -#: ../debian/tmp/usr/share/apport/apport-kde.py:235 -#: ../debian/tmp/usr/share/apport/apport-kde.py:381 -msgid "Relaunch" -msgstr "Reiniciar" +#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 +msgid "Path to file (Enter to cancel):" +msgstr "Caminho para o ficheiro (Enter para cancelar):" -#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 -msgid "Username:" -msgstr "Nome de utilizador:" +#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361 +msgid "File does not exist." +msgstr "O ficheiro não existe." -#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 -msgid "Password:" -msgstr "Palavra-Passe:" +#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363 +msgid "This is a directory." +msgstr "Isto é um directório." -#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 -msgid "Collecting Problem Information" -msgstr "A Recolher Informações sobre o Problema" +#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369 +msgid "To continue, you must visit the following URL:" +msgstr "Para continuar, tem que visitar o seguinte URL:" -#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 +#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 msgid "" -"The collected information can be sent to the developers to improve the " -"application. This might take a few minutes." +"You can launch a browser now, or copy this URL into a browser on another " +"computer." msgstr "" -"A informação recolhida pode ser enviada aos programadores para que a " -"aplicação possa ser melhorada. Isto pode demorar alguns minutos." +"Pode iniciar um navegador agora, ou copiar este URL para um navegador noutro " +"computador." -#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 -msgid "Uploading Problem Information" -msgstr "A Enviar Informações sobre o Problema" +#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "Iniciar um navegador agora" -#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." +#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." msgstr "" -"O seu sistema pode ficar instável agora e poderá necessitar de ser " -"reiniciado." +"Nenhum relatório de erro pendente. Tente --help para mais informações." + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "Ficheiro de crash do Apport" #: ../apport/com.ubuntu.apport.policy.in.h:1 msgid "Collect system information" @@ -1252,7 +1260,3 @@ msgstr "" "Por favor introduza a sua password para aceder a relatórios de problemas " "relativos a programas de sistema" - -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "Ficheiro de crash do Apport" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/appstream-glib.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/appstream-glib.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/appstream-glib.po 2022-03-27 22:26:37.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/appstream-glib.po 2022-04-15 08:38:02.000000000 +0000 @@ -17,8 +17,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:59+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:56+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. TRANSLATORS: command line option diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/appstream.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/appstream.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/appstream.po 2022-03-27 22:26:29.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/appstream.po 2022-04-15 08:37:53.000000000 +0000 @@ -37,8 +37,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:50+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:47+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: data/org.freedesktop.appstream.cli.metainfo.xml:8 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt.c.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt.c.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt.c.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt.c.po 2022-04-15 08:37:52.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2022-03-22 17:01+0000\n" +"POT-Creation-Date: 2022-04-11 09:49+0000\n" "PO-Revision-Date: 2021-09-07 15:43+0000\n" "Last-Translator: Ivo Xavier \n" "Language-Team: Portuguese \n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:11+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: cmdline/apt.cc:46 msgid "" @@ -674,7 +674,7 @@ msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: apt-private/private-cacheset.cc:487 +#: apt-private/private-cacheset.cc:488 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/aptitude.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/aptitude.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/aptitude.po 2022-03-27 22:26:41.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/aptitude.po 2022-04-15 08:38:05.000000000 +0000 @@ -14,8 +14,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:25+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:12+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. TRANSLATORS: These strings describing config items diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt-listchanges.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt-listchanges.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt-listchanges.po 2022-03-27 22:26:29.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt-listchanges.po 2022-04-15 08:37:54.000000000 +0000 @@ -13,10 +13,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:25+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 00:12+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Generated-By: pygettext.py 1.5\n" +"Language: pt\n" #: ../apt-listchanges.py:70 #, python-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt.po 2022-04-15 08:37:59.000000000 +0000 @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2022-03-22 16:58+0000\n" -"PO-Revision-Date: 2022-03-22 19:32+0000\n" +"POT-Creation-Date: 2022-04-11 09:42+0000\n" +"PO-Revision-Date: 2022-04-11 11:19+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:11+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' @@ -178,7 +178,7 @@ msgid "Package '%s' is not installed, so not removed\n" msgstr "O pacote '%s' não está instalado, por isso não será removido\n" -#: apt-private/private-cacheset.cc:487 +#: apt-private/private-cacheset.cc:488 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Note, a selecionar '%s' em vez de '%s'\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt.sh.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt.sh.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt.sh.po 2022-03-27 22:26:31.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt.sh.po 2022-04-15 08:37:56.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2022-03-22 16:58+0000\n" +"POT-Creation-Date: 2022-04-11 09:42+0000\n" "PO-Revision-Date: 2019-01-31 01:50+0000\n" "Last-Translator: Alexandre Fidalgo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:11+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: dselect/install:33 msgid "Bad default setting!" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apturl.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apturl.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apturl.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apturl.po 2022-04-15 08:37:59.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apturl\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2021-07-12 14:14+0000\n" +"POT-Creation-Date: 2022-03-23 11:34+0000\n" "PO-Revision-Date: 2022-02-08 10:41+0000\n" "Last-Translator: Ivo Xavier \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:13+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:07+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt-utils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt-utils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/apt-utils.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/apt-utils.po 2022-04-15 08:37:59.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2022-03-22 16:58+0000\n" -"PO-Revision-Date: 2022-03-22 19:32+0000\n" +"POT-Creation-Date: 2022-04-11 09:42+0000\n" +"PO-Revision-Date: 2022-04-11 11:18+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:11+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: cmdline/apt-dump-solver.cc:37 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/aspell.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/aspell.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/aspell.po 2022-03-27 22:26:32.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/aspell.po 2022-04-15 08:37:56.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:26+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 00:13+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: pt\n" #: common/info.cpp:232 msgid "a number between 0 and 1" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/at-spi2-core.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/at-spi2-core.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/at-spi2-core.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/at-spi2-core.po 2022-04-15 08:37:52.000000000 +0000 @@ -9,14 +9,14 @@ "Project-Id-Version: 3.12\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/at-spi2-core/issues\n" "POT-Creation-Date: 2017-06-20 12:27-0500\n" -"PO-Revision-Date: 2022-03-22 15:36+0000\n" +"PO-Revision-Date: 2022-04-01 03:22+0000\n" "Last-Translator: Manuela Silva \n" "Language-Team: Português \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:29+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:26+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: atspi/atspi-component.c:326 atspi/atspi-misc.c:1073 atspi/atspi-value.c:111 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/attr.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/attr.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/attr.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/attr.po 2022-04-15 08:38:02.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:26+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:13+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 #: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bash.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bash.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bash.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bash.po 2022-04-15 08:37:57.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:26+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:13+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bfd.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bfd.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bfd.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bfd.po 2022-04-15 08:37:59.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:49+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:37+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/binutils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/binutils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/binutils.po 2022-03-27 22:26:27.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/binutils.po 2022-04-15 08:37:52.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:28+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:14+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bison-gnulib.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bison-gnulib.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bison-gnulib.po 2022-03-27 22:26:32.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bison-gnulib.po 2022-04-15 08:37:56.000000000 +0000 @@ -9,16 +9,16 @@ "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" "POT-Creation-Date: 2021-09-25 07:43+0200\n" -"PO-Revision-Date: 2021-11-07 04:25+0000\n" +"PO-Revision-Date: 2022-03-28 16:45+0000\n" "Last-Translator: Luís Oliveira \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-24 00:24+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 03:20+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: pt\n" #: lib/argmatch.c:132 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bison.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bison.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bison.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bison.po 2022-04-15 08:38:02.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: bison-3.7.90\n" "Report-Msgid-Bugs-To: bug-bison@gnu.org\n" "POT-Creation-Date: 2021-09-25 07:43+0200\n" -"PO-Revision-Date: 2021-11-07 04:18+0000\n" +"PO-Revision-Date: 2022-03-28 16:48+0000\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:31+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:17+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bison-runtime.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bison-runtime.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bison-runtime.po 2022-03-27 22:26:34.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bison-runtime.po 2022-04-15 08:37:59.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:31+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 00:17+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: pt\n" #: data/skeletons/glr.c:930 data/skeletons/yacc.c:769 msgid "syntax error: cannot back up" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/byobu.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/byobu.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/byobu.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/byobu.po 2022-04-15 08:38:05.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:25+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:21+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bzr.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bzr.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/bzr.po 2022-03-27 22:26:41.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/bzr.po 2022-04-15 08:38:06.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 22:40+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:32+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: bzrlib/add.py:95 msgid "skipping {0} (larger than {1} of {2} bytes)" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cinder.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cinder.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cinder.po 2022-03-27 22:26:36.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cinder.po 2022-04-15 08:38:00.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:48+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:45+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Generated-By: Babel 1.3\n" #: cinder/context.py:107 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/colord.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/colord.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/colord.po 2022-03-27 22:26:42.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/colord.po 2022-04-15 08:38:06.000000000 +0000 @@ -18,8 +18,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:43+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:39+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. TRANSLATORS: command line option diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/command-not-found.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/command-not-found.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/command-not-found.po 2022-03-27 22:26:32.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/command-not-found.po 2022-04-15 08:37:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:52+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:45+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../CommandNotFound/CommandNotFound.py:156 msgid "Do you want to install it? (N/y)" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/coreutils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/coreutils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/coreutils.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/coreutils.po 2022-04-15 08:37:58.000000000 +0000 @@ -17,8 +17,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:34+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:21+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cpio.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cpio.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cpio.po 2022-03-27 22:26:29.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cpio.po 2022-04-15 08:37:54.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:34+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:21+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cpplib.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cpplib.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cpplib.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cpplib.po 2022-04-15 08:38:04.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-24 00:08+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 03:04+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: charset.c:674 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cracklib.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cracklib.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cracklib.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cracklib.po 2022-04-15 08:37:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:34+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:22+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: \n" #: lib/fascist.c:516 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cryptsetup-luks.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cryptsetup-luks.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cryptsetup-luks.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cryptsetup-luks.po 2022-04-15 08:38:05.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:29+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:20+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: luks/keyencryption.c:61 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cryptsetup.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cryptsetup.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cryptsetup.po 2022-03-27 22:26:34.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cryptsetup.po 2022-04-15 08:37:58.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:28+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:19+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: lib/libdevmapper.c:384 msgid "Cannot initialize device-mapper, running as non-root user." diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cups.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cups.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cups.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cups.po 2022-04-15 08:37:53.000000000 +0000 @@ -9,8 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:20+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:15+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: \n" #: systemv/lpstat.c:1872 systemv/lpstat.c:1991 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cwidget.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cwidget.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/cwidget.po 2022-03-27 22:26:37.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/cwidget.po 2022-04-15 08:38:02.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:14+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:08+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dctrl-tools.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dctrl-tools.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dctrl-tools.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dctrl-tools.po 2022-04-15 08:37:59.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: dctrl-tools\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2021-10-07 13:08+0000\n" +"POT-Creation-Date: 2022-03-23 15:47+0000\n" "PO-Revision-Date: 2016-09-01 11:30+0000\n" "Last-Translator: Alberto Almeida \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:52+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:44+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: lib/ifile.c:58 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/debconf.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/debconf.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/debconf.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/debconf.po 2022-04-15 08:38:03.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:35+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:22+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: ../Debconf/AutoSelect.pm:89 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/debian-tasks.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/debian-tasks.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/debian-tasks.po 2022-03-27 22:26:37.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/debian-tasks.po 2022-04-15 08:38:01.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:38+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:30+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. Description diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kde-config-whoopsie.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kde-config-whoopsie.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kde-config-whoopsie.po 2022-03-27 22:26:41.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kde-config-whoopsie.po 2022-04-15 08:38:05.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:57+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:53+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: src/kcm_whoopsie.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kubuntu-driver-manager.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kubuntu-driver-manager.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2022-04-15 08:37:59.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:57+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:54+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: src/kcm_driver_manager.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2022-03-27 22:26:31.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2022-04-15 08:37:55.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:32+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:28+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2022-04-15 08:37:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:39+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:36+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: searchproviders/brainstorm.desktop:5 msgctxt "Name" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/devscripts.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/devscripts.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/devscripts.po 2022-03-27 22:26:36.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/devscripts.po 2022-04-15 08:38:00.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:36+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:23+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #. type: TH diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/diffutils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/diffutils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/diffutils.po 2022-03-27 22:26:36.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/diffutils.po 2022-04-15 08:38:00.000000000 +0000 @@ -14,10 +14,10 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:41+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 01:32+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: pt\n" #: lib/argmatch.c:132 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dnsmasq.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dnsmasq.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dnsmasq.po 2022-03-27 22:26:36.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dnsmasq.po 2022-04-15 08:38:01.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:29+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:20+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: cache.c:764 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/doc-base.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/doc-base.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/doc-base.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/doc-base.po 2022-04-15 08:38:02.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:36+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:23+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../../install-docs.in:104 #, perl-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dpkg-dev.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dpkg-dev.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dpkg-dev.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dpkg-dev.po 2022-04-15 08:38:02.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:37+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:24+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: scripts/dpkg-architecture.pl scripts/dpkg-buildflags.pl #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dpkg.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dpkg.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dpkg.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dpkg.po 2022-04-15 08:38:05.000000000 +0000 @@ -7,15 +7,15 @@ "Project-Id-Version: dpkg 1.14\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" "POT-Creation-Date: 2021-12-06 21:03+0100\n" -"PO-Revision-Date: 2022-01-18 21:47+0000\n" +"PO-Revision-Date: 2022-04-07 13:22+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:37+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:23+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: lib/dpkg/ar.c diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dselect.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dselect.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/dselect.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/dselect.po 2022-04-15 08:38:05.000000000 +0000 @@ -7,14 +7,14 @@ "Project-Id-Version: dselect 1.17.0\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" "POT-Creation-Date: 2021-12-06 21:04+0100\n" -"PO-Revision-Date: 2022-01-18 21:38+0000\n" +"PO-Revision-Date: 2022-04-07 13:27+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:37+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:24+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: dselect/basecmds.cc diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/duplicity.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/duplicity.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/duplicity.po 2022-03-27 22:26:41.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/duplicity.po 2022-04-15 08:38:05.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 22:29+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:20+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../bin/duplicity:120 msgid "INT intercepted...exiting." diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/e2fsprogs.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/e2fsprogs.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/e2fsprogs.po 2022-03-27 22:26:30.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/e2fsprogs.po 2022-04-15 08:37:55.000000000 +0000 @@ -18,8 +18,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:33+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:19+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/ecryptfs-utils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/ecryptfs-utils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/ecryptfs-utils.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/ecryptfs-utils.po 2022-04-15 08:37:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:11+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:05+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #. Name #: ../src/desktop/ecryptfs-record-passphrase:1 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/elfutils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/elfutils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/elfutils.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/elfutils.po 2022-04-15 08:37:57.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 23:02+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:55+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: lib/color.c:53 msgid "" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/example-content.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/example-content.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/example-content.po 2022-03-27 22:26:31.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/example-content.po 2022-04-15 08:37:56.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:51+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:43+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fcitx-mozc.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fcitx-mozc.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fcitx-mozc.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fcitx-mozc.po 2022-04-15 08:37:52.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:33+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:29+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../eim.cc:187 msgid "Press Escape to go back" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fetchmail.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fetchmail.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fetchmail.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fetchmail.po 2022-04-15 08:38:05.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:45+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:32+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: checkalias.c:174 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/findutils.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/findutils.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/findutils.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/findutils.po 2022-04-15 08:37:53.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:46+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:33+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/flex.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/flex.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/flex.po 2022-03-27 22:26:33.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/flex.po 2022-04-15 08:37:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:46+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:33+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fprintd.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fprintd.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fprintd.po 2022-03-27 22:26:30.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fprintd.po 2022-04-15 08:37:55.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:23+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:19+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: data/net.reactivated.fprint.device.policy.in:13 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/friendly-recovery.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/friendly-recovery.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/friendly-recovery.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/friendly-recovery.po 2022-04-15 08:38:04.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:13+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:07+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fwupd.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fwupd.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/fwupd.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/fwupd.po 2022-04-15 08:37:52.000000000 +0000 @@ -17,8 +17,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-24 00:02+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:58+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" #: ../policy/org.freedesktop.fwupd.policy.in.h:1 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gas.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gas.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gas.po 2022-03-27 22:26:30.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gas.po 2022-04-15 08:37:55.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:29+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:16+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: app.c:381 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gawk.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gawk.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gawk.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gawk.po 2022-04-15 08:38:03.000000000 +0000 @@ -8,16 +8,16 @@ "Project-Id-Version: gawk 5.0.64\n" "Report-Msgid-Bugs-To: bug-gawk@gnu.org\n" "POT-Creation-Date: 2020-04-14 14:48+0300\n" -"PO-Revision-Date: 2021-10-27 10:54+0000\n" +"PO-Revision-Date: 2022-04-03 02:28+0000\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:49+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 00:36+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: pt\n" #: array.c:248 #, c-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gcab.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gcab.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gcab.po 2022-03-27 22:26:31.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gcab.po 2022-04-15 08:37:55.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-24 00:00+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:57+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Project-Style: gnome\n" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gcc.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gcc.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gcc.po 2022-03-27 22:26:35.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gcc.po 2022-04-15 08:37:59.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-24 00:23+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 03:19+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: cfgrtl.c:2748 msgid "flow control insn inside a basic block" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gdb.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gdb.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gdb.po 2022-03-27 22:26:32.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gdb.po 2022-04-15 08:37:57.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:51+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:38+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: aarch64-linux-nat.c:245 aarch64-linux-nat.c:282 arm-linux-nat.c:227 #: arm-linux-nat.c:255 diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/geoclue.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/geoclue.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/geoclue.po 2022-03-27 22:26:40.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/geoclue.po 2022-04-15 08:38:04.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 23:55+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 02:52+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: ../demo/agent.c:42 ../src/gclue-main.c:47 msgid "Display version number" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gettext-runtime.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gettext-runtime.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gettext-runtime.po 2022-03-27 22:26:29.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gettext-runtime.po 2022-04-15 08:37:53.000000000 +0000 @@ -16,48 +16,48 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 21:52+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" -"Language: pt\n" +"X-Launchpad-Export-Date: 2022-04-15 00:41+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: pt\n" -#: gnulib-lib/error.c:188 +#: gnulib-lib/error.c:195 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" -#: gnulib-lib/xmalloc.c:37 +#: gnulib-lib/xmalloc.c:38 #, c-format msgid "memory exhausted" msgstr "Memória esgotada" -#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 +#: src/envsubst.c:136 src/gettext.c:169 src/ngettext.c:154 #, c-format msgid "missing arguments" msgstr "argumentos em falta" -#: src/envsubst.c:176 +#: src/envsubst.c:179 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" msgstr "Uso: %s [OPÇÃO] [FORMATO-SHELL]\n" -#: src/envsubst.c:188 +#: src/envsubst.c:191 #, c-format, no-wrap msgid "" " -v, --variables output the variables occurring in SHELL-" "FORMAT\n" msgstr " -v, --variables mostra as variáveis em FORMATO-SHELL\n" -#: src/envsubst.c:195 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help mostra esta mensagem e sai\n" -#: src/envsubst.c:198 +#: src/envsubst.c:201 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version mostra informação da versão e sai\n" -#: src/envsubst.c:202 +#: src/envsubst.c:205 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -75,16 +75,16 @@ "substituídas; caso contrário, todas as variáveis de ambiente referenciadas\n" "ocorrentes na entrada padrão são substituídas.\n" -#: src/envsubst.c:442 +#: src/envsubst.c:451 #, c-format msgid "error while reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/envsubst.c:443 +#: src/envsubst.c:451 msgid "standard input" msgstr "entrada padrão" -#: src/gettext.c:243 +#: src/gettext.c:251 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" @@ -93,17 +93,17 @@ "Uso: %s [OPÇÃO] [[DIALECTO] MSGID]\n" "ou: %s [OPÇÃO] -s [MSGID]...\n" -#: src/gettext.c:249 +#: src/gettext.c:257 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" msgstr "Mostrar tradução de idioma nativo de uma mensagem textual.\n" -#: src/ngettext.c:212 +#: src/ngettext.c:216 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" msgstr "Uso: %s [OPÇÃO] [DIALECTO] MSGID MSGID-PLURAL NÚMERO\n" -#: src/ngettext.c:217 +#: src/ngettext.c:221 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" @@ -112,7 +112,7 @@ "Mostrar tradução de idioma nativo de uma mensagem textual cuja forma\n" "gramatical depende de um número.\n" -#: src/ngettext.c:233 +#: src/ngettext.c:249 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -158,13 +158,12 @@ msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: a opção \"%s%s\" requer um argumento\n" -#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808 +#: gnulib-lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- \"%c\"\n" -#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088 -#: gnulib-lib/getopt.c:1106 +#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção requer um argumento -- \"%c\"\n" @@ -182,17 +181,17 @@ "Este software é grátis: pode alterá-lo e redistribuí-lo.\n" "Não há QUALQUER GARANTIA, até ao limite da Lei.\n" -#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 +#: src/envsubst.c:116 src/gettext.c:141 src/ngettext.c:130 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:118 +#: src/envsubst.c:116 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 +#: src/envsubst.c:125 src/gettext.c:159 src/ngettext.c:142 #, c-format msgid "too many arguments" msgstr "demasiados argumentos" @@ -202,22 +201,22 @@ msgid "Try '%s --help' for more information.\n" msgstr "Tente \"%s --help\" para mais informação.\n" -#: src/envsubst.c:181 +#: src/envsubst.c:184 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Substitui os valores das variáveis de ambiente.\n" -#: src/envsubst.c:185 +#: src/envsubst.c:188 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Modo de operação:\n" -#: src/envsubst.c:192 +#: src/envsubst.c:195 src/gettext.c:275 src/ngettext.c:241 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Saída informativa:\n" -#: src/envsubst.c:211 +#: src/envsubst.c:214 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output " @@ -244,7 +243,7 @@ "Reporte erros de tradução em \n" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:139 src/ngettext.c:129 +#: src/gettext.c:141 src/ngettext.c:130 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gettext-tools.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gettext-tools.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/gettext-tools.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/gettext-tools.po 2022-04-15 08:37:52.000000000 +0000 @@ -16,69 +16,73 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 21:53+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 00:41+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" "Language: pt\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: gnulib-lib/error.c:188 +#: gnulib-lib/error.c:195 libgettextpo/error.c:195 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" -#: gnulib-lib/javacomp.c:510 src/write-catalog.c:255 src/write-catalog.c:319 -#: src/write-csharp.c:748 src/write-java.c:1152 src/write-mo.c:811 -#: src/write-qt.c:748 src/write-tcl.c:222 +#: gnulib-lib/javacomp.c:586 src/write-catalog.c:256 src/write-catalog.c:329 +#: src/write-csharp.c:753 src/write-desktop.c:183 src/write-java.c:1161 +#: src/write-java.c:1202 src/write-mo.c:802 src/write-mo.c:824 +#: src/write-qt.c:751 src/write-tcl.c:228 src/write-xml.c:76 #, c-format msgid "error while writing \"%s\" file" msgstr "erro ao escrever o ficheiro \"%s\"" -#: src/file-list.c:53 src/msggrep.c:247 src/open-catalog.c:122 -#: src/read-mo.c:252 src/read-tcl.c:125 src/urlget.c:216 src/xgettext.c:1891 -#: src/xgettext.c:1904 src/xgettext.c:1914 +#: src/file-list.c:53 src/msggrep.c:241 src/open-catalog.c:124 +#: src/read-mo.c:270 src/read-tcl.c:126 src/urlget.c:217 +#: src/write-desktop.c:173 src/xgettext.c:1755 src/xgettext.c:1764 +#: src/xgettext.c:1780 src/xgettext.c:1812 src/xgettext.c:1822 +#: src/xgettext.c:1839 #, c-format msgid "error while opening \"%s\" for reading" msgstr "erro ao abrir \"%s\" para leitura" -#: src/msgcmp.c:189 src/msgmerge.c:361 +#: src/msgcmp.c:186 src/msgmerge.c:387 #, c-format msgid "no input files given" msgstr "sem ficheiros de entrada" -#: src/msgcmp.c:194 src/msgmerge.c:366 +#: src/msgcmp.c:191 src/msgmerge.c:392 #, c-format msgid "exactly 2 input files required" msgstr "são requeridos exactamente 2 ficheiros" -#: src/msgen.c:248 src/msgfmt.c:383 src/xgettext.c:634 +#: src/msgen.c:256 src/msgfmt.c:461 src/xgettext.c:732 #, c-format msgid "no input file given" msgstr "sem ficheiro de entrada" -#: src/msgfmt.c:936 +#: src/msgfmt.c:1214 #, c-format msgid "domain name \"%s\" not suitable as file name" msgstr "nome de domínio \"%s\" inadequado como nome de ficheiro" -#: src/msgfmt.c:941 +#: src/msgfmt.c:1219 #, c-format msgid "domain name \"%s\" not suitable as file name: will use prefix" msgstr "" "nome de domínio \"%s\" inadequado como nome de ficheiro: será usado um " "prefixo" -#: src/msggrep.c:258 src/po-lex.c:657 src/read-mo.c:86 -#: src/read-properties.c:89 src/read-stringtable.c:98 src/x-awk.c:139 -#: src/x-c.c:484 src/x-csharp.c:163 src/x-elisp.c:145 src/x-glade.c:616 -#: src/x-java.c:181 src/x-librep.c:147 src/x-lisp.c:212 src/x-perl.c:227 -#: src/x-perl.c:302 src/x-perl.c:395 src/x-php.c:163 src/x-python.c:174 -#: src/x-rst.c:233 src/x-scheme.c:171 src/x-sh.c:155 src/x-smalltalk.c:91 -#: src/x-tcl.c:150 src/x-ycp.c:91 +#: src/msggrep.c:252 src/po-lex.c:655 src/read-desktop.c:127 src/read-mo.c:88 +#: src/read-properties.c:609 src/read-stringtable.c:98 src/x-awk.c:138 +#: src/x-c.c:583 src/x-csharp.c:164 src/x-elisp.c:145 src/x-java.c:200 +#: src/x-javascript.c:180 src/x-librep.c:147 src/x-lisp.c:212 src/x-lua.c:174 +#: src/x-perl.c:256 src/x-perl.c:331 src/x-perl.c:424 src/x-php.c:162 +#: src/x-python.c:177 src/x-rst.c:242 src/x-rst.c:296 src/x-scheme.c:171 +#: src/x-sh.c:164 src/x-smalltalk.c:85 src/x-tcl.c:151 src/x-vala.c:177 +#: src/x-ycp.c:89 #, c-format msgid "error while reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/msgmerge.c:2038 src/urlget.c:306 src/urlget.c:353 src/urlget.c:395 -#: src/urlget.c:437 +#: src/msgmerge.c:2120 src/urlget.c:300 src/urlget.c:348 src/urlget.c:391 +#: src/urlget.c:434 #, c-format msgid " done.\n" msgstr " concluído.\n" @@ -88,56 +92,57 @@ msgid "too many errors, aborting" msgstr "demasiados erros, a abortar" -#: src/write-catalog.c:239 src/write-catalog.c:283 +#: src/write-catalog.c:239 src/write-catalog.c:284 msgid "standard output" msgstr "saída padrão" -#: src/write-mo.c:799 src/write-qt.c:736 src/write-tcl.c:212 +#: src/write-desktop.c:163 src/write-mo.c:815 src/write-qt.c:741 +#: src/write-tcl.c:218 #, c-format msgid "error while opening \"%s\" for writing" msgstr "erro ao abrir \"%s\" para escrita" -#: src/xgettext.c:621 +#: src/xgettext.c:720 #, c-format msgid "--join-existing cannot be used when output is written to stdout" msgstr "" "impossível usar --join-existing quando a saída vai para a saída padrão" -#: src/xgettext.c:1882 +#: src/xgettext.c:1798 msgid "standard input" msgstr "entrada padrão" -#: gnulib-lib/argmatch.c:133 +#: gnulib-lib/argmatch.c:132 #, c-format msgid "invalid argument %s for %s" msgstr "argumento inválido %s para %s" -#: gnulib-lib/argmatch.c:134 +#: gnulib-lib/argmatch.c:133 #, c-format msgid "ambiguous argument %s for %s" msgstr "argumento ambíguo %s para %s" -#: gnulib-lib/argmatch.c:153 +#: gnulib-lib/argmatch.c:152 msgid "Valid arguments are:" msgstr "Os argumentos válidos são:" -#: gnulib-lib/clean-temp.c:442 +#: gnulib-lib/clean-temp.c:460 #, c-format msgid "cannot remove temporary file %s" msgstr "impossível remover o ficheiro temporário %s" -#: gnulib-lib/clean-temp.c:332 +#: gnulib-lib/clean-temp.c:579 #, c-format msgid "cannot find a temporary directory, try setting $TMPDIR" msgstr "" "impossivel encontrar uma pasta temporária, experimente definir $TMPDIR" -#: gnulib-lib/clean-temp.c:346 +#: gnulib-lib/clean-temp.c:594 #, c-format msgid "cannot create a temporary directory using template \"%s\"" msgstr "impossível criar uma pasta temporária usando o modelo \"%s\"" -#: gnulib-lib/clean-temp.c:457 +#: gnulib-lib/clean-temp.c:711 #, c-format msgid "cannot remove temporary directory %s" msgstr "impossível remover a pasta temporária %s" @@ -176,10 +181,10 @@ msgid "preserving permissions for %s" msgstr "preservar permissões para %s" -#: gnulib-lib/csharpcomp.c:310 gnulib-lib/javaversion.c:76 src/msginit.c:897 -#: src/msginit.c:972 src/msginit.c:1132 src/msginit.c:1231 -#: src/read-csharp.c:72 src/read-java.c:70 src/read-resources.c:73 -#: src/read-tcl.c:110 src/write-resources.c:77 +#: gnulib-lib/csharpcomp.c:202 gnulib-lib/javaversion.c:78 src/msginit.c:955 +#: src/msginit.c:1038 src/msginit.c:1207 src/msginit.c:1313 src/msginit.c:1483 +#: src/read-csharp.c:72 src/read-java.c:71 src/read-resources.c:73 +#: src/read-tcl.c:111 src/write-resources.c:79 src/x-ruby.c:134 #, c-format msgid "fdopen() failed" msgstr "fdopen() falhou" @@ -194,9 +199,9 @@ msgid "C# virtual machine not found, try installing mono" msgstr "Máquina virtual C# não encontrada, tente instalar mono" -#: gnulib-lib/execute.c:189 gnulib-lib/execute.c:262 -#: gnulib-lib/spawn-pipe.c:234 gnulib-lib/spawn-pipe.c:348 -#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:356 +#: gnulib-lib/execute.c:185 gnulib-lib/execute.c:258 +#: gnulib-lib/spawn-pipe.c:235 gnulib-lib/spawn-pipe.c:349 +#: gnulib-lib/wait-process.c:290 gnulib-lib/wait-process.c:364 #, c-format msgid "%s subprocess failed" msgstr "sub-processo %s falhou" @@ -226,35 +231,34 @@ msgid "%s: option '%s%s' requires an argument\n" msgstr "%s: opção \"%s%s\" requer um argumento\n" -#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808 +#: gnulib-lib/getopt.c:621 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: opção inválida -- \"%c\"\n" -#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088 -#: gnulib-lib/getopt.c:1106 +#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: a opção requer um argumento -- \"%c\"\n" -#: gnulib-lib/javacomp.c:126 gnulib-lib/javacomp.c:140 -#: gnulib-lib/javacomp.c:156 +#: gnulib-lib/javacomp.c:150 gnulib-lib/javacomp.c:174 +#: gnulib-lib/javacomp.c:200 #, c-format msgid "invalid source_version argument to compile_java_class" msgstr "argumento source_version inválido para compile_java_class" -#: gnulib-lib/javacomp.c:171 gnulib-lib/javacomp.c:192 +#: gnulib-lib/javacomp.c:221 gnulib-lib/javacomp.c:252 #, c-format msgid "invalid target_version argument to compile_java_class" msgstr "argumento target_version inválido para compile_java_class" -#: gnulib-lib/javacomp.c:503 src/write-csharp.c:739 src/write-java.c:1131 -#: src/write-java.c:1143 +#: gnulib-lib/javacomp.c:579 src/write-csharp.c:744 src/write-java.c:1145 +#: src/write-java.c:1153 src/write-java.c:1181 src/write-java.c:1193 #, c-format msgid "failed to create \"%s\"" msgstr "falha ao criar \"%s\"" -#: gnulib-lib/javacomp.c:2343 +#: gnulib-lib/javacomp.c:2436 #, c-format msgid "Java compiler not found, try installing gcj or set $JAVAC" msgstr "Compilador Java não encontrado, tente instalar gcj ou defina $JAVAC" @@ -265,15 +269,16 @@ msgstr "" "Máquina virtual Java não encontrada, tente instalar gij ou defina $JAVA" -#: gnulib-lib/javaversion.c:84 src/msginit.c:905 src/msginit.c:980 -#: src/msginit.c:1140 +#: gnulib-lib/javaversion.c:86 src/msginit.c:963 src/msginit.c:1046 +#: src/msginit.c:1215 src/msginit.c:1491 #, c-format msgid "%s subprocess I/O error" msgstr "erro E/S no sub-processo %s" -#: gnulib-lib/obstack.c:413 gnulib-lib/obstack.c:415 gnulib-lib/xmalloc.c:37 -#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:559 src/po-lex.c:83 -#: src/po-lex.c:102 src/x-glade.c:600 libgettextpo/gettext-po.c:1328 +#: gnulib-lib/obstack.c:338 gnulib-lib/obstack.c:340 gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xsetenv.c:37 src/msgl-check.c:563 src/po-lex.c:83 +#: src/po-lex.c:102 libgettextpo/gettext-po.c:1326 libgettextpo/obstack.c:338 +#: libgettextpo/obstack.c:340 libgettextpo/xmalloc.c:38 #, c-format msgid "memory exhausted" msgstr "memória esgotada" @@ -283,8 +288,8 @@ msgid "creation of threads failed" msgstr "falha ao criar tópicos" -#: gnulib-lib/pipe-filter-ii.c:224 gnulib-lib/pipe-filter-ii.c:374 -#: src/msgexec.c:389 +#: gnulib-lib/pipe-filter-ii.c:345 gnulib-lib/pipe-filter-ii.c:502 +#: src/msgexec.c:428 #, c-format msgid "write to %s subprocess failed" msgstr "falha ao escrever no sub-processo %s" @@ -328,39 +333,39 @@ #. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: gnulib-lib/quotearg.c:312 +#: gnulib-lib/quotearg.c:355 msgid "`" msgstr "\"" -#: gnulib-lib/quotearg.c:313 +#: gnulib-lib/quotearg.c:356 msgid "'" msgstr "\"" -#: gnulib-lib/spawn-pipe.c:140 gnulib-lib/spawn-pipe.c:143 -#: gnulib-lib/spawn-pipe.c:264 gnulib-lib/spawn-pipe.c:267 +#: gnulib-lib/spawn-pipe.c:141 gnulib-lib/spawn-pipe.c:144 +#: gnulib-lib/spawn-pipe.c:265 gnulib-lib/spawn-pipe.c:268 #, c-format msgid "cannot create pipe" msgstr "impossível criar canal" -#: gnulib-lib/w32spawn.h:43 +#: gnulib-lib/w32spawn.h:49 #, c-format msgid "_open_osfhandle failed" msgstr "_open_osfhandle falhou" -#: gnulib-lib/w32spawn.h:84 +#: gnulib-lib/w32spawn.h:90 #, c-format msgid "cannot restore fd %d: dup2 failed" msgstr "impossível restaurar fd %d: dup2 falhou" -#: gnulib-lib/wait-process.c:223 gnulib-lib/wait-process.c:255 -#: gnulib-lib/wait-process.c:317 +#: gnulib-lib/wait-process.c:231 gnulib-lib/wait-process.c:263 +#: gnulib-lib/wait-process.c:325 #, c-format msgid "%s subprocess" msgstr "sub-processo %s" -#: gnulib-lib/wait-process.c:274 gnulib-lib/wait-process.c:346 +#: gnulib-lib/wait-process.c:282 gnulib-lib/wait-process.c:354 #, c-format msgid "%s subprocess got fatal signal %d" msgstr "sub-processo %s obteve sinal fatal %d" @@ -417,7 +422,7 @@ "IDIOMA de REGRAS e imprime-as de forma adequada para uso gettext. Se não\n" "houver argumentos, lê as regras de plural da entrada padrão\n" -#: src/msgfmt.c:663 src/xgettext.c:826 +#: src/cldr-plurals.c:206 src/msgfmt.c:913 src/xgettext.c:1060 #, c-format, no-wrap msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -432,20 +437,22 @@ msgstr "" " -c, --cldr mostra regras de plural em formato CLDR\n" -#: src/hostname.c:230 src/msgattrib.c:517 src/msgcat.c:470 src/msgcmp.c:260 -#: src/msgcomm.c:456 src/msgconv.c:382 src/msgen.c:377 src/msgexec.c:297 -#: src/msgfilter.c:478 src/msgfmt.c:777 src/msggrep.c:625 src/msginit.c:422 -#: src/msgmerge.c:603 src/msgunfmt.c:529 src/msguniq.c:418 -#: src/recode-sr-latin.c:164 src/urlget.c:188 src/xgettext.c:983 +#: src/cldr-plurals.c:213 src/hostname.c:229 src/msgattrib.c:534 +#: src/msgcat.c:468 src/msgcmp.c:257 src/msgcomm.c:454 src/msgconv.c:385 +#: src/msgen.c:381 src/msgexec.c:305 src/msgfilter.c:507 src/msgfmt.c:1066 +#: src/msggrep.c:624 src/msginit.c:469 src/msgmerge.c:664 src/msgunfmt.c:527 +#: src/msguniq.c:417 src/recode-sr-latin.c:161 src/urlget.c:185 +#: src/xgettext.c:1235 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" msgstr " -h, --help mostra esta mensagem e sai\n" -#: src/hostname.c:232 src/msgattrib.c:519 src/msgcat.c:472 src/msgcmp.c:262 -#: src/msgcomm.c:458 src/msgconv.c:384 src/msgen.c:379 src/msgexec.c:299 -#: src/msgfilter.c:480 src/msgfmt.c:779 src/msggrep.c:627 src/msginit.c:424 -#: src/msgmerge.c:605 src/msgunfmt.c:531 src/msguniq.c:420 -#: src/recode-sr-latin.c:167 src/urlget.c:190 src/xgettext.c:985 +#: src/cldr-plurals.c:215 src/hostname.c:231 src/msgattrib.c:536 +#: src/msgcat.c:470 src/msgcmp.c:259 src/msgcomm.c:456 src/msgconv.c:387 +#: src/msgen.c:383 src/msgexec.c:307 src/msgfilter.c:509 src/msgfmt.c:1068 +#: src/msggrep.c:626 src/msginit.c:471 src/msgmerge.c:666 src/msgunfmt.c:529 +#: src/msguniq.c:419 src/recode-sr-latin.c:164 src/urlget.c:187 +#: src/xgettext.c:1237 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" msgstr " -V, --version mostra informação de versão e sai\n" @@ -488,11 +495,11 @@ "Este software é grátis: pode alterá-lo e redistribuí-lo.\n" "Não há QUALQUER GARANTIA, até ao limite da Lei.\n" -#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgcmp.c:178 -#: src/msgcomm.c:286 src/msgconv.c:241 src/msgen.c:237 src/msgexec.c:186 -#: src/msgfilter.c:279 src/msgfmt.c:372 src/msggrep.c:416 src/msginit.c:274 -#: src/msgmerge.c:350 src/msgunfmt.c:268 src/msguniq.c:265 src/urlget.c:149 -#: src/xgettext.c:590 +#: src/cldr-plurals.c:298 src/hostname.c:183 src/msgattrib.c:359 +#: src/msgcat.c:297 src/msgcmp.c:175 src/msgcomm.c:288 src/msgconv.c:248 +#: src/msgen.c:245 src/msgexec.c:189 src/msgfilter.c:292 src/msgfmt.c:448 +#: src/msggrep.c:419 src/msginit.c:275 src/msgmerge.c:376 src/msgunfmt.c:266 +#: src/msguniq.c:268 src/urlget.c:146 src/xgettext.c:692 #, c-format msgid "Written by %s.\n" msgstr "Escrito por %s\n" @@ -523,9 +530,11 @@ msgstr "operando extra %s" #: src/format-awk.c:509 src/format-boost.c:617 src/format-elisp.c:348 -#: src/format-gcc-internal.c:627 src/format-librep.c:312 -#: src/format-pascal.c:397 src/format-perl.c:584 src/format-php.c:350 -#: src/format-qt.c:173 src/format-tcl.c:390 src/format-ycp.c:147 +#: src/format-gcc-internal.c:627 src/format-java-printf.c:580 +#: src/format-javascript.c:355 src/format-kde.c:223 src/format-librep.c:312 +#: src/format-lua.c:228 src/format-pascal.c:396 src/format-perl.c:582 +#: src/format-php.c:348 src/format-qt.c:173 src/format-smalltalk.c:147 +#: src/format-tcl.c:390 #, c-format msgid "" "a format specification for argument %u, as in '%s', doesn't exist in '%s'" @@ -534,18 +543,21 @@ "em \"%s\"" #: src/format-awk.c:520 src/format-boost.c:628 src/format-elisp.c:359 -#: src/format-gcc-internal.c:638 src/format-librep.c:323 -#: src/format-pascal.c:408 src/format-perl.c:595 src/format-php.c:361 -#: src/format-qt.c:170 src/format-tcl.c:401 src/format-ycp.c:144 +#: src/format-gcc-internal.c:638 src/format-java-printf.c:591 +#: src/format-javascript.c:366 src/format-kde.c:234 src/format-librep.c:323 +#: src/format-lua.c:235 src/format-pascal.c:407 src/format-perl.c:593 +#: src/format-php.c:359 src/format-qt.c:170 src/format-smalltalk.c:144 +#: src/format-tcl.c:401 #, c-format msgid "a format specification for argument %u doesn't exist in '%s'" msgstr "uma especificação de formato para o argumento %u não existe em '%s'" #: src/format-awk.c:540 src/format-boost.c:648 src/format-c.c:146 #: src/format-elisp.c:379 src/format-gcc-internal.c:658 -#: src/format-gfc-internal.c:372 src/format-librep.c:343 -#: src/format-pascal.c:428 src/format-perl.c:615 src/format-php.c:381 -#: src/format-python.c:527 src/format-tcl.c:421 +#: src/format-gfc-internal.c:372 src/format-java-printf.c:611 +#: src/format-javascript.c:389 src/format-librep.c:343 src/format-lua.c:242 +#: src/format-pascal.c:427 src/format-perl.c:613 src/format-php.c:379 +#: src/format-python.c:527 src/format-ruby.c:959 src/format-tcl.c:421 #, c-format msgid "" "format specifications in '%s' and '%s' for argument %u are not the same" @@ -558,7 +570,7 @@ msgid "The directive number %u starts with | but does not end with |." msgstr "A directiva número %u começa com | mas não termina com |." -#: src/format.c:148 +#: src/format.c:154 #, c-format msgid "'%s' is not a valid %s format string, unlike '%s'. Reason: %s" msgstr "" @@ -587,45 +599,45 @@ "The string refers to argument number %u but ignores argument number %u." msgstr "A cadeia refere o argumento nº %u mas ignora o argumento nº %u" -#: src/format-c.c:137 src/format-csharp.c:206 src/format-gfc-internal.c:363 -#: src/format-python.c:515 src/format-qt-plural.c:110 +#: src/format-c.c:137 src/format-csharp.c:203 src/format-gfc-internal.c:363 +#: src/format-python.c:515 src/format-qt-plural.c:110 src/format-ruby.c:950 #, c-format msgid "number of format specifications in '%s' and '%s' does not match" msgstr "" "o número de especificações de formato em \"%s\" e \"%s\" não coincide" -#: src/format-csharp.c:88 src/format-java.c:205 +#: src/format-csharp.c:85 src/format-java.c:206 #, c-format msgid "" "In the directive number %u, '{' is not followed by an argument number." msgstr "Na directiva nº %u, \"{\" não é seguida de um número de argumento." -#: src/format-csharp.c:109 +#: src/format-csharp.c:106 #, c-format msgid "In the directive number %u, ',' is not followed by a number." msgstr "Na directiva número %u, \",\" não é seguida de um número." -#: src/format-csharp.c:130 src/format-java.c:191 +#: src/format-csharp.c:127 src/format-java.c:192 msgid "" "The string ends in the middle of a directive: found '{' without matching '}'." msgstr "" "A cadeia termina no meio de uma directiva: encontrada \"{\" sem \"}\" " "correspondente." -#: src/format-csharp.c:139 +#: src/format-csharp.c:136 #, c-format msgid "" "The directive number %u ends with an invalid character '%c' instead of '}'." msgstr "" "A directiva nº %u termina com um carácter inválido \"%c\", em vez de \"}\"." -#: src/format-csharp.c:140 +#: src/format-csharp.c:137 #, c-format msgid "" "The directive number %u ends with an invalid character instead of '}'." msgstr "A directiva nº %u termina com um carácter inválido em vez de \"}\"." -#: src/format-csharp.c:161 src/format-java.c:346 +#: src/format-csharp.c:158 src/format-java.c:347 msgid "" "The string starts in the middle of a directive: found '}' without matching " "'{'." @@ -633,7 +645,7 @@ "A cadeia começa no meio de uma directiva: encontrada \"}\" sem \"{\" " "correspondente." -#: src/format-csharp.c:162 +#: src/format-csharp.c:159 #, c-format msgid "The string contains a lone '}' after directive number %u." msgstr "A cadeia contém uma \"}\" sozinha após a directiva nº %u" @@ -757,7 +769,7 @@ msgid "The string refers to argument number %u in incompatible ways." msgstr "A cadeia refere o argumento %u de formas incompatíveis." -#: src/format-java.c:240 +#: src/format-java.c:241 #, c-format msgid "" "In the directive number %u, the substring \"%s\" is not a valid date/time " @@ -766,19 +778,19 @@ "Na directiva número %u, a sub-cadeia \"%s\" não é um estilo de data/hora " "válido." -#: src/format-java.c:251 src/format-java.c:285 src/format-java.c:314 +#: src/format-java.c:252 src/format-java.c:286 src/format-java.c:315 #, c-format msgid "In the directive number %u, \"%s\" is not followed by a comma." msgstr "Na directiva número %u, \"%s\" não é seguido de uma vírgula." -#: src/format-java.c:274 +#: src/format-java.c:275 #, c-format msgid "" "In the directive number %u, the substring \"%s\" is not a valid number style." msgstr "" "Na directiva número %u, a sub-cadeia \"%s\" não é um estilo de número válido." -#: src/format-java.c:323 +#: src/format-java.c:324 #, c-format msgid "" "In the directive number %u, the argument number is not followed by a comma " @@ -787,12 +799,12 @@ "Na directiva número %u, o número de argumento não é seguido de uma vírgula e " "um de \"%s\", \"%s\", \"%s\", \"%s\"." -#: src/format-java.c:572 +#: src/format-java.c:573 #, c-format msgid "In the directive number %u, a choice contains no number." msgstr "Na directiva número %u, há uma escolha sem número." -#: src/format-java.c:583 +#: src/format-java.c:584 #, c-format msgid "" "In the directive number %u, a choice contains a number that is not followed " @@ -801,7 +813,7 @@ "Na directiva número %u, há uma escolha com um número que não é seguido por " "\"<\", \"#\" ou \"%s\"." -#: src/format-java.c:745 +#: src/format-java.c:746 #, c-format msgid "" "a format specification for argument {%u}, as in '%s', doesn't exist in '%s'" @@ -809,13 +821,13 @@ "uma especificação de formato para o argumento {%u}, como em \"%s\", não " "existe em \"%s\"" -#: src/format-java.c:756 +#: src/format-java.c:757 #, c-format msgid "a format specification for argument {%u} doesn't exist in '%s'" msgstr "" "uma especificação de formato para o argumento {%u} não existe em \"%s\"" -#: src/format-java.c:776 +#: src/format-java.c:777 #, c-format msgid "" "format specifications in '%s' and '%s' for argument {%u} are not the same" @@ -889,8 +901,8 @@ msgid "error while parsing: %s" msgstr "erro ao analisar: %s" -#: src/format-lisp.c:2337 src/format-lisp.c:2349 src/format-scheme.c:2363 -#: src/format-scheme.c:2375 +#: src/format-lisp.c:2340 src/format-lisp.c:2352 src/format-scheme.c:2365 +#: src/format-scheme.c:2377 #, c-format msgid "" "In the directive number %u, parameter %u is of type '%s' but a parameter of " @@ -899,7 +911,7 @@ "Na directiva número %u, o parâmetro %u é de tipo \"%s\", mas é esperado um " "parâmetro de tipo \"%s\"." -#: src/format-lisp.c:2372 src/format-scheme.c:2398 +#: src/format-lisp.c:2375 src/format-scheme.c:2400 #, c-format msgid "" "In the directive number %u, too many parameters are given; expected at most " @@ -914,33 +926,33 @@ "Na directiva número %u, são dados demasiados parâmetros; esperados, no " "máximo, %u parâmetros." -#: src/format-lisp.c:2496 src/format-scheme.c:2499 +#: src/format-lisp.c:2499 src/format-scheme.c:2501 #, c-format msgid "In the directive number %u, '%c' is not followed by a digit." msgstr "Na directiva número %u, \"%c\" não é seguido de um algarismo." -#: src/format-lisp.c:2736 src/format-scheme.c:2754 +#: src/format-lisp.c:2739 src/format-scheme.c:2756 #, c-format msgid "In the directive number %u, the argument %d is negative." msgstr "Na directiva número %u, o argumento %d é negativo." -#: src/format-lisp.c:2805 +#: src/format-lisp.c:2808 msgid "The string ends in the middle of a ~/.../ directive." msgstr "A cadeia termina no meio de uma directiva ~/.../." -#: src/format-lisp.c:2843 src/format-lisp.c:3108 src/format-lisp.c:3225 -#: src/format-lisp.c:3285 src/format-lisp.c:3397 src/format-scheme.c:2840 -#: src/format-scheme.c:3105 src/format-scheme.c:3222 src/format-scheme.c:3320 +#: src/format-lisp.c:2846 src/format-lisp.c:3111 src/format-lisp.c:3228 +#: src/format-lisp.c:3288 src/format-lisp.c:3400 src/format-scheme.c:2842 +#: src/format-scheme.c:3107 src/format-scheme.c:3224 src/format-scheme.c:3322 #, c-format msgid "Found '~%c' without matching '~%c'." msgstr "Encontrado \"~%c\" sem o correspondente \"~%c\"" -#: src/format-lisp.c:2863 src/format-scheme.c:2860 +#: src/format-lisp.c:2866 src/format-scheme.c:2862 #, c-format msgid "In the directive number %u, both the @ and the : modifiers are given." msgstr "Na directiva número %u, tanto o modificador @ como o : são dados." -#: src/format-lisp.c:2976 src/format-scheme.c:2973 +#: src/format-lisp.c:2979 src/format-scheme.c:2975 #, c-format msgid "" "In the directive number %u, '~:[' is not followed by two clauses, separated " @@ -949,34 +961,36 @@ "Na directiva número %u, \"~:[\" não é seguido de duas cláusulas, separadas " "por \"~;\"." -#: src/format-lisp.c:3326 src/format-scheme.c:3263 +#: src/format-lisp.c:3329 src/format-scheme.c:3265 #, c-format msgid "In the directive number %u, '~;' is used in an invalid position." msgstr "Na directiva número %u, \"~;\" é usado numa posição inválida." -#: src/format-lisp.c:3432 src/format-scheme.c:3355 +#: src/format-lisp.c:3435 src/format-scheme.c:3357 msgid "The string refers to some argument in incompatible ways." msgstr "A cadeia refere um argumento de formas incompatíveis." -#: src/format-lisp.c:3474 src/format-scheme.c:3397 +#: src/format-lisp.c:3477 src/format-scheme.c:3399 #, c-format msgid "format specifications in '%s' and '%s' are not equivalent" msgstr "as especificações de formato em \"%s\" e \"%s\" não são equivalentes" -#: src/format-lisp.c:3490 src/format-scheme.c:3413 +#: src/format-lisp.c:3493 src/format-scheme.c:3415 #, c-format msgid "format specifications in '%s' are not a subset of those in '%s'" msgstr "" "as especificações de formato \"%s\" não são um sub-conjunto daquelas em " "\"%s\"" -#: src/format-perl-brace.c:199 src/format-python.c:471 src/format-sh.c:308 +#: src/format-perl-brace.c:199 src/format-python-brace.c:442 +#: src/format-python-brace.c:455 src/format-python.c:471 src/format-ruby.c:909 +#: src/format-sh.c:308 #, c-format msgid "a format specification for argument '%s' doesn't exist in '%s'" msgstr "" "uma especificação de fromato para o argumento '%s' não existe em '%s'" -#: src/format-perl.c:433 +#: src/format-perl.c:432 #, c-format msgid "" "In the directive number %u, the size specifier is incompatible with the " @@ -1016,7 +1030,7 @@ "In the directive number %u, there is an unterminated format directive." msgstr "Na directiva número %u, há uma directiva de formato indeterminado." -#: src/format-python.c:115 +#: src/format-python.c:114 src/format-ruby.c:131 msgid "" "The string refers to arguments both through argument names and through " "unnamed argument specifications." @@ -1024,7 +1038,7 @@ "A cadeia refere argumentos tanto através de nomes de argumento como através " "de especificações de argumento sem nome." -#: src/format-python.c:354 +#: src/format-python.c:354 src/format-ruby.c:792 #, c-format msgid "The string refers to the argument named '%s' in incompatible ways." msgstr "A cadeia refere o argumento chamado \"%s\" de formas incompatíveis." @@ -1045,7 +1059,7 @@ "as especificações de formato em \"%s\" esperam um tuple, as de \"%s\" " "esperam um mapa" -#: src/format-python.c:460 src/format-sh.c:297 +#: src/format-python.c:460 src/format-ruby.c:898 src/format-sh.c:297 #, c-format msgid "" "a format specification for argument '%s', as in '%s', doesn't exist in '%s'" @@ -1053,7 +1067,7 @@ "uma especificação de formato para o argumento \"%s\", como em \"%s\", não " "existe em \"%s\"" -#: src/format-python.c:494 +#: src/format-python.c:494 src/format-ruby.c:929 #, c-format msgid "" "format specifications in '%s' and '%s' for argument '%s' are not the same" @@ -1121,11 +1135,11 @@ "expect a hash table" msgstr "" -#: src/format-sh.c:79 +#: src/format-sh.c:78 msgid "The string refers to a shell variable with a non-ASCII name." msgstr "A cadeia refere uma variável de shell com nome não-ASCII." -#: src/format-sh.c:81 +#: src/format-sh.c:80 msgid "" "The string refers to a shell variable with complex shell brace syntax. This " "syntax is unsupported here due to security reasons." @@ -1133,7 +1147,7 @@ "A cadeia refere uma variável de shell com sintaxe de shell complexa. Esta " "sintaxe não é suportada devido a razões de segurança." -#: src/format-sh.c:83 +#: src/format-sh.c:82 msgid "" "The string refers to a shell variable whose value may be different inside " "shell functions." @@ -1141,11 +1155,11 @@ "A cadeia refere uma variável de shell ccujo valor pode ser diferente dentro " "de funções da shell." -#: src/format-sh.c:85 +#: src/format-sh.c:84 msgid "The string refers to a shell variable with an empty name." msgstr "A cadeia refere uma variável de shell com um nome vazio." -#: src/format-ycp.c:90 +#: src/format-smalltalk.c:90 #, c-format msgid "" "In the directive number %u, the character '%c' is not a digit between 1 and " @@ -1153,7 +1167,7 @@ msgstr "" "Na directiva número %u, o carácter \"%c\" não é um algarismo entre 1 e 9." -#: src/format-ycp.c:91 +#: src/format-smalltalk.c:91 #, c-format msgid "" "The character that terminates the directive number %u is not a digit between " @@ -1162,39 +1176,39 @@ "O carácter que termina a directiva número %u não é um algarismo entre 1 e 9." #. This is a proper name. See the gettext manual, section Names. -#: src/hostname.c:184 src/msgattrib.c:343 src/msgcat.c:295 src/msgconv.c:241 -#: src/msgen.c:237 src/msgexec.c:186 src/msgfilter.c:279 src/msggrep.c:416 -#: src/msginit.c:274 src/msguniq.c:265 src/recode-sr-latin.c:121 -#: src/urlget.c:149 +#: src/hostname.c:183 src/msgattrib.c:359 src/msgcat.c:297 src/msgconv.c:248 +#: src/msgen.c:245 src/msgexec.c:189 src/msgfilter.c:292 src/msggrep.c:419 +#: src/msginit.c:275 src/msguniq.c:268 src/recode-sr-latin.c:118 +#: src/urlget.c:146 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/hostname.c:194 src/msginit.c:284 src/recode-sr-latin.c:130 +#: src/hostname.c:193 src/msginit.c:285 src/recode-sr-latin.c:127 #, c-format msgid "too many arguments" msgstr "demasiados argumentos" -#: src/hostname.c:211 src/msginit.c:362 src/recode-sr-latin.c:148 +#: src/hostname.c:210 src/msginit.c:409 src/recode-sr-latin.c:145 #, c-format, no-wrap msgid "Usage: %s [OPTION]\n" msgstr "Uso: %s [OPÇÃO]\n" -#: src/hostname.c:215 +#: src/hostname.c:214 #, c-format msgid "Print the machine's hostname.\n" msgstr "Mostrar o nome de servidor da máquina.\n" -#: src/hostname.c:218 +#: src/hostname.c:217 #, c-format msgid "Output format:\n" msgstr "Formato de saída:\n" -#: src/hostname.c:220 +#: src/hostname.c:219 #, c-format msgid " -s, --short short host name\n" msgstr " -s, --short nome de servidor curto\n" -#: src/hostname.c:222 +#: src/hostname.c:221 #, c-format msgid "" " -f, --fqdn, --long long host name, includes fully qualified " @@ -1205,21 +1219,21 @@ "totalmente qualificado\n" " nome e aliás\n" -#: src/hostname.c:225 +#: src/hostname.c:224 #, c-format msgid " -i, --ip-address addresses for the hostname\n" msgstr " -i, --ip-address endereços para o nome de servidor\n" -#: src/hostname.c:228 src/msgattrib.c:515 src/msgcat.c:468 src/msgcmp.c:258 -#: src/msgcomm.c:454 src/msgconv.c:380 src/msgen.c:375 src/msgexec.c:295 -#: src/msgfilter.c:476 src/msgfmt.c:775 src/msggrep.c:623 src/msginit.c:420 -#: src/msgmerge.c:601 src/msgunfmt.c:527 src/msguniq.c:416 -#: src/recode-sr-latin.c:161 src/urlget.c:186 src/xgettext.c:981 +#: src/hostname.c:227 src/msgattrib.c:532 src/msgcat.c:466 src/msgcmp.c:255 +#: src/msgcomm.c:452 src/msgconv.c:383 src/msgen.c:379 src/msgexec.c:303 +#: src/msgfilter.c:505 src/msgfmt.c:1064 src/msggrep.c:622 src/msginit.c:467 +#: src/msgmerge.c:662 src/msgunfmt.c:525 src/msguniq.c:415 +#: src/recode-sr-latin.c:158 src/urlget.c:183 src/xgettext.c:1233 #, c-format, no-wrap msgid "Informative output:\n" msgstr "Saída informativa:\n" -#: src/hostname.c:255 src/hostname.c:261 src/hostname.c:268 +#: src/hostname.c:258 src/hostname.c:264 src/hostname.c:271 #, c-format msgid "could not get host name" msgstr "impossível obter o nome de servidor" @@ -1280,30 +1294,28 @@ msgid "the root element is not \"locatingRules\"" msgstr "o elemento raiz não é \"locatingRules\"" -#: src/msgattrib.c:358 src/msgconv.c:256 src/msgexec.c:152 src/msgfilter.c:194 -#: src/msggrep.c:431 src/msginit.c:197 src/msguniq.c:280 +#: src/msgattrib.c:374 src/msgconv.c:263 src/msgexec.c:150 src/msgfilter.c:193 +#: src/msggrep.c:434 src/msginit.c:197 src/msguniq.c:283 #, c-format msgid "at most one input file allowed" msgstr "no máximo um ficheiro de entrada permitido" -#: src/msgattrib.c:364 src/msgattrib.c:368 src/msgcat.c:311 src/msgcat.c:315 -#: src/msgcomm.c:296 src/msgcomm.c:300 src/msgconv.c:262 src/msgconv.c:266 -#: src/msgen.c:259 src/msgen.c:263 src/msgfilter.c:294 src/msgfilter.c:298 -#: src/msgfmt.c:411 src/msgfmt.c:419 src/msgfmt.c:434 src/msgfmt.c:456 -#: src/msggrep.c:437 src/msggrep.c:441 src/msgmerge.c:375 src/msgmerge.c:396 -#: src/msgmerge.c:400 src/msgunfmt.c:299 src/msguniq.c:286 src/msguniq.c:290 -#: src/xgettext.c:600 src/xgettext.c:604 src/xgettext.c:611 src/xgettext.c:614 -#: src/xgettext.c:617 +#: src/msgattrib.c:380 src/msgcat.c:313 src/msgcomm.c:298 src/msgconv.c:269 +#: src/msgen.c:267 src/msgfilter.c:307 src/msgfmt.c:501 src/msgfmt.c:509 +#: src/msgfmt.c:524 src/msgfmt.c:546 src/msggrep.c:440 src/msgmerge.c:401 +#: src/msgmerge.c:406 src/msgmerge.c:411 src/msgmerge.c:416 src/msgmerge.c:437 +#: src/msgunfmt.c:297 src/msguniq.c:289 src/xgettext.c:702 src/xgettext.c:709 +#: src/xgettext.c:712 src/xgettext.c:715 src/xgettext.c:739 #, c-format msgid "%s and %s are mutually exclusive" msgstr "%s e %s são mutuamente exclusivas" -#: src/msgattrib.c:407 src/msgconv.c:302 src/msggrep.c:511 src/msguniq.c:325 +#: src/msgattrib.c:419 src/msgconv.c:305 src/msggrep.c:510 src/msguniq.c:324 #, c-format msgid "Usage: %s [OPTION] [INPUTFILE]\n" msgstr "Uso: %s [OPÇÃO] [FICHENTRADA]\n" -#: src/msgattrib.c:412 +#: src/msgattrib.c:424 #, c-format, no-wrap msgid "" "Filters the messages of a translation catalog according to their " @@ -1314,10 +1326,10 @@ "atributos,\n" "e manipula os atributos.\n" -#: src/msgattrib.c:416 src/msgcat.c:383 src/msgcmp.c:227 src/msgcomm.c:374 -#: src/msgconv.c:310 src/msgen.c:310 src/msgexec.c:276 src/msgfilter.c:396 -#: src/msggrep.c:521 src/msginit.c:372 src/msgmerge.c:497 src/msgunfmt.c:435 -#: src/msguniq.c:341 +#: src/msgattrib.c:428 src/msgcat.c:381 src/msgcmp.c:224 src/msgcomm.c:372 +#: src/msgconv.c:313 src/msgen.c:314 src/msgexec.c:284 src/msgfilter.c:419 +#: src/msggrep.c:520 src/msginit.c:419 src/msgmerge.c:555 src/msgunfmt.c:433 +#: src/msguniq.c:340 #, c-format msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" @@ -1325,23 +1337,23 @@ "Argumentos obrigatórios para opções longas são também obrigatórios para " "opções curtas.\n" -#: src/msgattrib.c:419 src/msgcat.c:386 src/msgcmp.c:230 src/msgcomm.c:377 -#: src/msgconv.c:313 src/msgen.c:313 src/msgexec.c:279 src/msgfilter.c:399 -#: src/msgfmt.c:668 src/msggrep.c:524 src/msginit.c:375 src/msgmerge.c:500 -#: src/msgunfmt.c:449 src/msguniq.c:344 src/xgettext.c:831 +#: src/msgattrib.c:431 src/msgcat.c:384 src/msgcmp.c:227 src/msgcomm.c:375 +#: src/msgconv.c:316 src/msgen.c:317 src/msgexec.c:287 src/msgfilter.c:422 +#: src/msgfmt.c:918 src/msggrep.c:523 src/msginit.c:422 src/msgmerge.c:558 +#: src/msgunfmt.c:447 src/msguniq.c:343 src/xgettext.c:1065 #, c-format msgid "Input file location:\n" msgstr "Localização do ficheiro de entrada:\n" -#: src/msgattrib.c:421 src/msgconv.c:315 src/msggrep.c:526 src/msguniq.c:346 +#: src/msgattrib.c:433 src/msgconv.c:318 src/msggrep.c:525 src/msguniq.c:345 #, c-format msgid " INPUTFILE input PO file\n" msgstr " INPUTFILE ficheiro PO de entrada\n" -#: src/msgattrib.c:423 src/msgcat.c:392 src/msgcmp.c:236 src/msgcomm.c:383 -#: src/msgconv.c:317 src/msgen.c:317 src/msgexec.c:283 src/msgfilter.c:403 -#: src/msgfmt.c:672 src/msggrep.c:528 src/msgmerge.c:506 src/msguniq.c:348 -#: src/xgettext.c:837 +#: src/msgattrib.c:435 src/msgcat.c:390 src/msgcmp.c:233 src/msgcomm.c:381 +#: src/msgconv.c:320 src/msgen.c:321 src/msgexec.c:291 src/msgfilter.c:426 +#: src/msgfmt.c:922 src/msggrep.c:527 src/msgmerge.c:564 src/msguniq.c:347 +#: src/xgettext.c:1071 #, c-format msgid "" " -D, --directory=DIRECTORY add DIRECTORY to list for input files search\n" @@ -1349,32 +1361,33 @@ " -D, --directory=PASTA adiciona PASTA à lista de procura de ficheiros " "de entrada\n" -#: src/msgattrib.c:425 src/msgconv.c:319 src/msgexec.c:285 src/msgfilter.c:405 -#: src/msggrep.c:530 src/msgunfmt.c:453 src/msguniq.c:350 +#: src/msgattrib.c:437 src/msgconv.c:322 src/msgexec.c:293 src/msgfilter.c:428 +#: src/msggrep.c:529 src/msgunfmt.c:451 src/msguniq.c:349 #, c-format msgid "If no input file is given or if it is -, standard input is read.\n" msgstr "" "Se não for dado um ficheiro de entrada ou for -, é lida a entrada padrão.\n" -#: src/msgattrib.c:428 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:322 -#: src/msgen.c:322 src/msgfilter.c:408 src/msgfmt.c:692 src/msggrep.c:533 -#: src/msginit.c:383 src/msgmerge.c:518 src/msgunfmt.c:489 src/msguniq.c:353 -#: src/xgettext.c:842 +#: src/msgattrib.c:440 src/msgcat.c:395 src/msgcomm.c:386 src/msgconv.c:325 +#: src/msgen.c:326 src/msgfilter.c:431 src/msgfmt.c:946 src/msggrep.c:532 +#: src/msginit.c:430 src/msgmerge.c:576 src/msgunfmt.c:487 src/msguniq.c:352 +#: src/xgettext.c:1076 #, c-format msgid "Output file location:\n" msgstr "Localização do ficheiro de saída:\n" -#: src/msgattrib.c:430 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:324 -#: src/msgen.c:324 src/msgfilter.c:410 src/msgfmt.c:694 src/msggrep.c:535 -#: src/msgmerge.c:520 src/msgunfmt.c:491 src/msguniq.c:355 +#: src/msgattrib.c:442 src/msgcat.c:397 src/msgcomm.c:388 src/msgconv.c:327 +#: src/msgen.c:328 src/msgfilter.c:433 src/msgfmt.c:948 src/msgfmt.c:997 +#: src/msgfmt.c:1016 src/msggrep.c:534 src/msgmerge.c:578 src/msgunfmt.c:489 +#: src/msguniq.c:354 #, c-format msgid " -o, --output-file=FILE write output to specified file\n" msgstr "" " -o, --output-file=FICHEIRO escreve a saída no ficheiro especificado\n" -#: src/msgattrib.c:432 src/msgcat.c:401 src/msgcomm.c:392 src/msgconv.c:326 -#: src/msgen.c:326 src/msgfilter.c:412 src/msggrep.c:537 src/msgmerge.c:522 -#: src/msgunfmt.c:493 src/msguniq.c:357 +#: src/msgattrib.c:444 src/msgcat.c:399 src/msgcomm.c:390 src/msgconv.c:329 +#: src/msgen.c:330 src/msgfilter.c:435 src/msggrep.c:536 src/msgmerge.c:580 +#: src/msgunfmt.c:491 src/msguniq.c:356 #, c-format msgid "" "The results are written to standard output if no output file is specified\n" @@ -1383,12 +1396,12 @@ "Os resultados são escritos na saída padrão se não for dado nenhum ficheiro\n" "ou se for -.\n" -#: src/msgattrib.c:436 src/msgcat.c:405 src/msgcomm.c:396 src/msguniq.c:361 +#: src/msgattrib.c:448 src/msgcat.c:403 src/msgcomm.c:394 src/msguniq.c:360 #, c-format msgid "Message selection:\n" msgstr "Selecção de mensagem:\n" -#: src/msgattrib.c:438 +#: src/msgattrib.c:450 #, c-format msgid "" " --translated keep translated, remove untranslated messages\n" @@ -1396,7 +1409,7 @@ " --translated mantém as traduzidas, remove as não " "traduzidas\n" -#: src/msgattrib.c:440 +#: src/msgattrib.c:452 #, c-format msgid "" " --untranslated keep untranslated, remove translated messages\n" @@ -1404,52 +1417,52 @@ " --untranslated mantém as não traduzidas, remove as " "traduzidas\n" -#: src/msgattrib.c:442 +#: src/msgattrib.c:454 #, c-format msgid " --no-fuzzy remove 'fuzzy' marked messages\n" msgstr "" " --no-fuzzy remove mensagens marcadas como aproximadas\n" -#: src/msgattrib.c:444 +#: src/msgattrib.c:456 #, c-format msgid " --only-fuzzy keep 'fuzzy' marked messages\n" msgstr "" " --only-fuzzy Mantém mensagens marcadas como aproximadas\n" -#: src/msgattrib.c:446 +#: src/msgattrib.c:458 #, c-format msgid " --no-obsolete remove obsolete #~ messages\n" msgstr " --no-obsolete remove mensagens obsoletas #~\n" -#: src/msgattrib.c:448 +#: src/msgattrib.c:460 #, c-format msgid " --only-obsolete keep obsolete #~ messages\n" msgstr " --only-obsolete mantém mensagens obsoletas #~\n" -#: src/msgattrib.c:451 +#: src/msgattrib.c:463 #, c-format msgid "Attribute manipulation:\n" msgstr "Manipulação de atributos:\n" -#: src/msgattrib.c:453 +#: src/msgattrib.c:465 #, c-format msgid " --set-fuzzy set all messages 'fuzzy'\n" msgstr "" " --set-fuzzy marca todas as mensagens como aproximadas\n" -#: src/msgattrib.c:455 +#: src/msgattrib.c:467 #, c-format msgid " --clear-fuzzy set all messages non-'fuzzy'\n" msgstr "" " --clear-fuzzy marca todas as mensagens como não-aproximadas\n" -#: src/msgattrib.c:457 +#: src/msgattrib.c:469 #, c-format msgid " --set-obsolete set all messages obsolete\n" msgstr "" " --set-obsolete define todas as mensagens como obsoletas\n" -#: src/msgattrib.c:459 +#: src/msgattrib.c:471 #, c-format msgid " --clear-obsolete set all messages non-obsolete\n" msgstr "" @@ -1465,7 +1478,7 @@ "anteriores\n" " das mensagens traduzidas.\n" -#: src/msgattrib.c:461 +#: src/msgattrib.c:476 #, c-format msgid "" " --clear-previous remove the \"previous msgid\" from all " @@ -1482,28 +1495,28 @@ " --empty ao remover \"aproximadas\", limpa também " "msgstr\n" -#: src/msgattrib.c:463 +#: src/msgattrib.c:480 #, c-format msgid "" " --only-file=FILE.po manipulate only entries listed in FILE.po\n" msgstr "" " --only-file=FICH.po manipula só entradas listadas em FICH.po\n" -#: src/msgattrib.c:465 +#: src/msgattrib.c:482 #, c-format msgid "" " --ignore-file=FILE.po manipulate only entries not listed in FILE.po\n" msgstr "" " --ignore-file=FICH.po manipula só entradas não listadas em FICH.po\n" -#: src/msgattrib.c:467 +#: src/msgattrib.c:484 #, c-format msgid "" " --fuzzy synonym for --only-fuzzy --clear-fuzzy\n" msgstr "" " --fuzzy sinónimo para --only-fuzzy --clear-fuzzy\n" -#: src/msgattrib.c:469 +#: src/msgattrib.c:486 #, c-format msgid "" " --obsolete synonym for --only-obsolete --clear-obsolete\n" @@ -1511,16 +1524,16 @@ " --obsolete sinónimo para --only-obsolete --clear-" "obsolete\n" -#: src/msgattrib.c:472 src/msgcat.c:417 src/msgcmp.c:250 src/msgcomm.c:408 -#: src/msgconv.c:337 src/msgen.c:330 src/msgexec.c:288 src/msgfilter.c:431 -#: src/msgfmt.c:737 src/msggrep.c:580 src/msginit.c:391 src/msgmerge.c:555 -#: src/msguniq.c:368 +#: src/msgattrib.c:489 src/msgcat.c:415 src/msgcmp.c:247 src/msgcomm.c:406 +#: src/msgconv.c:340 src/msgen.c:334 src/msgexec.c:296 src/msgfilter.c:460 +#: src/msgfmt.c:1026 src/msggrep.c:579 src/msginit.c:438 src/msgmerge.c:616 +#: src/msguniq.c:367 #, c-format msgid "Input file syntax:\n" msgstr "Síntaxe do ficheiro de entrada:\n" -#: src/msgattrib.c:474 src/msgconv.c:339 src/msgen.c:332 src/msgexec.c:290 -#: src/msgfilter.c:433 src/msggrep.c:582 src/msginit.c:393 src/msguniq.c:370 +#: src/msgattrib.c:491 src/msgconv.c:342 src/msgen.c:336 src/msgexec.c:298 +#: src/msgfilter.c:462 src/msggrep.c:581 src/msginit.c:440 src/msguniq.c:369 #, c-format msgid "" " -P, --properties-input input file is in Java .properties syntax\n" @@ -1528,8 +1541,8 @@ " -P, --properties-input ficheiro de entrada com sintaxe Java " ".properties\n" -#: src/msgattrib.c:476 src/msgconv.c:341 src/msgen.c:334 src/msgexec.c:292 -#: src/msgfilter.c:435 src/msggrep.c:584 src/msginit.c:395 src/msguniq.c:372 +#: src/msgattrib.c:493 src/msgconv.c:344 src/msgen.c:338 src/msgexec.c:300 +#: src/msgfilter.c:464 src/msggrep.c:583 src/msginit.c:442 src/msguniq.c:371 #, c-format msgid "" " --stringtable-input input file is in NeXTstep/GNUstep .strings " @@ -1538,17 +1551,17 @@ " --stringtable-input ficheiro de entrada com sintaxe " "NeXTstep/GNUstep .strings\n" -#: src/msgattrib.c:479 src/msgcat.c:425 src/msgcomm.c:416 src/msgconv.c:344 -#: src/msgen.c:337 src/msgfilter.c:438 src/msgfmt.c:765 src/msggrep.c:587 -#: src/msginit.c:398 src/msgmerge.c:563 src/msgunfmt.c:497 src/msguniq.c:375 -#: src/xgettext.c:927 +#: src/msgattrib.c:496 src/msgcat.c:423 src/msgcomm.c:414 src/msgconv.c:347 +#: src/msgen.c:341 src/msgfilter.c:467 src/msgfmt.c:1054 src/msggrep.c:586 +#: src/msginit.c:445 src/msgmerge.c:624 src/msgunfmt.c:495 src/msguniq.c:374 +#: src/xgettext.c:1177 #, c-format msgid "Output details:\n" msgstr "Detalhes da saída:\n" -#: src/msgattrib.c:481 src/msgcat.c:434 src/msgcomm.c:418 src/msgconv.c:346 -#: src/msgen.c:341 src/msgfilter.c:440 src/msggrep.c:589 src/msginit.c:404 -#: src/msgmerge.c:567 src/msgunfmt.c:499 src/msguniq.c:382 src/xgettext.c:929 +#: src/msgattrib.c:498 src/msgcat.c:432 src/msgcomm.c:416 src/msgconv.c:349 +#: src/msgen.c:345 src/msgfilter.c:469 src/msggrep.c:588 src/msginit.c:451 +#: src/msgmerge.c:628 src/msgunfmt.c:497 src/msguniq.c:381 src/xgettext.c:1179 #, c-format msgid "" " --color use colors and other text attributes always\n" @@ -1562,9 +1575,9 @@ " QUANDO pode ser \"always\", \"never\", " "\"auto\" ou \"html\".\n" -#: src/msgattrib.c:485 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:350 -#: src/msgen.c:345 src/msgfilter.c:444 src/msggrep.c:593 src/msginit.c:408 -#: src/msgmerge.c:571 src/msgunfmt.c:503 src/msguniq.c:386 src/xgettext.c:933 +#: src/msgattrib.c:502 src/msgcat.c:436 src/msgcomm.c:420 src/msgconv.c:353 +#: src/msgen.c:349 src/msgfilter.c:473 src/msggrep.c:592 src/msginit.c:455 +#: src/msgmerge.c:632 src/msgunfmt.c:501 src/msguniq.c:385 src/xgettext.c:1183 #, c-format msgid "" " --style=STYLEFILE specify CSS style rule file for --color\n" @@ -1572,18 +1585,18 @@ " --style=FICHESTILO especifica ficheiro de regras CSS para --" "color\n" -#: src/msgattrib.c:487 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:352 -#: src/msgen.c:347 src/msgmerge.c:573 src/msgunfmt.c:505 src/msguniq.c:388 -#: src/xgettext.c:935 +#: src/msgattrib.c:504 src/msgcat.c:438 src/msgcomm.c:422 src/msgconv.c:355 +#: src/msgen.c:351 src/msgmerge.c:634 src/msgunfmt.c:503 src/msguniq.c:387 +#: src/xgettext.c:1185 #, c-format msgid "" " -e, --no-escape do not use C escapes in output (default)\n" msgstr "" " -e, --no-escape não usa escapes C na saída (predefinição)\n" -#: src/msgattrib.c:489 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:354 -#: src/msgen.c:349 src/msgfilter.c:448 src/msgmerge.c:575 src/msgunfmt.c:507 -#: src/msguniq.c:390 src/xgettext.c:937 +#: src/msgattrib.c:506 src/msgcat.c:440 src/msgcomm.c:424 src/msgconv.c:357 +#: src/msgen.c:353 src/msgfilter.c:477 src/msgmerge.c:636 src/msgunfmt.c:505 +#: src/msguniq.c:389 src/xgettext.c:1187 #, c-format msgid "" " -E, --escape use C escapes in output, no extended chars\n" @@ -1591,31 +1604,31 @@ " -E, --escape usa escapes C na saída, sem caracteres " "estendidos\n" -#: src/msgattrib.c:491 src/msgcat.c:444 src/msgcomm.c:428 src/msgconv.c:356 -#: src/msgen.c:351 src/msgfilter.c:450 src/msggrep.c:599 src/msgmerge.c:577 -#: src/msgunfmt.c:509 src/msguniq.c:392 src/xgettext.c:939 +#: src/msgattrib.c:508 src/msgcat.c:442 src/msgcomm.c:426 src/msgconv.c:359 +#: src/msgen.c:355 src/msgfilter.c:479 src/msggrep.c:598 src/msgmerge.c:638 +#: src/msgunfmt.c:507 src/msguniq.c:391 src/xgettext.c:1189 #, c-format msgid " --force-po write PO file even if empty\n" msgstr "" " --force-po escreve o ficheiro PO mesmo que vazio\n" -#: src/msgattrib.c:493 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:394 -#: src/xgettext.c:941 +#: src/msgattrib.c:510 src/msgcat.c:444 src/msgcomm.c:428 src/msguniq.c:393 +#: src/xgettext.c:1191 #, c-format msgid "" " -i, --indent write the .po file using indented style\n" msgstr "" " -i, --indent escreve o ficheiro PO usando estilo indentado\n" -#: src/msgattrib.c:495 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:396 -#: src/xgettext.c:943 +#: src/msgattrib.c:512 src/msgcat.c:446 src/msgcomm.c:430 src/msguniq.c:395 +#: src/xgettext.c:1193 #, c-format msgid " --no-location do not write '#: filename:line' lines\n" msgstr "" " --no-location não escreve linhas \"#: filename:line\"\n" -#: src/msgattrib.c:497 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:398 -#: src/xgettext.c:945 +#: src/msgattrib.c:514 src/msgcat.c:448 src/msgcomm.c:432 src/msguniq.c:397 +#: src/xgettext.c:1195 #, c-format msgid "" " -n, --add-location generate '#: filename:line' lines (default)\n" @@ -1623,67 +1636,67 @@ " -n, --add-location gerar linhas \"#: filename:line\" " "(predefinição)\n" -#: src/msgattrib.c:499 src/msgcat.c:452 src/msgcomm.c:436 src/msguniq.c:400 -#: src/xgettext.c:947 +#: src/msgattrib.c:516 src/msgcat.c:450 src/msgcomm.c:434 src/msguniq.c:399 +#: src/xgettext.c:1197 #, c-format msgid "" " --strict write out strict Uniforum conforming .po file\n" msgstr "" " --strict escreve um ficheiro PO estritamente Uniforum\n" -#: src/msgattrib.c:501 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:366 -#: src/msgen.c:361 src/msgfilter.c:462 src/msggrep.c:609 src/msginit.c:410 -#: src/msgmerge.c:587 src/msgunfmt.c:515 src/msguniq.c:402 +#: src/msgattrib.c:518 src/msgcat.c:452 src/msgcomm.c:436 src/msgconv.c:369 +#: src/msgen.c:365 src/msgfilter.c:491 src/msggrep.c:608 src/msginit.c:457 +#: src/msgmerge.c:648 src/msgunfmt.c:513 src/msguniq.c:401 #, c-format msgid " -p, --properties-output write out a Java .properties file\n" msgstr " -p, --properties-output escreve um ficheiro Java .properties\n" -#: src/msgattrib.c:503 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:368 -#: src/msgen.c:363 src/msgfilter.c:464 src/msggrep.c:611 src/msginit.c:412 -#: src/msgmerge.c:589 src/msgunfmt.c:517 src/msguniq.c:404 src/xgettext.c:951 +#: src/msgattrib.c:520 src/msgcat.c:454 src/msgcomm.c:438 src/msgconv.c:371 +#: src/msgen.c:367 src/msgfilter.c:493 src/msggrep.c:610 src/msginit.c:459 +#: src/msgmerge.c:650 src/msgunfmt.c:515 src/msguniq.c:403 src/xgettext.c:1201 #, c-format msgid "" " --stringtable-output write out a NeXTstep/GNUstep .strings file\n" msgstr "" " --stringtable-output escreve um ficheiro NeXTstep/GNUstep .strings\n" -#: src/msgattrib.c:505 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:370 -#: src/msgen.c:365 src/msgfilter.c:466 src/msggrep.c:613 src/msginit.c:414 -#: src/msgmerge.c:591 src/msgunfmt.c:519 src/msguniq.c:406 src/xgettext.c:953 +#: src/msgattrib.c:522 src/msgcat.c:456 src/msgcomm.c:440 src/msgconv.c:373 +#: src/msgen.c:369 src/msgfilter.c:495 src/msggrep.c:612 src/msginit.c:461 +#: src/msgmerge.c:652 src/msgunfmt.c:517 src/msguniq.c:405 src/xgettext.c:1205 #, c-format msgid " -w, --width=NUMBER set output page width\n" msgstr " -w, --width=NÚMERO define a largura de página da saída\n" -#: src/msgattrib.c:507 src/msgcat.c:460 src/msgcomm.c:444 src/msgconv.c:372 -#: src/msgen.c:367 src/msgfilter.c:468 src/msggrep.c:615 src/msginit.c:416 -#: src/msgmerge.c:593 src/msgunfmt.c:521 src/msguniq.c:408 src/xgettext.c:955 +#: src/msgattrib.c:524 src/msgcat.c:458 src/msgcomm.c:442 src/msgconv.c:375 +#: src/msgen.c:371 src/msgfilter.c:497 src/msggrep.c:614 src/msginit.c:463 +#: src/msgmerge.c:654 src/msgunfmt.c:519 src/msguniq.c:407 src/xgettext.c:1207 #, c-format msgid "" " --no-wrap do not break long message lines, longer than\n" " the output page width, into several lines\n" msgstr "" -#: src/msgattrib.c:510 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:375 -#: src/msgen.c:370 src/msgfilter.c:471 src/msgmerge.c:596 src/msgunfmt.c:524 -#: src/msguniq.c:411 src/xgettext.c:958 +#: src/msgattrib.c:527 src/msgcat.c:461 src/msgcomm.c:445 src/msgconv.c:378 +#: src/msgen.c:374 src/msgfilter.c:500 src/msgmerge.c:657 src/msgunfmt.c:522 +#: src/msguniq.c:410 src/xgettext.c:1210 #, c-format msgid " -s, --sort-output generate sorted output\n" msgstr " -s, --sort-output gera uma saída ordenada\n" -#: src/msgattrib.c:512 src/msgcat.c:465 src/msgcomm.c:449 src/msgconv.c:377 -#: src/msgen.c:372 src/msgfilter.c:473 src/msgmerge.c:598 src/msguniq.c:413 -#: src/xgettext.c:960 +#: src/msgattrib.c:529 src/msgcat.c:463 src/msgcomm.c:447 src/msgconv.c:380 +#: src/msgen.c:376 src/msgfilter.c:502 src/msgmerge.c:659 src/msguniq.c:412 +#: src/xgettext.c:1212 #, c-format msgid " -F, --sort-by-file sort output by file location\n" msgstr "" " -F, --sort-by-file ordena a saída por localização do ficheiro\n" -#: src/msgcat.c:321 src/msgcomm.c:326 +#: src/msgcat.c:319 src/msgcomm.c:324 #, c-format msgid "impossible selection criteria specified (%d < n < %d)" msgstr "especificou um critério de selecção impossível (%d < n < %d)" -#: src/msgcat.c:366 src/msgcomm.c:358 src/xgettext.c:817 +#: src/msgcat.c:364 src/msgcomm.c:356 src/xgettext.c:1051 #, c-format msgid "Usage: %s [OPTION] [INPUTFILE]...\n" msgstr "Uso: %s [OPÇÃO] [FICHENTRADA]...\n" @@ -1713,25 +1726,25 @@ "ficheiro PO\n" "para as definir.\n" -#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:833 +#: src/msgcat.c:386 src/msgcomm.c:377 src/xgettext.c:1067 #, c-format msgid " INPUTFILE ... input files\n" msgstr " FICHENTRADA input files\n" -#: src/msgcat.c:390 src/msgcomm.c:381 src/xgettext.c:835 +#: src/msgcat.c:388 src/msgcomm.c:379 src/xgettext.c:1069 #, c-format msgid " -f, --files-from=FILE get list of input files from FILE\n" msgstr "" " -f, --files-from=FICHEIRO obter lista de ficheiros de entrada de " "FICHEIRO\n" -#: src/msgcat.c:394 src/msgcomm.c:385 src/msgen.c:319 src/msgfmt.c:674 -#: src/xgettext.c:839 +#: src/msgcat.c:392 src/msgcomm.c:383 src/msgen.c:323 src/msgfmt.c:924 +#: src/xgettext.c:1073 #, c-format msgid "If input file is -, standard input is read.\n" msgstr "Se o ficheiro de entrada for -, é lida a entrada padrão.\n" -#: src/msgcat.c:407 src/msgcomm.c:398 +#: src/msgcat.c:405 src/msgcomm.c:396 #, c-format msgid "" " -<, --less-than=NUMBER print messages with less than this many\n" @@ -1740,7 +1753,7 @@ " -<, --less-than=NÚMERO imprime mensagens com menos destas NÙMERO\n" " definições, a predefinição é infinitas\n" -#: src/msgcat.c:410 +#: src/msgcat.c:408 #, c-format msgid "" " ->, --more-than=NUMBER print messages with more than this many\n" @@ -1749,7 +1762,7 @@ " ->, --more-than=NÚMERO imprime mensagens com mais destas NÚMERO\n" " definições, a predefinição é zero\n" -#: src/msgcat.c:413 src/msgcomm.c:404 +#: src/msgcat.c:411 src/msgcomm.c:402 #, c-format msgid "" " -u, --unique shorthand for --less-than=2, requests\n" @@ -1758,8 +1771,8 @@ " -u, --unique abreviatura para --less-than=2, pede\n" " que só mensagens únicas sejam imprimidas\n" -#: src/msgcat.c:419 src/msgcmp.c:252 src/msgcomm.c:410 src/msgfmt.c:739 -#: src/msgmerge.c:557 +#: src/msgcat.c:417 src/msgcmp.c:249 src/msgcomm.c:408 src/msgfmt.c:1028 +#: src/msgmerge.c:618 #, c-format msgid "" " -P, --properties-input input files are in Java .properties syntax\n" @@ -1767,8 +1780,8 @@ " -P, --properties-input ficheiros de entrada com sintaxe Java " ".properties\n" -#: src/msgcat.c:421 src/msgcmp.c:254 src/msgcomm.c:412 src/msgfmt.c:741 -#: src/msgmerge.c:559 +#: src/msgcat.c:419 src/msgcmp.c:251 src/msgcomm.c:410 src/msgfmt.c:1030 +#: src/msgmerge.c:620 #, c-format msgid "" " --stringtable-input input files are in NeXTstep/GNUstep .strings\n" @@ -1777,12 +1790,12 @@ " --stringtable-input ficheiros de entrada com sintaxe\n" " NeXTstep/GNUstep .strings\n" -#: src/msgcat.c:427 src/msgconv.c:332 src/msguniq.c:377 +#: src/msgcat.c:425 src/msgconv.c:335 src/msguniq.c:376 #, c-format msgid " -t, --to-code=NAME encoding for output\n" msgstr " -t, --to-code=NOME codificação de saída\n" -#: src/msgcat.c:429 src/msguniq.c:379 +#: src/msgcat.c:427 src/msguniq.c:378 #, c-format msgid "" " --use-first use first available translation for each\n" @@ -1791,7 +1804,7 @@ " --use-first usa a primeira tradução disponível para cada\n" " mensagem, não une várias traduções\n" -#: src/msgcat.c:432 src/msgen.c:339 src/msgmerge.c:565 +#: src/msgcat.c:430 src/msgen.c:343 src/msgmerge.c:626 #, c-format msgid "" " --lang=CATALOGNAME set 'Language' field in the header entry\n" @@ -1800,16 +1813,16 @@ "CATÁLOGO\n" #. This is a proper name. See the gettext manual, section Names. -#: src/msgcmp.c:178 src/msgcomm.c:286 src/msgmerge.c:350 +#: src/msgcmp.c:175 src/msgcomm.c:288 src/msgmerge.c:376 msgid "Peter Miller" msgstr "Peter Miller" -#: src/msgcmp.c:213 src/msgmerge.c:480 +#: src/msgcmp.c:210 src/msgmerge.c:538 #, c-format msgid "Usage: %s [OPTION] def.po ref.pot\n" msgstr "Uso: %s [OPÇÂO] def.po ref.pot\n" -#: src/msgcmp.c:218 +#: src/msgcmp.c:215 #, c-format, no-wrap msgid "" "Compare two Uniforum style .po files to check that both contain the same\n" @@ -1822,22 +1835,22 @@ "diagnostics.\n" msgstr "" -#: src/msgcmp.c:232 +#: src/msgcmp.c:229 #, c-format msgid " def.po translations\n" msgstr " def.po traduções\n" -#: src/msgcmp.c:234 +#: src/msgcmp.c:231 #, c-format msgid " ref.pot references to the sources\n" msgstr " ref.pot referências às fontes\n" -#: src/msgcmp.c:239 src/msgmerge.c:546 +#: src/msgcmp.c:236 src/msgmerge.c:604 #, c-format msgid "Operation modifiers:\n" msgstr "Modificadores de operação:\n" -#: src/msgcmp.c:241 src/msgmerge.c:548 +#: src/msgcmp.c:238 src/msgmerge.c:606 #, c-format msgid "" " -m, --multi-domain apply ref.pot to each of the domains in " @@ -1846,59 +1859,59 @@ " -m, --multi-domain aplica ref.pot a cada um dos domínios em " "def.po\n" -#: src/msgcmp.c:243 src/msgmerge.c:550 +#: src/msgcmp.c:240 src/msgmerge.c:611 #, c-format msgid " -N, --no-fuzzy-matching do not use fuzzy matching\n" msgstr " -N, --no-fuzzy-matching não usar comparação de aproximadas\n" -#: src/msgcmp.c:245 +#: src/msgcmp.c:242 #, c-format msgid " --use-fuzzy consider fuzzy entries\n" msgstr " --use-fuzzy considera entradas aproximadas\n" -#: src/msgcmp.c:247 +#: src/msgcmp.c:244 #, c-format msgid " --use-untranslated consider untranslated entries\n" msgstr " --use-untranslated considera entradas não traduzidas\n" -#: src/msgcmp.c:324 +#: src/msgcmp.c:327 #, c-format msgid "this message is untranslated" msgstr "esta mensagem não está traduzida" -#: src/msgcmp.c:330 +#: src/msgcmp.c:333 #, c-format msgid "this message needs to be reviewed by the translator" msgstr "esta mensagem precisa de ser revista pelo tradutor" -#: src/msgcmp.c:369 src/msgmerge.c:1500 +#: src/msgcmp.c:372 src/msgmerge.c:1578 #, c-format msgid "this message is used but not defined..." msgstr "esta mensagem é usada mas não definida..." -#: src/msgcmp.c:372 src/msgmerge.c:1503 +#: src/msgcmp.c:375 src/msgmerge.c:1581 #, c-format msgid "...but this definition is similar" msgstr "...mas esta definição é semelhante" -#: src/msgcmp.c:377 src/msgmerge.c:1531 +#: src/msgcmp.c:380 src/msgmerge.c:1610 #, c-format msgid "this message is used but not defined in %s" msgstr "esta mensagem é usada mas não definida em %s" -#: src/msgcmp.c:546 +#: src/msgcmp.c:549 #, c-format msgid "warning: this message is not used" msgstr "atenção: esta mensagem não é usada" -#: src/msgcmp.c:553 src/msgfmt.c:545 +#: src/msgcmp.c:556 src/msgfmt.c:773 src/msgfmt.c:1606 src/xgettext.c:1020 #, c-format msgid "found %d fatal error" msgid_plural "found %d fatal errors" msgstr[0] "encontrou %d erro fatal" msgstr[1] "encontrou %d erros fatais" -#: src/msgcomm.c:315 +#: src/msgcomm.c:313 #, c-format msgid "at least two files must be specified" msgstr "tem de especificar pelo menos dois ficheiros" @@ -1924,7 +1937,7 @@ "ficheiro PO para os definir. As posições no ficheiro de todos os ficheiros\n" "PO serão acumuladas.\n" -#: src/msgcomm.c:401 +#: src/msgcomm.c:399 #, c-format msgid "" " ->, --more-than=NUMBER print messages with more than this many\n" @@ -1940,29 +1953,29 @@ msgstr "" " --omit-header não escrever \"msgid \"\"\" no cabeçalho\n" -#: src/msgconv.c:306 +#: src/msgconv.c:309 #, c-format msgid "Converts a translation catalog to a different character encoding.\n" msgstr "" "Converte um catálogo de traduções numa codificação de caracteres diferente.\n" -#: src/msgconv.c:330 +#: src/msgconv.c:333 #, c-format msgid "Conversion target:\n" msgstr "Alvo da conversão:\n" -#: src/msgconv.c:334 +#: src/msgconv.c:337 #, c-format msgid "The default encoding is the current locale's encoding.\n" msgstr "A codificação predefinida é a codificação do idioma actual.\n" -#: src/msgconv.c:358 src/msgen.c:353 src/msgmerge.c:579 +#: src/msgconv.c:361 src/msgen.c:357 src/msgmerge.c:640 #, c-format msgid " -i, --indent indented output style\n" msgstr " -i, --indent estilo de saída indentado\n" -#: src/msgconv.c:360 src/msgen.c:355 src/msgfilter.c:456 src/msggrep.c:603 -#: src/msgmerge.c:581 +#: src/msgconv.c:363 src/msgen.c:359 src/msgfilter.c:485 src/msggrep.c:602 +#: src/msgmerge.c:642 #, c-format msgid " --no-location suppress '#: filename:line' lines\n" msgstr " --no-location suprime linhas \"#: filename:line\"\n" @@ -1976,24 +1989,24 @@ " -n, --add-location preserva linhas \"#: filename:line\" " "(predefinição)\n" -#: src/msgconv.c:364 src/msgen.c:359 src/msgfilter.c:460 src/msggrep.c:607 -#: src/msgmerge.c:585 +#: src/msgconv.c:367 src/msgen.c:363 src/msgfilter.c:489 src/msggrep.c:606 +#: src/msgmerge.c:646 #, c-format msgid " --strict strict Uniforum output style\n" msgstr "" " --strict estilo de saída estritamente Uniforum\n" -#: src/msgen.c:253 +#: src/msgen.c:261 #, c-format msgid "exactly one input file required" msgstr "exactamente um ficheiro de entrada necessário" -#: src/msgen.c:298 +#: src/msgen.c:302 #, c-format msgid "Usage: %s [OPTION] INPUTFILE\n" msgstr "Uso: %s [OPÇÃO] FICHENTRADA\n" -#: src/msgen.c:303 +#: src/msgen.c:307 #, c-format, no-wrap msgid "" "Creates an English translation catalog. The input file is the last\n" @@ -2006,22 +2019,22 @@ "com xgettext). Entradas por traduzir recebem uma tradução idêntica\n" "à msgid.\n" -#: src/msgen.c:315 +#: src/msgen.c:319 #, c-format msgid " INPUTFILE input PO or POT file\n" msgstr " FICHENTRADA ficheiro de entrada PO ou POT\n" -#: src/msgexec.c:196 +#: src/msgexec.c:199 #, c-format msgid "missing command name" msgstr "nome do comando em falta" -#: src/msgexec.c:257 +#: src/msgexec.c:260 #, c-format msgid "Usage: %s [OPTION] COMMAND [COMMAND-OPTION]\n" msgstr "Uso: %s [OPÇÃO] COMANDO [OPÇÃO-COMANDO]\n" -#: src/msgexec.c:262 +#: src/msgexec.c:265 #, c-format, no-wrap msgid "" "Applies a command to all translations of a translation catalog.\n" @@ -2036,7 +2049,7 @@ "saída do msgexec. O código de retorno do msgexec é o código de retorno\n" "máximo em todas as chamadas.\n" -#: src/msgexec.c:271 +#: src/msgexec.c:274 #, c-format, no-wrap msgid "" "A special builtin command called '0' outputs the translation, followed by a\n" @@ -2057,37 +2070,37 @@ msgid " --newline add newline at the end of input\n" msgstr " --newline adiciona newline no fim da entrada\n" -#: src/msgexec.c:281 src/msgfilter.c:401 +#: src/msgexec.c:289 src/msgfilter.c:424 #, c-format msgid " -i, --input=INPUTFILE input PO file\n" msgstr " -i, --input=INPUTFILE ficheiro de entrada PO\n" -#: src/msgexec.c:345 +#: src/msgexec.c:358 #, c-format msgid "write to stdout failed" msgstr "falha ao escrever na saída padrão" -#: src/msgfilter.c:289 +#: src/msgfilter.c:302 #, c-format msgid "missing filter name" msgstr "nome de filtro em falta" -#: src/msgfilter.c:313 +#: src/msgfilter.c:322 #, c-format msgid "at least one sed script must be specified" msgstr "tem de especificar pelo menos um script sed" -#: src/msgfilter.c:388 +#: src/msgfilter.c:411 #, c-format msgid "Usage: %s [OPTION] FILTER [FILTER-OPTION]\n" msgstr "Uso: %s [OPÇÃO] FILTRO [OPÇÃO-FILTRO]\n" -#: src/msgfilter.c:392 +#: src/msgfilter.c:415 #, c-format msgid "Applies a filter to all translations of a translation catalog.\n" msgstr "Aplica um filtro a todas as traduções de um catálogo de tradução.\n" -#: src/msgfilter.c:416 +#: src/msgfilter.c:439 #, c-format msgid "" "The FILTER can be any program that reads a translation from standard input\n" @@ -2110,19 +2123,19 @@ " --newline adiciona newline ao fim da entrada e\n" " remove newline do fim da saída" -#: src/msgfilter.c:421 +#: src/msgfilter.c:450 #, c-format msgid "Useful FILTER-OPTIONs when the FILTER is 'sed':\n" msgstr "OPÇÕES de FILTRO quando o FILTRO é \"sed\":\n" -#: src/msgfilter.c:423 +#: src/msgfilter.c:452 #, c-format msgid "" " -e, --expression=SCRIPT add SCRIPT to the commands to be executed\n" msgstr "" " -e, --expression=SCRIPT adiciona SCRIPT aos comandos a executar\n" -#: src/msgfilter.c:425 +#: src/msgfilter.c:454 #, c-format msgid "" " -f, --file=SCRIPTFILE add the contents of SCRIPTFILE to the " @@ -2133,7 +2146,7 @@ "comandos\n" " a executar\n" -#: src/msgfilter.c:428 +#: src/msgfilter.c:457 #, c-format msgid "" " -n, --quiet, --silent suppress automatic printing of pattern space\n" @@ -2141,19 +2154,19 @@ " -n, --quiet, --silent suprime a impressão automática de espaço " "padrão\n" -#: src/msgfilter.c:446 src/msggrep.c:595 +#: src/msgfilter.c:475 src/msggrep.c:594 #, c-format msgid "" " --no-escape do not use C escapes in output (default)\n" msgstr "" " --no-escape não usa escapes C na saída (predefinição)\n" -#: src/msgfilter.c:452 src/msggrep.c:601 +#: src/msgfilter.c:481 src/msggrep.c:600 #, c-format msgid " --indent indented output style\n" msgstr " --indent estilo de saída indentado\n" -#: src/msgfilter.c:454 +#: src/msgfilter.c:483 #, c-format msgid "" " --keep-header keep header entry unmodified, don't filter it\n" @@ -2166,18 +2179,18 @@ msgid "filter output is not terminated with a newline" msgstr "saída do filtro não termina com newline" -#: src/msgfmt.c:304 +#: src/msgfmt.c:369 #, c-format msgid "the argument to %s should be a single punctuation character" msgstr "o argumento para %s deve ser um único carácter de pontuação" -#: src/msgfmt.c:351 +#: src/msgfmt.c:416 #, c-format msgid "invalid endianness: %s" msgstr "endianness inválida: %s" #. This is a proper name. See the gettext manual, section Names. -#: src/msgfmt.c:372 src/msgunfmt.c:268 src/xgettext.c:590 +#: src/msgfmt.c:448 src/msgunfmt.c:266 src/xgettext.c:692 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" @@ -2186,13 +2199,14 @@ msgid "no input file should be given if %s and %s are specified" msgstr "não deve indicar ficheiro de entrada se %s e%s forem especificadas" -#: src/msgfmt.c:425 src/msgfmt.c:447 src/msgfmt.c:469 src/msgunfmt.c:330 -#: src/msgunfmt.c:353 +#: src/msgfmt.c:515 src/msgfmt.c:537 src/msgfmt.c:559 src/msgunfmt.c:328 +#: src/msgunfmt.c:351 #, c-format msgid "%s requires a \"-d directory\" specification" msgstr "%s requer uma especificação \"-d pasta\"" -#: src/msgfmt.c:440 src/msgfmt.c:462 src/msgunfmt.c:323 src/msgunfmt.c:346 +#: src/msgfmt.c:530 src/msgfmt.c:552 src/msgfmt.c:587 src/msgfmt.c:615 +#: src/msgunfmt.c:321 src/msgunfmt.c:344 #, c-format msgid "%s requires a \"-l locale\" specification" msgstr "%s requer uma especificação \"-l idioma\"" @@ -2212,12 +2226,12 @@ msgid "%s and %s are mutually exclusive in %s" msgstr "%s e %s são mutuamente exclusivas em %s" -#: src/msgfmt.c:478 src/msgunfmt.c:362 src/msgunfmt.c:368 +#: src/msgfmt.c:624 src/msgunfmt.c:360 src/msgunfmt.c:366 #, c-format msgid "%s is only valid with %s or %s" msgstr "%s só é válida com %s ou %s" -#: src/msgfmt.c:484 src/msgfmt.c:490 +#: src/msgfmt.c:630 src/msgfmt.c:636 #, c-format msgid "%s is only valid with %s, %s or %s" msgstr "%s só é válida com %s, %s ou %s" @@ -2229,55 +2243,55 @@ #. TRANSLATORS: The prefix before a statistics message. The argument #. is a file name or a comma separated list of file names. -#: src/msgfmt.c:620 +#: src/msgfmt.c:870 #, c-format msgid "%s: " msgstr "%s: " -#: src/msgfmt.c:624 +#: src/msgfmt.c:874 #, c-format msgid "%d translated message" msgid_plural "%d translated messages" msgstr[0] "%d mensagem traduzida" msgstr[1] "%d mensagens traduzidas" -#: src/msgfmt.c:629 +#: src/msgfmt.c:879 #, c-format msgid ", %d fuzzy translation" msgid_plural ", %d fuzzy translations" msgstr[0] ", %d tradução aproximada" msgstr[1] ", %d traduções aproximadas" -#: src/msgfmt.c:634 +#: src/msgfmt.c:884 #, c-format msgid ", %d untranslated message" msgid_plural ", %d untranslated messages" msgstr[0] ", %d mensagens não traduzida" msgstr[1] ", %d mensagens não traduzidas" -#: src/msgfmt.c:654 +#: src/msgfmt.c:904 #, c-format msgid "Usage: %s [OPTION] filename.po ...\n" msgstr "Uso: %s [OPÇÃO] ficheiro.po ...\n" -#: src/msgfmt.c:658 +#: src/msgfmt.c:908 #, c-format msgid "" "Generate binary message catalog from textual translation description.\n" msgstr "" "Gerar catálogo de mensagens binário de descrição de tradução textual.\n" -#: src/msgfmt.c:670 +#: src/msgfmt.c:920 #, c-format msgid " filename.po ... input files\n" msgstr " filename.po ... ficheiros de entrada\n" -#: src/msgfmt.c:677 src/msgmerge.c:512 src/msgunfmt.c:438 src/xgettext.c:874 +#: src/msgfmt.c:927 src/msgmerge.c:570 src/msgunfmt.c:436 src/xgettext.c:1109 #, c-format msgid "Operation mode:\n" msgstr "Modo de operação:\n" -#: src/msgfmt.c:679 +#: src/msgfmt.c:929 #, c-format msgid "" " -j, --java Java mode: generate a Java ResourceBundle " @@ -2286,7 +2300,7 @@ " -j, --java Modo Java: gera uma classe Java " "ResourceBundle\n" -#: src/msgfmt.c:681 +#: src/msgfmt.c:931 #, c-format msgid "" " --java2 like --java, and assume Java2 (JDK 1.2 or " @@ -2295,12 +2309,12 @@ " --java2 como --java e assume Java2 (JDK 1.2 ou " "posterior)\n" -#: src/msgfmt.c:683 +#: src/msgfmt.c:933 #, c-format msgid " --csharp C# mode: generate a .NET .dll file\n" msgstr " --csharp modo C#: gera um ficheiro .NET .dll\n" -#: src/msgfmt.c:685 +#: src/msgfmt.c:935 #, c-format msgid "" " --csharp-resources C# resources mode: generate a .NET .resources " @@ -2309,14 +2323,14 @@ " --csharp-resources modo de recursos C#: gera um ficheiro .NET " ".resources\n" -#: src/msgfmt.c:687 +#: src/msgfmt.c:937 #, c-format msgid "" " --tcl Tcl mode: generate a tcl/msgcat .msg file\n" msgstr "" " --tcl modo Tcl: gera um ficheiro tcl/msgcat .msg\n" -#: src/msgfmt.c:689 +#: src/msgfmt.c:939 #, c-format msgid " --qt Qt mode: generate a Qt .qm file\n" msgstr " --qt modo Qt: gera um ficheiro Qt .qm\n" @@ -2334,28 +2348,28 @@ msgid " --xml XML mode: generate XML file\n" msgstr " --xml modo XML: gera um ficheiro XML\n" -#: src/msgfmt.c:696 +#: src/msgfmt.c:950 #, c-format msgid " --strict enable strict Uniforum mode\n" msgstr " --strict activa o modo estritamente Uniforum\n" -#: src/msgfmt.c:698 src/xgettext.c:850 +#: src/msgfmt.c:952 src/xgettext.c:1084 #, c-format msgid "If output file is -, output is written to standard output.\n" msgstr "Se o ficheiro de saída for -, a saída é escrita na saída padrão.\n" -#: src/msgfmt.c:701 +#: src/msgfmt.c:955 #, c-format msgid "Output file location in Java mode:\n" msgstr "Localização do ficheiro de saída em modo Java:\n" -#: src/msgfmt.c:703 src/msgfmt.c:717 src/msgunfmt.c:458 src/msgunfmt.c:469 +#: src/msgfmt.c:957 src/msgfmt.c:973 src/msgunfmt.c:456 src/msgunfmt.c:467 #, c-format msgid " -r, --resource=RESOURCE resource name\n" msgstr " -r, --resource=RECURSO nome do recurso\n" -#: src/msgfmt.c:705 src/msgfmt.c:719 src/msgfmt.c:729 src/msgunfmt.c:460 -#: src/msgunfmt.c:471 src/msgunfmt.c:481 +#: src/msgfmt.c:959 src/msgfmt.c:975 src/msgfmt.c:985 src/msgfmt.c:995 +#: src/msgfmt.c:1012 src/msgunfmt.c:458 src/msgunfmt.c:469 src/msgunfmt.c:479 #, c-format msgid "" " -l, --locale=LOCALE locale name, either language or " @@ -2373,14 +2387,14 @@ " --source produz um ficheiro .java, em vez de um " "ficheiro .class\n" -#: src/msgfmt.c:707 +#: src/msgfmt.c:963 #, c-format msgid "" " -d DIRECTORY base directory of classes directory hierarchy\n" msgstr "" " -d PASTA pasta base da hierarquia de pastas de classe\n" -#: src/msgfmt.c:709 +#: src/msgfmt.c:965 #, c-format msgid "" "The class name is determined by appending the locale name to the resource " @@ -2393,12 +2407,12 @@ "separado por um sublinhado. A opão -d é obrigatória. A classe á escrita\n" "sob a pasta especificada.\n" -#: src/msgfmt.c:715 +#: src/msgfmt.c:971 #, c-format msgid "Output file location in C# mode:\n" msgstr "Localização do ficheiro de saída em modo C#:\n" -#: src/msgfmt.c:721 src/msgunfmt.c:473 +#: src/msgfmt.c:977 src/msgunfmt.c:471 #, c-format msgid "" " -d DIRECTORY base directory for locale dependent .dll " @@ -2407,7 +2421,7 @@ " -d PASTA pasta base para ficheiros .dll dependentes de " "idioma\n" -#: src/msgfmt.c:723 +#: src/msgfmt.c:979 #, c-format msgid "" "The -l and -d options are mandatory. The .dll file is written in a\n" @@ -2416,19 +2430,19 @@ "As opções -l e -d são obrigatórias. O ficheiro .dll é escrito numa\n" "sub-pasta da pasta especificada, cujo nome depende do idioma.\n" -#: src/msgfmt.c:727 +#: src/msgfmt.c:983 #, c-format msgid "Output file location in Tcl mode:\n" msgstr "Localização do ficheiro de saída em modo Tcl:\n" -#: src/msgfmt.c:731 src/msgunfmt.c:483 +#: src/msgfmt.c:987 src/msgunfmt.c:481 #, c-format msgid "" " -d DIRECTORY base directory of .msg message catalogs\n" msgstr "" " -d PASTA pasta base para catálogos de mensagens .msg\n" -#: src/msgfmt.c:733 +#: src/msgfmt.c:989 #, c-format msgid "" "The -l and -d options are mandatory. The .msg file is written in the\n" @@ -2453,7 +2467,7 @@ msgid " -d DIRECTORY base directory of .po files\n" msgstr " -d PASTA pasta base para ficheiros .po\n" -#: src/xgettext.c:894 +#: src/msgfmt.c:1003 src/xgettext.c:1138 #, c-format msgid "" " -kWORD, --keyword=WORD look for WORD as an additional keyword\n" @@ -2489,12 +2503,12 @@ msgid " --template=TEMPLATE an XML file used as a template\n" msgstr " --template=MODELO um ficheiro XML usado como modelo\n" -#: src/msgfmt.c:745 src/xgettext.c:866 +#: src/msgfmt.c:1034 src/xgettext.c:1101 #, c-format msgid "Input file interpretation:\n" msgstr "Interpretação do ficheiro de entrada:\n" -#: src/msgfmt.c:747 +#: src/msgfmt.c:1036 #, c-format msgid "" " -c, --check perform all the checks implied by\n" @@ -2505,7 +2519,7 @@ " --check-format, --check-header, --check-" "domain\n" -#: src/msgfmt.c:750 +#: src/msgfmt.c:1039 #, c-format msgid "" " --check-format check language dependent format strings\n" @@ -2513,7 +2527,7 @@ " --check-format testa cadeias por formato dependente do " "idioma\n" -#: src/msgfmt.c:752 +#: src/msgfmt.c:1041 #, c-format msgid "" " --check-header verify presence and contents of the header " @@ -2522,7 +2536,7 @@ " --check-header verifica a presença e conteúdo da entrada de " "cabeçalho\n" -#: src/msgfmt.c:754 +#: src/msgfmt.c:1043 #, c-format msgid "" " --check-domain check for conflicts between domain directives\n" @@ -2531,7 +2545,7 @@ " --check-domain testa conflitos entre directivas de domínio\n" " e a opção --output-file\n" -#: src/msgfmt.c:757 +#: src/msgfmt.c:1046 #, c-format msgid "" " -C, --check-compatibility check that GNU msgfmt behaves like X/Open " @@ -2540,7 +2554,7 @@ " -C, --check-compatibility verifica se GNU msgfmt se comporta como X/Open " "msgfmt\n" -#: src/msgfmt.c:759 +#: src/msgfmt.c:1048 #, c-format msgid "" " --check-accelerators[=CHAR] check presence of keyboard accelerators " @@ -2551,12 +2565,12 @@ "para\n" " itens de menu\n" -#: src/msgfmt.c:762 +#: src/msgfmt.c:1051 #, c-format msgid " -f, --use-fuzzy use fuzzy entries in output\n" msgstr " -f, --use-fuzzy usa entradas aproximadas na saída\n" -#: src/msgfmt.c:767 +#: src/msgfmt.c:1056 #, c-format msgid "" " -a, --alignment=NUMBER align strings to NUMBER bytes (default: %d)\n" @@ -2577,7 +2591,7 @@ " (big ou little, a predefinição depende da " "plataforma)\n" -#: src/msgfmt.c:772 +#: src/msgfmt.c:1061 #, c-format msgid "" " --no-hash binary file will not include the hash table\n" @@ -2585,22 +2599,22 @@ " --no-hash o ficheiro binário não inclui a tabela de " "hash\n" -#: src/msgfmt.c:781 +#: src/msgfmt.c:1070 #, c-format msgid " --statistics print statistics about translations\n" msgstr " --statistics mostra estatísticas da tradução\n" -#: src/msgfmt.c:783 src/msgmerge.c:607 src/msgunfmt.c:533 +#: src/msgfmt.c:1072 src/msgmerge.c:668 src/msgunfmt.c:531 src/xgettext.c:1239 #, c-format msgid " -v, --verbose increase verbosity level\n" msgstr " -v, --verbose aumenta a verbosidade\n" -#: src/msgfmt.c:897 +#: src/msgfmt.c:1188 #, c-format msgid "warning: PO file header missing or invalid\n" msgstr "cuidado: cabeçalho do ficheiro PO em falta ou inválido\n" -#: src/msgfmt.c:900 +#: src/msgfmt.c:1190 #, c-format msgid "warning: charset conversion will not work\n" msgstr "aviso: a conversão do conjunto de caracteres não vai funcionar\n" @@ -2620,7 +2634,7 @@ msgid "fuzzy 'msgstr' entry ignored" msgstr "entrada \"msgstr\" aproximada ignorada" -#: src/msgfmt.c:1065 +#: src/msgfmt.c:1342 #, c-format msgid "%s: warning: source file contains fuzzy translation" msgstr "%s: aviso: o ficheiro fonte contém traduções aproximadas" @@ -2635,7 +2649,7 @@ msgid "%s exists but cannot read" msgstr "%s existe mas não está legível" -#: src/msggrep.c:496 +#: src/msggrep.c:495 #, c-format msgid "" "option '%c' cannot be used before 'J' or 'K' or 'T' or 'C' or 'X' has been " @@ -2644,7 +2658,7 @@ "opção \"%c\" não pode ser usada antes de \"J\", \"K\", \"T\", \"C\" or \"X\" " "terem sido especificadas" -#: src/msggrep.c:516 +#: src/msggrep.c:515 #, c-format, no-wrap msgid "" "Extracts all messages of a translation catalog that match a given pattern\n" @@ -2654,7 +2668,7 @@ "padrão\n" "ou que pertençam a alguns dados ficheiros-fonte.\n" -#: src/msggrep.c:542 +#: src/msggrep.c:541 #, c-format, no-wrap msgid "" "Message selection:\n" @@ -2746,7 +2760,7 @@ "critério\n" " de selecção\n" -#: src/msggrep.c:597 +#: src/msggrep.c:596 #, c-format msgid "" " --escape use C escapes in output, no extended chars\n" @@ -2754,12 +2768,12 @@ " --escape usa escapes C na saída, não caracteres " "estendidos\n" -#: src/msggrep.c:618 +#: src/msggrep.c:617 #, c-format msgid " --sort-output generate sorted output\n" msgstr " --sort-output gera saída ordenada\n" -#: src/msggrep.c:620 +#: src/msggrep.c:619 #, c-format msgid " --sort-by-file sort output by file location\n" msgstr "" @@ -2778,7 +2792,7 @@ "<%s>.\n" "Isto é necessário se quiser testar as suas traduções.\n" -#: src/msginit.c:321 +#: src/msginit.c:326 #, c-format msgid "" "Output file %s already exists.\n" @@ -2789,12 +2803,12 @@ "Por favor, especifique o idioma via opção --locale ou\n" "o ficheiro PO de saída via opção --output-file.\n" -#: src/msginit.c:347 +#: src/msginit.c:394 #, c-format msgid "Created %s.\n" msgstr "Criado %s.\n" -#: src/msginit.c:367 +#: src/msginit.c:414 #, c-format, no-wrap msgid "" "Creates a new PO file, initializing the meta information with values from " @@ -2804,12 +2818,12 @@ "Cria um novo ficheiro PO, inicializando a meta-informação com valores do\n" "ambiente do utilizador.\n" -#: src/msginit.c:377 +#: src/msginit.c:424 #, c-format msgid " -i, --input=INPUTFILE input POT file\n" msgstr " -i, --input=FICHENTRADA ficheiro de entrada POT\n" -#: src/msginit.c:379 +#: src/msginit.c:426 #, c-format msgid "" "If no input file is given, the current directory is searched for the POT " @@ -2819,13 +2833,13 @@ "Se não for dado nenhum ficheiro de entrada, é procurado um ficheiro POT na\n" "pasta actual. Se for -, é lida a entrada padrão.\n" -#: src/msginit.c:385 +#: src/msginit.c:432 #, c-format msgid " -o, --output-file=FILE write output to specified PO file\n" msgstr "" " -o, --output-file=FICHEIRO escreve a saída no ficheiro PO especificado\n" -#: src/msginit.c:387 +#: src/msginit.c:434 #, c-format msgid "" "If no output file is given, it depends on the --locale option or the user's\n" @@ -2841,7 +2855,7 @@ msgid " -l, --locale=LL_CC[.ENCODING] set target locale\n" msgstr " -l, --locale=LL_CC[.ENCODING] define o idioma alvo\n" -#: src/msginit.c:402 +#: src/msginit.c:449 #, c-format msgid "" " --no-translator assume the PO file is automatically generated\n" @@ -2849,7 +2863,7 @@ " --no-translator assume que o ficheiro PO é automaticamente " "gerado\n" -#: src/msginit.c:468 +#: src/msginit.c:519 msgid "" "Found more than one .pot file.\n" "Please specify the input .pot file through the --input option.\n" @@ -2857,12 +2871,12 @@ "Encontrados vários ficheiros POT.\n" "Por favor, especifique o ficheiro de entrada POT via opção --input.\n" -#: src/msginit.c:476 src/msginit.c:481 +#: src/msginit.c:527 src/msginit.c:532 #, c-format msgid "error reading current directory" msgstr "erro ao ler a pasta actual" -#: src/msginit.c:489 +#: src/msginit.c:540 msgid "" "Found no .pot file in the current directory.\n" "Please specify the input .pot file through the --input option.\n" @@ -2870,14 +2884,15 @@ "Sem ficheiros POT na pasta actual.\n" "Por favor, especifique o ficheiro de entrada POT via opção --input.\n" -#: src/msginit.c:918 src/msginit.c:993 src/msginit.c:1153 src/msginit.c:1248 -#: src/read-csharp.c:83 src/read-java.c:81 src/read-resources.c:84 -#: src/read-tcl.c:127 src/write-resources.c:104 +#: src/msginit.c:976 src/msginit.c:1059 src/msginit.c:1228 src/msginit.c:1330 +#: src/msginit.c:1511 src/read-csharp.c:83 src/read-java.c:82 +#: src/read-resources.c:84 src/read-tcl.c:128 src/write-resources.c:106 +#: src/x-ruby.c:146 #, c-format msgid "%s subprocess failed with exit code %d" msgstr "sub-processo %s falhou com código de saída %d" -#: src/msginit.c:1118 +#: src/msginit.c:1193 msgid "" "The new message catalog should contain your email address, so that users " "can\n" @@ -2894,18 +2909,18 @@ #. TRANSLATORS: "English" needs to be replaced by your language. #. For example in it.po write "Traduzioni italiani ...", #. *not* "Traduzioni inglesi ...". -#: src/msginit.c:1534 +#: src/msginit.c:1706 #, c-format msgid "English translations for %s package" msgstr "Tradução portuguesa (Portugal) para o pacote %s" -#: src/msgl-cat.c:177 src/msgl-charset.c:86 src/msgl-iconv.c:247 +#: src/msgl-cat.c:178 src/msgl-charset.c:86 src/msgl-iconv.c:244 #, c-format msgid "present charset \"%s\" is not a portable encoding name" msgstr "" "conjunto de caracteres actual \"%s\" não é um nome de codificação portátil." -#: src/msgl-cat.c:188 src/msgl-iconv.c:259 +#: src/msgl-cat.c:188 src/msgl-iconv.c:255 #, c-format msgid "two different charsets \"%s\" and \"%s\" in input file" msgstr "" @@ -2933,20 +2948,20 @@ msgid "msgid '%s' is used without plural and with plural." msgstr "" -#: src/msgl-cat.c:391 src/msgl-iconv.c:375 +#: src/msgl-cat.c:403 src/msgl-iconv.c:363 #, c-format msgid "target charset \"%s\" is not a portable encoding name." msgstr "" "conjunto de caracteres alvo \"%s\" não é um nome de codificação portátil." -#: src/msgl-cat.c:442 src/msgl-cat.c:448 src/msgl-charset.c:92 -#: src/msgl-charset.c:127 src/po-xerror.c:121 src/po-xerror.c:146 -#: src/xgettext.c:3016 +#: src/msgl-cat.c:454 src/msgl-cat.c:460 src/msgl-charset.c:91 +#: src/msgl-charset.c:126 src/po-xerror.c:127 src/po-xerror.c:152 +#: src/xgettext.c:584 src/xgettext.c:1988 src/xg-message.c:335 #, c-format msgid "warning: " msgstr "aviso: " -#: src/msgl-cat.c:443 +#: src/msgl-cat.c:455 #, c-format msgid "" "Input files contain messages in different encodings, UTF-8 among others.\n" @@ -2956,7 +2971,7 @@ "outras.\n" "A converter a saída para UTF-8.\n" -#: src/msgl-cat.c:449 +#: src/msgl-cat.c:461 #, c-format msgid "" "Input files contain messages in different encodings, %s and %s among " @@ -2969,7 +2984,7 @@ "A converter a saída para UTF-8.\n" "Para seleccionar uma codificação de saída diferente, use a opção --to-code.\n" -#: src/msgl-cat.c:488 +#: src/msgl-cat.c:500 #, c-format msgid "" "Conversion of file %s from %s encoding to %s encoding\n" @@ -2982,7 +2997,7 @@ "Ou altera todas as msgids e msgctxts para puro ASCII, ou garante que são\n" "codificadas em UTF-8 desde o princípio, i.e. já nos seus ficheiros-fonte.\n" -#: src/msgl-charset.c:93 +#: src/msgl-charset.c:92 #, c-format msgid "" "Locale charset \"%s\" is different from\n" @@ -2995,12 +3010,12 @@ "A saída de \"%s\" poderá ser incorrecta.\n" "Possíveis formas de contornar a situação:\n" -#: src/msgl-charset.c:100 +#: src/msgl-charset.c:99 #, c-format msgid "- Set LC_ALL to a locale with encoding %s.\n" msgstr "- definir LC_ALL como um idioma com codificação %s.\n" -#: src/msgl-charset.c:105 +#: src/msgl-charset.c:104 #, c-format msgid "" "- Convert the translation catalog to %s using 'msgconv',\n" @@ -3011,7 +3026,7 @@ " e depois aplicar \"%s\", seguido de nova\n" " conversão %s com \"msgconv\".\n" -#: src/msgl-charset.c:114 +#: src/msgl-charset.c:113 #, c-format msgid "" "- Set LC_ALL to a locale with encoding %s,\n" @@ -3024,7 +3039,7 @@ " e depois aplicar \"%s\", seguido de nova\n" " conversão %s com \"msgconv\".\n" -#: src/msgl-charset.c:128 +#: src/msgl-charset.c:127 #, c-format msgid "" "Locale charset \"%s\" is not a portable encoding name.\n" @@ -3036,11 +3051,11 @@ "A saída de \"%s\" poderá ser incorrecta. Poderá contornar\n" "a situação definindo LC_ALL=C\n" -#: src/msgl-check.c:130 +#: src/msgl-check.c:134 msgid "plural expression can produce negative values" msgstr "a expressão plural poderá produzir valores negativos" -#: src/msgl-check.c:141 +#: src/msgl-check.c:145 #, c-format msgid "" "nplurals = %lu but plural expression can produce values as large as %lu" @@ -3048,15 +3063,15 @@ "nplurals = %lu mas a expressão plural poderá produzir valores tão grandes " "como %lu" -#: src/msgl-check.c:187 +#: src/msgl-check.c:191 msgid "plural expression can produce division by zero" msgstr "a expressão plural poderá produzir divisões por zero" -#: src/msgl-check.c:192 +#: src/msgl-check.c:196 msgid "plural expression can produce integer overflow" msgstr "a expressão plural poderá produzir transporte de inteiros" -#: src/msgl-check.c:197 +#: src/msgl-check.c:201 msgid "" "plural expression can produce arithmetic exceptions, possibly division by " "zero" @@ -3064,51 +3079,51 @@ "a expressão plural poderá produzir excepções aritméticas, possivelmente " "divisão por zero" -#: src/msgl-check.c:266 +#: src/msgl-check.c:270 #, c-format msgid "Try using the following, valid for %s:" msgstr "Tente usar o seguinte, válido para %s:" -#: src/msgl-check.c:358 src/msgl-check.c:382 +#: src/msgl-check.c:362 src/msgl-check.c:386 msgid "message catalog has plural form translations" msgstr "o catálogo de mensagens tem traduções da forma plural" -#: src/msgl-check.c:360 +#: src/msgl-check.c:364 msgid "but header entry lacks a \"plural=EXPRESSION\" attribute" msgstr "mas o cabeçalho tem o atributo \"plural=EXPRESSÃO\" em falta" -#: src/msgl-check.c:384 +#: src/msgl-check.c:388 msgid "but header entry lacks a \"nplurals=INTEGER\" attribute" msgstr "mas o cabeçalho tem o atributo \"nplurals=INTEIRO\" em falta" -#: src/msgl-check.c:420 +#: src/msgl-check.c:424 msgid "invalid nplurals value" msgstr "vlaor nplurals inválido" -#: src/msgl-check.c:442 +#: src/msgl-check.c:446 msgid "invalid plural expression" msgstr "expressão de plural inválida" -#: src/msgl-check.c:472 src/msgl-check.c:488 +#: src/msgl-check.c:476 src/msgl-check.c:492 #, c-format msgid "nplurals = %lu" msgstr "nplurals = %lu" -#: src/msgl-check.c:474 +#: src/msgl-check.c:478 #, c-format msgid "but some messages have only one plural form" msgid_plural "but some messages have only %lu plural forms" msgstr[0] "mas algumas mensagens têm apenas uma forma plural" msgstr[1] "mas algumas mensagens têm apenas %lu formas plurais" -#: src/msgl-check.c:490 +#: src/msgl-check.c:494 #, c-format msgid "but some messages have one plural form" msgid_plural "but some messages have %lu plural forms" msgstr[0] "mas algumas mensagens têm uma forma plural" msgstr[1] "mas algumas mensagens têm %lu formas plurais" -#: src/msgl-check.c:514 +#: src/msgl-check.c:518 msgid "" "message catalog has plural form translations, but lacks a header entry with " "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\"" @@ -3146,16 +3161,16 @@ msgid "'msgid' and 'msgstr' entries do not both end with '\\n'" msgstr "as entradas \"msgid\" e \"msgstr\" não terminam ambas por \"\\n\"" -#: src/msgl-check.c:687 +#: src/msgl-check.c:692 msgid "plural handling is a GNU gettext extension" msgstr "a gestão de plurais é uma extensão GNU gettext" -#: src/msgl-check.c:729 +#: src/msgl-check.c:733 #, c-format msgid "msgstr lacks the keyboard accelerator mark '%c'" msgstr "msgstr tem a marca de acelerador \"%c\" em falta" -#: src/msgl-check.c:739 +#: src/msgl-check.c:744 #, c-format msgid "msgstr has too many keyboard accelerator marks '%c'" msgstr "msgstr tem demasiados marcas de acelerador \"%c\"" @@ -3191,25 +3206,25 @@ msgid "ASCII bullet ('%c') instead of Unicode" msgstr "marca ASCII (\"%c\") em vez de Unicode" -#: src/msgl-iconv.c:65 +#: src/msgl-iconv.c:62 #, c-format msgid "%s: input is not valid in \"%s\" encoding" msgstr "%s: entrada inválida em codificação \"%s\"" -#: src/msgl-iconv.c:69 +#: src/msgl-iconv.c:66 #, c-format msgid "%s: error while converting from \"%s\" encoding to \"%s\" encoding" msgstr "" "%s: erro ao converter da codificação \"%s\" para a codificação \"%s\"" -#: src/msgl-iconv.c:290 +#: src/msgl-iconv.c:285 msgid "" "input file doesn't contain a header entry with a charset specification" msgstr "" "ficheiro de entrada sem especificação de conjunto de caracteres no cabeçalho" -#: src/msgl-iconv.c:305 src/recode-sr-latin.c:288 src/recode-sr-latin.c:293 -#: src/x-python.c:623 src/xgettext.c:693 +#: src/msgl-iconv.c:299 src/recode-sr-latin.c:291 src/recode-sr-latin.c:295 +#: src/xgettext.c:807 src/x-python.c:624 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(), and iconv() does " @@ -3218,7 +3233,7 @@ "Impossível converter de \"%s\" para \"%s\". %s depende de iconv() e iconv() " "não suporta esta conversão." -#: src/msgl-iconv.c:335 +#: src/msgl-iconv.c:327 #, c-format msgid "" "Conversion from \"%s\" to \"%s\" introduces duplicates: some different " @@ -3227,8 +3242,8 @@ "Conversão de \"%s\" para \"%s\" introduz duplicados: algumas msgids " "diferentes tornam-se iguais." -#: src/msgl-iconv.c:341 src/recode-sr-latin.c:302 src/x-python.c:630 -#: src/xgettext.c:700 +#: src/msgl-iconv.c:331 src/recode-sr-latin.c:303 src/xgettext.c:813 +#: src/x-python.c:630 #, c-format msgid "" "Cannot convert from \"%s\" to \"%s\". %s relies on iconv(). This version was " @@ -3237,16 +3252,16 @@ "Impossível converter de \"%s\" para \"%s\". %s depende de iconv(). Esta " "versão foi compilada sem iconv()." -#: src/msgmerge.c:383 src/msgmerge.c:389 +#: src/msgmerge.c:424 src/msgmerge.c:430 #, c-format msgid "%s is only valid with %s" msgstr "%s só é válido com %s" -#: src/msgmerge.c:448 +#: src/msgmerge.c:506 msgid "backup type" msgstr "tipo de segurança" -#: src/msgmerge.c:485 +#: src/msgmerge.c:543 #, c-format, no-wrap msgid "" "Merges two Uniforum style .po files together. The def.po file is an\n" @@ -3274,18 +3289,18 @@ "exacta, é usada correspondência aproximada para produzir melhores " "resultados.\n" -#: src/msgmerge.c:502 +#: src/msgmerge.c:560 #, c-format msgid " def.po translations referring to old sources\n" msgstr "" " def.po traduções referentes a fontes antigas\n" -#: src/msgmerge.c:504 +#: src/msgmerge.c:562 #, c-format msgid " ref.pot references to new sources\n" msgstr " ref.pot referências a novas fontes\n" -#: src/msgmerge.c:508 +#: src/msgmerge.c:566 #, c-format msgid "" " -C, --compendium=FILE additional library of message translations,\n" @@ -3295,7 +3310,7 @@ "mensagens,\n" " pode ser especificada mais de uma vez\n" -#: src/msgmerge.c:514 +#: src/msgmerge.c:572 #, c-format msgid "" " -U, --update update def.po,\n" @@ -3304,28 +3319,28 @@ " -U, --update actualiza def.po,\n" " não faz nada se def.po já estiver actualizado\n" -#: src/msgmerge.c:526 +#: src/msgmerge.c:584 #, c-format msgid "Output file location in update mode:\n" msgstr "Localização do ficheiro de saída em modo de actualização:\n" -#: src/msgmerge.c:528 +#: src/msgmerge.c:586 #, c-format msgid "The result is written back to def.po.\n" msgstr "O resultado é escrito de novo em def.po\n" -#: src/msgmerge.c:530 +#: src/msgmerge.c:588 #, c-format msgid " --backup=CONTROL make a backup of def.po\n" msgstr " --backup=CONTROL faz uma segurança de def.po\n" -#: src/msgmerge.c:532 +#: src/msgmerge.c:590 #, c-format msgid " --suffix=SUFFIX override the usual backup suffix\n" msgstr "" " --suffix=SUFFIX sobrescreve o sufixo habitual de seguranças\n" -#: src/msgmerge.c:534 +#: src/msgmerge.c:592 #, c-format msgid "" "The version control method may be selected via the --backup option or " @@ -3364,7 +3379,7 @@ " --for-msgfmt produz saída para \"%s\", não para um " "tradutor\n" -#: src/msgmerge.c:552 +#: src/msgmerge.c:613 #, c-format msgid "" " --previous keep previous msgids of translated messages\n" @@ -3372,22 +3387,22 @@ " --previous mantém msgids anteriores das mensagens " "traduzidas\n" -#: src/msgmerge.c:609 src/urlget.c:192 +#: src/msgmerge.c:670 src/urlget.c:189 #, c-format msgid " -q, --quiet, --silent suppress progress indicators\n" msgstr " -q, --quiet, --silent suprime indicadores de progresso\n" -#: src/msgmerge.c:1604 +#: src/msgmerge.c:1687 #, c-format msgid "this message should define plural forms" msgstr "" -#: src/msgmerge.c:1627 +#: src/msgmerge.c:1708 #, c-format msgid "this message should not define plural forms" msgstr "" -#: src/msgmerge.c:2030 +#: src/msgmerge.c:2112 #, c-format msgid "" "%sRead %ld old + %ld reference, merged %ld, fuzzied %ld, missing %ld, " @@ -3396,23 +3411,23 @@ "%sLidas %ld antigas + %ld referências, unidas %ld, aproximadas %ld, faltam " "%ld, obsoletas %ld.\n" -#: src/msgunfmt.c:308 src/msgunfmt.c:317 src/msgunfmt.c:340 +#: src/msgunfmt.c:306 src/msgunfmt.c:315 src/msgunfmt.c:338 #, c-format msgid "%s and explicit file names are mutually exclusive" msgstr "" -#: src/msgunfmt.c:427 +#: src/msgunfmt.c:425 #, c-format msgid "Usage: %s [OPTION] [FILE]...\n" msgstr "Uso: %s [OPÇÃO] [FICHEIRO]...\n" -#: src/msgunfmt.c:431 +#: src/msgunfmt.c:429 #, c-format msgid "Convert binary message catalog to Uniforum style .po file.\n" msgstr "" "Converter catálogo de mensagens binário para ficheiro PO estilo Uniforum.\n" -#: src/msgunfmt.c:440 +#: src/msgunfmt.c:438 #, c-format msgid "" " -j, --java Java mode: input is a Java ResourceBundle " @@ -3421,13 +3436,13 @@ " -j, --java modo Java: a entrada é uma classe Java " "ResourceBundle\n" -#: src/msgunfmt.c:442 +#: src/msgunfmt.c:440 #, c-format msgid " --csharp C# mode: input is a .NET .dll file\n" msgstr "" " --csharp modo C#: a entrada é um ficheiro .NET .dll\n" -#: src/msgunfmt.c:444 +#: src/msgunfmt.c:442 #, c-format msgid "" " --csharp-resources C# resources mode: input is a .NET .resources " @@ -3436,7 +3451,7 @@ " --csharp-resources modo Recursos C#: a entrada é um ficheiro .NET " ".resources\n" -#: src/msgunfmt.c:446 +#: src/msgunfmt.c:444 #, c-format msgid "" " --tcl Tcl mode: input is a tcl/msgcat .msg file\n" @@ -3444,17 +3459,17 @@ " --tcl modo Tcl: a entrada é um ficheiro tcl/msgcat " ".msg\n" -#: src/msgunfmt.c:451 +#: src/msgunfmt.c:449 #, c-format msgid " FILE ... input .mo files\n" msgstr " FICHEIRO a entrada é um FICHEIRO .mo\n" -#: src/msgunfmt.c:456 +#: src/msgunfmt.c:454 #, c-format msgid "Input file location in Java mode:\n" msgstr "Localização do ficheiro de entrada em modo Java:\n" -#: src/msgunfmt.c:462 +#: src/msgunfmt.c:460 #, c-format msgid "" "The class name is determined by appending the locale name to the resource " @@ -3465,12 +3480,12 @@ "recurso,\n" "separado por um sublinhado. A classe é localizada usando CLASSPATH.\n" -#: src/msgunfmt.c:467 +#: src/msgunfmt.c:465 #, c-format msgid "Input file location in C# mode:\n" msgstr "Localização do ficheiro de entrada em modo C#:\n" -#: src/msgunfmt.c:475 +#: src/msgunfmt.c:473 #, c-format msgid "" "The -l and -d options are mandatory. The .dll file is located in a\n" @@ -3479,12 +3494,12 @@ "As opções -l e -d são obrigatórias. O ficheiro .dll está localizado numa\n" "sub-pasta da pasta especificada, cujo nome depende do idioma.\n" -#: src/msgunfmt.c:479 +#: src/msgunfmt.c:477 #, c-format msgid "Input file location in Tcl mode:\n" msgstr "Localização do ficheiro de entrada em modo Tcl\n" -#: src/msgunfmt.c:485 +#: src/msgunfmt.c:483 #, c-format msgid "" "The -l and -d options are mandatory. The .msg file is located in the\n" @@ -3493,18 +3508,18 @@ "As opções -l e -d são obrigatórias. O ficheiro .msg está localizado na\n" "pasta especificada.\n" -#: src/msgunfmt.c:511 +#: src/msgunfmt.c:509 #, c-format msgid " -i, --indent write indented output style\n" msgstr " -i, --indent escreve em estilo de saída indentado\n" -#: src/msgunfmt.c:513 +#: src/msgunfmt.c:511 #, c-format msgid " --strict write strict uniforum style\n" msgstr "" " --strict escreve em estilo estritamente Uniforum\n" -#: src/msguniq.c:330 +#: src/msguniq.c:329 #, c-format, no-wrap msgid "" "Unifies duplicate translations in a translation catalog.\n" @@ -3529,12 +3544,12 @@ "opção\n" "--unique, os duplicados são descartados.\n" -#: src/msguniq.c:363 +#: src/msguniq.c:362 #, c-format msgid " -d, --repeated print only duplicates\n" msgstr " -d, --repeated imprime só duplicados\n" -#: src/msguniq.c:365 +#: src/msguniq.c:364 #, c-format msgid "" " -u, --unique print only unique messages, discard " @@ -3548,7 +3563,7 @@ msgid "" msgstr "" -#: src/po-charset.c:489 +#: src/po-charset.c:491 #, c-format msgid "" "Charset \"%s\" is not a portable encoding name.\n" @@ -3557,7 +3572,7 @@ "O conjunto de caracteres \"%s\" não é um nome de codificação portátil. A\n" "conversão para o conjunto de caracteres do utilizador poderá não resultar.\n" -#: src/po-charset.c:557 +#: src/po-charset.c:566 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv(),\n" @@ -3566,7 +3581,7 @@ "Conjunto de caracteres \"%s\" não suportado. %s depende de iconv(),\n" "e o iconv() não suporta \"%s\".\n" -#: src/po-charset.c:564 src/po-charset.c:612 +#: src/po-charset.c:572 src/po-charset.c:627 msgid "" "Installing GNU libiconv and then reinstalling GNU gettext\n" "would fix this problem.\n" @@ -3574,15 +3589,15 @@ "Instalar GNU libiconv e depois reinstalar o GNU gettext\n" "deve resolver o problema.\n" -#: src/po-charset.c:578 src/po-charset.c:616 +#: src/po-charset.c:586 src/po-charset.c:631 msgid "Continuing anyway, expect parse errors." msgstr "A continuar na mesma, espere erros de análise." -#: src/po-charset.c:580 +#: src/po-charset.c:588 msgid "Continuing anyway." msgstr "A continuar na mesma." -#: src/po-charset.c:607 +#: src/po-charset.c:622 #, c-format msgid "" "Charset \"%s\" is not supported. %s relies on iconv().\n" @@ -3591,7 +3606,7 @@ "Conjunto de caracteres \"%s\" não suportado. %s depende de iconv().\n" "Esta versão foi compilada sem o iconv().\n" -#: src/po-charset.c:644 +#: src/po-charset.c:659 msgid "" "Charset missing in header.\n" "Message conversion to user's charset will not work.\n" @@ -3599,7 +3614,7 @@ "Conjunto de caracteres em falta no cabeçalho. A conversão\n" "para o conjunto de caracteres do utilizador não vai resultar.\n" -#: src/po-gram-gen.y:93 +#: src/po-gram-gen.y:47 #, c-format msgid "inconsistent use of #~" msgstr "uso inconsistente de #~" @@ -3619,17 +3634,17 @@ msgid "missing 'msgstr' section" msgstr "secção \"msgstr\" em falta" -#: src/po-gram-gen.y:396 +#: src/po-gram-gen.y:356 #, c-format msgid "first plural form has nonzero index" msgstr "primeira forma plural tem índice não zero" -#: src/po-gram-gen.y:398 +#: src/po-gram-gen.y:358 #, c-format msgid "plural form has wrong index" msgstr "forma plural com índice errado" -#: src/po-lex.c:437 src/po-lex.c:507 src/write-po.c:740 src/write-po.c:869 +#: src/po-lex.c:437 src/po-lex.c:505 src/write-po.c:812 src/write-po.c:949 #, c-format msgid "invalid multibyte sequence" msgstr "sequência multi-byte inválida" @@ -3639,50 +3654,50 @@ msgid "incomplete multibyte sequence at end of file" msgstr "sequência multi-byte incompleta no fim do ficheiro" -#: src/po-lex.c:475 +#: src/po-lex.c:474 #, c-format msgid "incomplete multibyte sequence at end of line" msgstr "sequência multi-byte incompleta no fim da linha" -#: src/po-lex.c:487 +#: src/po-lex.c:485 msgid "iconv failure" msgstr "iconv falhou" -#: src/po-lex.c:744 +#: src/po-lex.c:742 #, c-format msgid "keyword \"%s\" unknown" msgstr "palavra chave \"%s\" desconhecida" -#: src/po-lex.c:854 +#: src/po-lex.c:852 #, c-format msgid "invalid control sequence" msgstr "sequência de controlo inválida" -#: src/po-lex.c:981 +#: src/po-lex.c:979 #, c-format msgid "end-of-file within string" msgstr "fim-de-ficheiro dentro da cadeia" -#: src/po-lex.c:987 +#: src/po-lex.c:985 #, c-format msgid "end-of-line within string" msgstr "fim-de-linha dentro da cadeia" -#: src/po-lex.c:1008 +#: src/po-lex.c:1006 #, c-format msgid "context separator within string" msgstr "separador de contexto dentro da cadeia" -#: src/read-catalog.c:332 src/xgettext.c:1004 +#: src/read-catalog.c:325 src/xgettext.c:1262 #, c-format msgid "this file may not contain domain directives" msgstr "este ficheiro não pode conter directivas de domínio" -#: src/read-catalog.c:377 +#: src/read-catalog.c:370 msgid "duplicate message definition" msgstr "definição de mensagem duplicada" -#: src/read-catalog.c:379 +#: src/read-catalog.c:372 msgid "this is the location of the first definition" msgstr "este é o local da primeira definição" @@ -3703,12 +3718,12 @@ msgid "invalid non-blank line" msgstr "linha não-branca inválida" -#: src/read-mo.c:105 src/read-mo.c:126 src/read-mo.c:172 src/read-mo.c:199 +#: src/read-mo.c:108 src/read-mo.c:130 src/read-mo.c:168 src/read-mo.c:192 #, c-format msgid "file \"%s\" is truncated" msgstr "o ficheiro \"%s\" está truncado" -#: src/read-mo.c:129 +#: src/read-mo.c:133 #, c-format msgid "file \"%s\" contains a not NUL terminated string" msgstr "o ficheiro \"%s\" contém uma cadeia não terminada em NUL" @@ -3720,12 +3735,12 @@ "o ficheiro \"%s\" contém uma cadeia não terminada em NUL dependente do " "sistema" -#: src/read-mo.c:165 src/read-mo.c:274 +#: src/read-mo.c:184 src/read-mo.c:292 #, c-format msgid "file \"%s\" is not in GNU .mo format" msgstr "o ficheiro \"%s\" não está no formato .mo GNU" -#: src/read-mo.c:178 +#: src/read-mo.c:198 #, c-format msgid "file \"%s\" contains a not NUL terminated string, at %s" msgstr "" @@ -3762,7 +3777,7 @@ "the hash table." msgstr "" -#: src/read-properties.c:227 +#: src/read-properties.c:357 msgid "warning: invalid \\uxxxx syntax for Unicode character" msgstr "aviso: sintaxe \\uxxxx inválida para carácter Unicode" @@ -3787,7 +3802,7 @@ msgid "warning: unterminated key/value pair" msgstr "aviso: par chave/valor não terminado" -#: src/read-stringtable.c:939 +#: src/read-stringtable.c:940 msgid "warning: syntax error, expected ';' after string" msgstr "aviso: erro de sintaxe. esperado \";\" após a cadeia" @@ -3795,7 +3810,7 @@ msgid "warning: syntax error, expected '=' or ';' after string" msgstr "aviso: erro de sintaxe, esperado \"=\" ou \";\" após a cadeia" -#: src/recode-sr-latin.c:116 +#: src/recode-sr-latin.c:113 #, c-format msgid "Written by %s and %s.\n" msgstr "Escrito por %s e %s.\n" @@ -3804,16 +3819,16 @@ #. (with Unicode escapes) "\u0160egan" or (with HTML entities) #. "Šegan". #. This is a proper name. See the gettext manual, section Names. -#: src/recode-sr-latin.c:120 +#: src/recode-sr-latin.c:117 msgid "Danilo Segan" msgstr "Danilo Segan" -#: src/recode-sr-latin.c:153 +#: src/recode-sr-latin.c:150 #, c-format, no-wrap msgid "Recode Serbian text from Cyrillic to Latin script.\n" msgstr "Recodificar texto sérvio de cirílico para latim.\n" -#: src/recode-sr-latin.c:156 +#: src/recode-sr-latin.c:153 #, c-format, no-wrap msgid "" "The input text is read from standard input. The converted text is output " @@ -3824,27 +3839,27 @@ "na\n" "saída padrão.\n" -#: src/recode-sr-latin.c:339 +#: src/recode-sr-latin.c:338 #, c-format msgid "input is not valid in \"%s\" encoding" msgstr "entrada inválida na codificação \"%s\"" -#: src/recode-sr-latin.c:367 +#: src/recode-sr-latin.c:366 #, c-format msgid "error while converting from \"%s\" encoding to \"%s\" encoding" msgstr "erro ao converter da codificação \"%s\" para codificação \"%s\"" -#: src/urlget.c:159 +#: src/urlget.c:156 #, c-format msgid "expected two arguments" msgstr "esperava dois argumentos" -#: src/urlget.c:176 +#: src/urlget.c:173 #, c-format msgid "Usage: %s [OPTION] URL FILE\n" msgstr "Uso: %s [OPÇÃO] URL FICHEIRO\n" -#: src/urlget.c:181 +#: src/urlget.c:178 #, c-format, no-wrap msgid "" "Fetches and outputs the contents of an URL. If the URL cannot be accessed,\n" @@ -3853,37 +3868,37 @@ "Obtém e imprime o conteúdo de um URL. Se o URL não puder ser acedido, será " "usado o ficheiro localmente acessível.\n" -#: src/urlget.c:228 +#: src/urlget.c:229 #, c-format msgid "error reading \"%s\"" msgstr "erro ao ler \"%s\"" -#: src/urlget.c:234 +#: src/urlget.c:235 #, c-format msgid "error writing stdout" msgstr "Erro a escrever em stdout" -#: src/urlget.c:238 +#: src/urlget.c:239 #, c-format msgid "error after reading \"%s\"" msgstr "erro após a leitura de \"%s\"" -#: src/urlget.c:264 +#: src/urlget.c:269 #, c-format msgid "Retrieving %s..." msgstr "A obter %s..." -#: src/urlget.c:308 +#: src/urlget.c:302 #, c-format msgid " timed out.\n" msgstr " expirou.\n" -#: src/urlget.c:445 +#: src/urlget.c:442 #, c-format msgid " failed.\n" msgstr " falhou.\n" -#: src/write-catalog.c:126 +#: src/write-catalog.c:125 msgid "" "Cannot output multiple translation domains into a single file with the " "specified output format. Try using PO file syntax instead." @@ -3891,7 +3906,7 @@ "Impossível imprimir múltiplos domínios de tradução num só ficheiro com o " "formato especificado. Tente usar a sintaxe PO." -#: src/write-catalog.c:129 +#: src/write-catalog.c:128 msgid "" "Cannot output multiple translation domains into a single file with the " "specified output format." @@ -3899,7 +3914,7 @@ "Impossível imprimir múltiplos domínios de tradução num só ficheiro com o " "formato de saída especificado." -#: src/write-catalog.c:162 +#: src/write-catalog.c:161 msgid "" "message catalog has context dependent translations, but the output format " "does not support them." @@ -3907,7 +3922,7 @@ "O catálogo de mensagens tem traduções dependentes do contexto, mas o formato " "de saída não as suporta." -#: src/write-catalog.c:197 +#: src/write-catalog.c:196 msgid "" "message catalog has plural form translations, but the output format does not " "support them. Try generating a Java class using \"msgfmt --java\", instead " @@ -3917,7 +3932,7 @@ "saída não as suporta. Tente gerar uma classe Java com \"msgfmt --java\", em " "vexz de um ficheiro .properties" -#: src/write-catalog.c:202 +#: src/write-catalog.c:201 msgid "" "message catalog has plural form translations, but the output format does not " "support them." @@ -3925,38 +3940,38 @@ "O catálogo de mensagens com traduções com formas plurais, mas o formato de " "saída não as suporta." -#: src/write-catalog.c:231 src/write-catalog.c:275 +#: src/write-catalog.c:231 src/write-catalog.c:276 src/write-xml.c:59 #, c-format msgid "cannot create output file \"%s\"" msgstr "impossível criar o ficheiro de saída \"%s\"" -#: src/write-csharp.c:703 +#: src/write-csharp.c:708 #, c-format msgid "failed to create directory \"%s\"" msgstr "falha ao criar a pasta \"%s\"" -#: src/write-csharp.c:766 +#: src/write-csharp.c:771 #, c-format msgid "compilation of C# class failed, please try --verbose" msgstr "falha ao compilar a classe C#, por favor tente --verbose" -#: src/write-csharp.c:768 +#: src/write-csharp.c:773 #, c-format msgid "compilation of C# class failed" msgstr "falha ao compilar a classe C#" -#: src/write-java.c:1080 +#: src/write-java.c:1096 #, c-format msgid "not a valid Java class name: %s" msgstr "nome de classe Java inválido: %s" -#: src/write-java.c:1165 +#: src/write-java.c:1216 #, c-format msgid "compilation of Java class failed, please try --verbose or set $JAVAC" msgstr "" "falha ao compilar a classe Java, por favor tente --verbose ou defina $JAVAC" -#: src/write-java.c:1168 +#: src/write-java.c:1219 #, c-format msgid "compilation of Java class failed, please try to set $JAVAC" msgstr "falha ao compilar a classe Java, por favor tente definir $JAVAC" @@ -3973,7 +3988,7 @@ "as mensagens de internacionalização não devem conter a sequência de escape " "\"\\%c\"" -#: src/write-po.c:1254 src/write-po.c:1383 +#: src/write-po.c:1334 src/write-po.c:1502 #, c-format msgid "" "The following msgctxt contains non-ASCII characters.\n" @@ -3986,7 +4001,7 @@ "diferente da sua. Considere usar uma msgctxt ASCII pura ao invés.\n" "%s\n" -#: src/write-po.c:1266 src/write-po.c:1395 +#: src/write-po.c:1346 src/write-po.c:1514 #, c-format msgid "" "The following msgid contains non-ASCII characters.\n" @@ -3999,7 +4014,7 @@ "diferente da sua. Considere usar uma msgid ASCII pura ao invés.\n" "%s\n" -#: src/write-qt.c:667 +#: src/write-qt.c:668 msgid "" "message catalog has plural form translations\n" "but the Qt message catalog format doesn't support plural handling\n" @@ -4007,7 +4022,7 @@ "o catálogo de mensagens tem traduções com formas plurais mas o\n" "formato de catálogos de mensagens QT não suporta a gestão de plurais\n" -#: src/write-qt.c:693 +#: src/write-qt.c:694 msgid "" "message catalog has msgctxt strings containing characters outside ISO-8859-" "1\n" @@ -4019,7 +4034,7 @@ "mas o formato de catálogos de mensagens QT só suporta Unicode nas cadeias\n" "traduzidas, não nas cadeias de contexto\n" -#: src/write-qt.c:717 +#: src/write-qt.c:718 msgid "" "message catalog has msgid strings containing characters outside ISO-8859-1\n" "but the Qt message catalog format supports Unicode only in the translated\n" @@ -4030,12 +4045,12 @@ "mas o formato de catálogos de mensagens QT só suporta Unicode nas cadeias\n" "traduzidas, não nas cadeias por traduzir\n" -#: src/write-resources.c:94 +#: src/write-resources.c:96 #, c-format msgid "error while writing to %s subprocess" msgstr "erro ao escrever para o subprocesso %s" -#: src/write-resources.c:131 +#: src/write-resources.c:133 msgid "" "message catalog has context dependent translations\n" "but the C# .resources format doesn't support contexts\n" @@ -4043,7 +4058,7 @@ "o catálogo de mensagens tem traduções dependentes do contexto\n" "mas o formato C# .resources não suporta contextos\n" -#: src/write-resources.c:150 +#: src/write-resources.c:152 msgid "" "message catalog has plural form translations\n" "but the C# .resources format doesn't support plural handling\n" @@ -4051,7 +4066,7 @@ "o catálogo de mensagens tem traduções com formas plurais\n" "mas o formato C# .resources não suporta contextos\n" -#: src/write-tcl.c:157 +#: src/write-tcl.c:159 msgid "" "message catalog has context dependent translations\n" "but the Tcl message catalog format doesn't support contexts\n" @@ -4059,7 +4074,7 @@ "o catálogo de mensagens tem traduções dependentes do contexto\n" "mas o formato de catálogo Tcl não suporta contextos\n" -#: src/write-tcl.c:176 +#: src/write-tcl.c:178 msgid "" "message catalog has plural form translations\n" "but the Tcl message catalog format doesn't support plural handling\n" @@ -4067,17 +4082,17 @@ "o catálogo de mensagens tem traduções com formas plurais\n" "mas o formato de catálogo Tcl não suporta a gestão de plurais\n" -#: src/x-awk.c:341 src/x-python.c:1075 +#: src/x-awk.c:340 src/x-javascript.c:764 src/x-python.c:891 #, c-format msgid "%s:%d: warning: unterminated string" msgstr "%s:%d: aviso: cadeia não terminada" -#: src/x-awk.c:592 +#: src/x-awk.c:591 #, c-format msgid "%s:%d: warning: unterminated regular expression" msgstr "%s:%d: aviso: expressão regular não terminada" -#: src/x-csharp.c:1390 src/x-python.c:1282 +#: src/x-c.c:1152 src/x-csharp.c:1329 src/x-python.c:1098 src/x-vala.c:566 #, c-format msgid "%s:%d: warning: invalid Unicode character" msgstr "" @@ -4101,17 +4116,17 @@ msgid "%s:%d: warning: invalid raw string literal syntax" msgstr "%s:%d: aviso: sintaxe de literal de cadeia não terminal inválida" -#: src/x-c.c:1223 src/x-csharp.c:1509 src/x-java.c:872 +#: src/x-c.c:1617 src/x-csharp.c:1448 src/x-java.c:681 src/x-vala.c:808 #, c-format msgid "%s:%d: warning: unterminated character constant" msgstr "%s:%d: aviso: constante de carácter não terminada" -#: src/x-c.c:1247 +#: src/x-c.c:1654 src/x-vala.c:907 #, c-format msgid "%s:%d: warning: unterminated string literal" msgstr "" -#: src/x-csharp.c:224 src/xgettext.c:2021 +#: src/x-csharp.c:225 src/xg-encoding.c:111 msgid "Please specify the source encoding through --from-code." msgstr "Por favor, especifique a codificação da fonte com --from-code." @@ -4151,7 +4166,7 @@ "%s:%d: sequência multi-byte incompleta no fim da linha.\n" "Por favor, especifique a codificação correcta da fonte com --from-code.\n" -#: src/x-csharp.c:315 src/x-python.c:332 +#: src/x-csharp.c:315 src/x-javascript.c:329 src/x-python.c:353 #, c-format msgid "%s:%d: iconv failure" msgstr "%s:%d: iconv falhou" @@ -4165,53 +4180,53 @@ "%s:%d: sequência multi-byte inválida.\n" "Por favor, especifique a codificação da fonte com --from-code.\n" -#: src/x-csharp.c:1512 src/x-java.c:875 +#: src/x-csharp.c:1451 src/x-java.c:684 #, c-format msgid "%s:%d: warning: unterminated string constant" msgstr "" -#: src/x-csharp.c:2020 src/x-java.c:1369 +#: src/x-csharp.c:1953 src/x-java.c:1591 #, c-format msgid "%s:%d: warning: ')' found where '}' was expected" msgstr "%s:%d: aviso: obtido \")\", esperado \"}\"" -#: src/x-csharp.c:2054 src/x-java.c:1403 +#: src/x-csharp.c:1983 src/x-java.c:1621 #, c-format msgid "%s:%d: warning: '}' found where ')' was expected" msgstr "%s:%d: aviso: obtido \"}\", esperado \")\"" -#: src/xgettext.c:2835 +#: src/xg-arglist-parser.c:388 #, c-format msgid "ambiguous argument specification for keyword '%.*s'" msgstr "especificação de argumento ambígua para palavra-chave \"%.*s\"" -#: src/xgettext.c:2862 +#: src/xg-arglist-parser.c:450 #, c-format msgid "warning: missing context for keyword '%.*s'" msgstr "aviso: contexto em falta para palavra-chave \"%.*s\"" -#: src/xgettext.c:2887 +#: src/xg-arglist-parser.c:475 #, c-format msgid "warning: missing context for plural argument of keyword '%.*s'" msgstr "" "aviso: contexto em falta para argumento plural da palavra-chave \"%.*s\"" -#: src/xgettext.c:2908 +#: src/xg-arglist-parser.c:496 #, c-format msgid "context mismatch between singular and plural form" msgstr "troca de contexto entre forma plural e singular" -#: src/xgettext.c:1986 +#: src/xg-encoding.c:76 #, c-format msgid "Non-ASCII character at %s%s." msgstr "Carácter não-ASCII em %s%s." -#: src/xgettext.c:1990 +#: src/xg-encoding.c:80 #, c-format msgid "Non-ASCII comment at or before %s%s." msgstr "Comentário não-ASCII em ou antes de %s%s." -#: src/xgettext.c:1995 +#: src/xg-encoding.c:85 #, c-format msgid "Non-ASCII string at %s%s." msgstr "Cadeia não-ASCII em %s%s." @@ -4231,7 +4246,7 @@ msgid "sentence end type '%s' unknown" msgstr "tipo de fim de frase \"%s\" desconhecido" -#: src/xgettext.c:626 +#: src/xgettext.c:724 #, c-format msgid "xgettext cannot work without keywords to look for" msgstr "xgettext não funciona sem palavras para procurar" @@ -4263,12 +4278,12 @@ "aviso: ficheiro \"%s\" com a extensão \"%s\" desconhecido;\n" "será tentado C" -#: src/xgettext.c:821 +#: src/xgettext.c:1055 #, c-format msgid "Extract translatable strings from given input files.\n" msgstr "Extrair cadeias traduzíveis de ficheiros de entrada indicados.\n" -#: src/xgettext.c:844 +#: src/xgettext.c:1078 #, c-format msgid "" " -d, --default-domain=NAME use NAME.po for output (instead of " @@ -4277,19 +4292,19 @@ " -d, --default-domain=NOME usa NOME.po para saída (em vez de " "messages.po)\n" -#: src/xgettext.c:846 +#: src/xgettext.c:1080 #, c-format msgid " -o, --output=FILE write output to specified file\n" msgstr " -o, --output=FICHEIRO escreve a saída em FICHEIRO\n" -#: src/xgettext.c:848 +#: src/xgettext.c:1082 #, c-format msgid "" " -p, --output-dir=DIR output files will be placed in directory DIR\n" msgstr "" " -p, --output-dir=PASTA os ficheiros de saída são postos em PASTA\n" -#: src/xgettext.c:853 +#: src/xgettext.c:1087 #, c-format msgid "Choice of input file language:\n" msgstr "Escolha da linguagem do ficheiro de entrada:\n" @@ -4307,12 +4322,12 @@ " Glade, Lua, JavaScript, Vala, Desktop)\n" msgstr "" -#: src/xgettext.c:861 +#: src/xgettext.c:1096 #, c-format msgid " -C, --c++ shorthand for --language=C++\n" msgstr " -C, --c++ atalho para --language=C++\n" -#: src/xgettext.c:863 +#: src/xgettext.c:1098 #, c-format msgid "" "By default the language is guessed depending on the input file name " @@ -4320,7 +4335,7 @@ msgstr "" "Por predefinição, a linguagem é adivinhada através do nome da extensão.\n" -#: src/xgettext.c:868 +#: src/xgettext.c:1103 #, c-format msgid "" " --from-code=NAME encoding of input files\n" @@ -4329,26 +4344,26 @@ " --from-code=NOME codificação dos ficheiros de entrada\n" " (excepto para Python, Tcl, Glade)\n" -#: src/xgettext.c:871 +#: src/xgettext.c:1106 #, c-format msgid "By default the input files are assumed to be in ASCII.\n" msgstr "" "Por predefinição, assume-se que os ficheiros de entrada estão em ASCII.\n" -#: src/xgettext.c:876 +#: src/xgettext.c:1111 #, c-format msgid " -j, --join-existing join messages with existing file\n" msgstr "" " -j, --join-existing une mensagens com o ficheiro existente\n" -#: src/xgettext.c:878 +#: src/xgettext.c:1113 #, c-format msgid "" " -x, --exclude-file=FILE.po entries from FILE.po are not extracted\n" msgstr "" " -x, --exclude-file=FICH.po entradas de FICH.po não são extraídas.\n" -#: src/xgettext.c:880 +#: src/xgettext.c:1115 #, c-format msgid "" " -cTAG, --add-comments=TAG place comment blocks starting with TAG and\n" @@ -4385,12 +4400,12 @@ " (espaço único, que é a predefinição, \n" " ou espaço duplo)\n" -#: src/xgettext.c:886 +#: src/xgettext.c:1129 #, c-format msgid "Language specific options:\n" msgstr "Opções específicas da linguagem:\n" -#: src/xgettext.c:888 +#: src/xgettext.c:1131 #, c-format msgid " -a, --extract-all extract all strings\n" msgstr " -a, --extract-all extrai todas as cadeias\n" @@ -4425,7 +4440,7 @@ " C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n" " Lua, JavaScript, Vala, Desktop)\n" -#: src/xgettext.c:901 +#: src/xgettext.c:1146 #, c-format msgid "" " --flag=WORD:ARG:FLAG additional flag for strings inside the " @@ -4451,13 +4466,13 @@ " C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n" " Lua, JavaScript, Vala)\n" -#: src/xgettext.c:908 +#: src/xgettext.c:1154 #, c-format msgid " -T, --trigraphs understand ANSI C trigraphs for input\n" msgstr "" " -T, --trigraphs compreende tri-grafos ANSI C para entrada\n" -#: src/xgettext.c:910 +#: src/xgettext.c:1156 #, c-format msgid " (only languages C, C++, ObjectiveC)\n" msgstr " (só linguagens C, C++, ObjectiveC)\n" @@ -4472,27 +4487,27 @@ msgid " (only XML based languages)\n" msgstr " (só linguagens baseadas em XML)\n" -#: src/xgettext.c:912 +#: src/xgettext.c:1162 #, c-format msgid " --qt recognize Qt format strings\n" msgstr " --qt reconhece cadeias de formato Qt\n" -#: src/xgettext.c:914 src/xgettext.c:918 src/xgettext.c:922 +#: src/xgettext.c:1164 src/xgettext.c:1168 src/xgettext.c:1172 #, c-format msgid " (only language C++)\n" msgstr " (só linguagem C++)\n" -#: src/xgettext.c:916 +#: src/xgettext.c:1166 #, c-format msgid " --kde recognize KDE 4 format strings\n" msgstr " --kde reconhece cadeias de formato KDE 4\n" -#: src/xgettext.c:920 +#: src/xgettext.c:1170 #, c-format msgid " --boost recognize Boost format strings\n" msgstr " --boost reconhece cadeias de formato Boost\n" -#: src/xgettext.c:924 +#: src/xgettext.c:1174 #, c-format msgid "" " --debug more detailed formatstring recognition result\n" @@ -4500,7 +4515,7 @@ " --debug resultado de reconhecimento de cadeias de " "fomato mais detalhado\n" -#: src/xgettext.c:949 +#: src/xgettext.c:1199 #, c-format msgid " --properties-output write out a Java .properties file\n" msgstr " --properties-output escreve um ficheiro Java .properties\n" @@ -4510,12 +4525,12 @@ msgid " --itstool write out itstool comments\n" msgstr " --itstool escreve comentários itstool\n" -#: src/xgettext.c:964 +#: src/xgettext.c:1216 #, c-format msgid " --copyright-holder=STRING set copyright holder in output\n" msgstr " --copyright-holder=CADEIA define direitos de autor na saída\n" -#: src/xgettext.c:966 +#: src/xgettext.c:1218 #, c-format msgid "" " --foreign-user omit FSF copyright in output for foreign user\n" @@ -4523,18 +4538,18 @@ " --foreign-user omite direitos de autor da FSF na saída para " "utilizadores estrangeiros\n" -#: src/xgettext.c:968 +#: src/xgettext.c:1220 #, c-format msgid " --package-name=PACKAGE set package name in output\n" msgstr " --package-name=PACOTE define o nome do pacote na saída\n" -#: src/xgettext.c:970 +#: src/xgettext.c:1222 #, c-format msgid " --package-version=VERSION set package version in output\n" msgstr "" " --package-version=VERSÃO define a versão do pacote na saída\n" -#: src/xgettext.c:972 +#: src/xgettext.c:1224 #, c-format msgid "" " --msgid-bugs-address=EMAIL@ADDRESS set report address for msgid bugs\n" @@ -4542,7 +4557,7 @@ " --msgid-bugs-address=EMAIL@EXEMPLO define endereço de email para " "reportar erros de msgid\n" -#: src/xgettext.c:974 +#: src/xgettext.c:1226 #, c-format msgid "" " -m[STRING], --msgstr-prefix[=STRING] use STRING or \"\" as prefix for " @@ -4553,7 +4568,7 @@ "valores\n" " msgstr\n" -#: src/xgettext.c:977 +#: src/xgettext.c:1229 #, c-format msgid "" " -M[STRING], --msgstr-suffix[=STRING] use STRING or \"\" as suffix for " @@ -4564,7 +4579,7 @@ "valores\n" " msgstr\n" -#: src/xgettext.c:1783 +#: src/xgettext.c:1641 #, c-format msgid "" "A --flag argument doesn't have the ::[pass-] syntax: " @@ -4590,12 +4605,12 @@ msgid "language '%s' unknown" msgstr "linguagem \"%s\" desconhecida" -#: src/xgettext.c:2101 src/xgettext.c:2134 src/xgettext.c:2196 +#: src/xg-message.c:91 src/xg-message.c:227 src/xg-message.c:296 #, c-format msgid "%s%s: warning: " msgstr "%s%s: aviso: " -#: src/xgettext.c:2104 +#: src/xg-message.c:94 #, c-format msgid "" "Although being used in a format string position, the %s is not a valid %s " @@ -4604,7 +4619,7 @@ "Apesar de ser usada numa posição de cadeia de formato, %s não é uma cadeia " "de formato %s válida. Motivo: %s\n" -#: src/xgettext.c:2105 +#: src/xg-message.c:95 #, c-format msgid "" "Although declared as such, the %s is not a valid %s format string. Reason: " @@ -4613,7 +4628,7 @@ "Apesar de declarada como tal, %s não é uma cadeia de formato %s válida. " "Motivo: %s\n" -#: src/xgettext.c:2136 +#: src/xg-message.c:229 #, c-format msgid "" "'%s' format string with unnamed arguments cannot be properly localized:\n" @@ -4626,7 +4641,7 @@ "Por favor, considere usar uma cadeia de formato com argumentos com nome,\n" "e um mapa, em vez de tuple para os argumentos.\n" -#: src/xgettext.c:2198 +#: src/xg-message.c:298 msgid "" "Empty msgid. It is reserved by GNU gettext:\n" "gettext(\"\") returns the header entry with\n" @@ -4652,7 +4667,7 @@ "otherwise, use contexts for disambiguation." msgstr "" -#: src/x-java.c:494 +#: src/xg-mixed-string.c:496 #, c-format msgid "%s:%d: warning: lone surrogate U+%04X" msgstr "" @@ -4731,37 +4746,37 @@ msgid "%s:%d: warning: unterminated XML markup" msgstr "%s:%d: aviso: marcação XML não terminada" -#: src/x-perl.c:308 +#: src/x-perl.c:338 #, c-format msgid "%s:%d: can't find string terminator \"%s\" anywhere before EOF" msgstr "%s:%d: impossível encontrar terminador da cadeia \"%s\" antes de EOF" -#: src/x-perl.c:1043 +#: src/x-perl.c:1073 #, c-format msgid "%s:%d: missing right brace on \\x{HEXNUMBER}" msgstr "%s:%d: chaveta direita em falta em \\x{HEXNUMBER}" -#: src/x-perl.c:1163 +#: src/x-perl.c:1194 #, c-format msgid "%s:%d: invalid interpolation (\"\\l\") of 8bit character \"%c\"" msgstr "%s:%d: interpolação inválida (\"\\l\") de carácter de 8bit \"%c\"" -#: src/x-perl.c:1183 +#: src/x-perl.c:1214 #, c-format msgid "%s:%d: invalid interpolation (\"\\u\") of 8bit character \"%c\"" msgstr "%s:%d: interpolação inválida (\"\\u\") de carácter de 8bit \"%c\"" -#: src/x-perl.c:1217 +#: src/x-perl.c:1248 #, c-format msgid "%s:%d: invalid variable interpolation at \"%c\"" msgstr "" -#: src/x-perl.c:1230 +#: src/x-perl.c:1261 #, c-format msgid "%s:%d: invalid interpolation (\"\\L\") of 8bit character \"%c\"" msgstr "%s:%d: interpolação inválida (\"\\L\") de carácter de 8bit \"%c\"" -#: src/x-perl.c:1247 +#: src/x-perl.c:1278 #, c-format msgid "%s:%d: invalid interpolation (\"\\U\") of 8bit character \"%c\"" msgstr "%s:%d: interpolação inválida (\"\\U\") de carácter de 8bit \"%c\"" @@ -4819,22 +4834,22 @@ "Por favor, especifique a codificação da fonte com --from-code ou com um\n" "comentário, como especificado em https://www.python.org/peps/pep-0263.html.\n" -#: src/x-python.c:680 +#: src/x-python.c:679 #, c-format msgid "Unknown encoding \"%s\". Proceeding with ASCII instead." msgstr "Codificação \"%s\" desconhecida. A continuar com ASCII." -#: src/x-rst.c:108 +#: src/x-rst.c:116 #, c-format msgid "%s:%d: invalid string definition" msgstr "%s:%d: definição de cadeia inválida" -#: src/x-rst.c:172 +#: src/x-rst.c:180 #, c-format msgid "%s:%d: missing number after #" msgstr "%s:%d: número em falta após #" -#: src/x-rst.c:207 +#: src/x-rst.c:215 #, c-format msgid "%s:%d: invalid string expression" msgstr "%s:%d: expressão de cadeia inválida" @@ -4859,7 +4874,7 @@ msgid "(output from '%s')" msgstr "" -#: src/x-sh.c:1074 +#: src/x-sh.c:1141 #, c-format msgid "" "%s:%lu: warning: the syntax $\"...\" is deprecated due to security reasons; " diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/git-gui-glossary.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/git-gui-glossary.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/git-gui-glossary.po 2022-03-27 22:26:28.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/git-gui-glossary.po 2022-04-15 08:37:53.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:32+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:23+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" msgid "" @@ -233,7 +233,7 @@ msgid "path" msgstr "" -#. "Delete all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." +#. "Deletes all stale tracking branches under . These stale branches have already been removed from the remote repository referenced by , but are still locally available in 'remotes/'." msgid "prune" msgstr "" @@ -324,7 +324,7 @@ msgid "stage [verb]" msgstr "" -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." +#. "" msgid "staging area" msgstr "área de adaptação" @@ -344,11 +344,11 @@ msgid "submodule" msgstr "" -#. "A ref pointing to some commit object. In other words: A label on a specific commit." +#. "A ref pointing to a tag or commit object" msgid "tag [noun]" msgstr "etiqueta [noun]" -#. "The process of creating a tag at a specific commit object" +#. "" msgid "tag [verb]" msgstr "etiquetar [verb]" diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/git-gui.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/git-gui.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/git-gui.po 2022-03-27 22:26:37.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/git-gui.po 2022-04-15 08:38:01.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2022-03-23 22:32+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:23+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" #: git-gui.sh:847 #, tcl-format diff -Nru language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/git.po language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/git.po --- language-pack-pt-base-22.04+20220323/data/pt/LC_MESSAGES/git.po 2022-03-27 22:26:38.000000000 +0000 +++ language-pack-pt-base-22.04+20220415/data/pt/LC_MESSAGES/git.po 2022-04-15 08:38:03.000000000 +0000 @@ -15,227 +15,216 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2022-03-23 22:31+0000\n" -"X-Generator: Launchpad (build be3a23ec3b5246757c13483c7c66b30e796e0f57)\n" +"X-Launchpad-Export-Date: 2022-04-15 01:23+0000\n" +"X-Generator: Launchpad (build 5cc3bd61c85a328825183f316ddd801c0f7d7ef2)\n" -#: add-interactive.c:380 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 -#: builtin/rebase.c:1642 +#: sequencer.c:2421 msgid "could not read index" msgstr "" -#: add-interactive.c:588 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 +#: git-add--interactive.perl:246 git-add--interactive.perl:271 msgid "binary" msgstr "binário" -#: add-interactive.c:646 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 +#: git-add--interactive.perl:255 git-add--interactive.perl:309 msgid "nothing" msgstr "nada" -#: add-interactive.c:647 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 +#: git-add--interactive.perl:291 git-add--interactive.perl:306 msgid "unchanged" msgstr "não modificado" -#: add-interactive.c:684 git-add--interactive.perl:641 +#: git-add--interactive.perl:620 msgid "Update" msgstr "Atualizar" -#: add-interactive.c:701 add-interactive.c:889 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "" -#: add-interactive.c:710 git-add--interactive.perl:626 -#, c-format, perl-format +#: git-add--interactive.perl:605 +#, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:728 git-add--interactive.perl:676 -#, c-format, perl-format +#: git-add--interactive.perl:655 +#, perl-format msgid "note: %s is untracked now.\n" msgstr "" -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 -#: builtin/reset.c:151 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: add-interactive.c:763 git-add--interactive.perl:653 +#: git-add--interactive.perl:632 msgid "Revert" msgstr "" -#: add-interactive.c:779 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "" -#: add-interactive.c:817 git-add--interactive.perl:629 -#, c-format, perl-format +#: git-add--interactive.perl:608 +#, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:868 git-add--interactive.perl:693 -#, c-format +#: git-add--interactive.perl:672 msgid "No untracked files.\n" msgstr "" -#: add-interactive.c:872 git-add--interactive.perl:687 +#: git-add--interactive.perl:666 msgid "Add untracked" msgstr "" -#: add-interactive.c:899 git-add--interactive.perl:623 -#, c-format, perl-format +#: git-add--interactive.perl:602 +#, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:929 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "" -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 -#, c-format +#: git-add--interactive.perl:1321 msgid "Only binary files changed.\n" msgstr "" -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 -#, c-format +#: git-add--interactive.perl:1323 msgid "No changes.\n" msgstr "" -#: add-interactive.c:947 git-add--interactive.perl:1379 +#: git-add--interactive.perl:1331 msgid "Patch update" msgstr "" -#: add-interactive.c:986 git-add--interactive.perl:1792 +#: git-add--interactive.perl:1699 msgid "Review diff" msgstr "" -#: add-interactive.c:1014 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "" -#: add-interactive.c:1016 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "" -#: add-interactive.c:1018 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "" -#: add-interactive.c:1020 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "" -#: add-interactive.c:1022 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "" -#: add-interactive.c:1024 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "" -#: add-interactive.c:1032 add-interactive.c:1081 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "" -#: add-interactive.c:1034 +#: add-interactive.c:1030 msgid "select a single item" msgstr "" -#: add-interactive.c:1036 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "" -#: add-interactive.c:1038 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "" -#: add-interactive.c:1040 add-interactive.c:1085 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "" -#: add-interactive.c:1042 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "" -#: add-interactive.c:1044 +#: add-interactive.c:1040 msgid "choose all items" msgstr "" -#: add-interactive.c:1046 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "" -#: add-interactive.c:1083 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "" -#: add-interactive.c:1087 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "" -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 +#: builtin/clean.c:823 git-add--interactive.perl:1786 msgid "*** Commands ***" msgstr "" -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 +#: builtin/clean.c:824 git-add--interactive.perl:1783 msgid "What now" msgstr "" -#: add-interactive.c:1148 git-add--interactive.perl:213 +#: git-add--interactive.perl:197 msgid "staged" msgstr "" -#: add-interactive.c:1148 git-add--interactive.perl:213 +#: git-add--interactive.perl:197 msgid "unstaged" msgstr "" -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 -#: git-add--interactive.perl:213 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 +#: git-add--interactive.perl:197 msgid "path" msgstr "" -#: add-interactive.c:1155 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "" -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 +#: builtin/clean.c:788 git-add--interactive.perl:1710 #, c-format msgid "Bye.\n" msgstr "" -#: add-patch.c:34 git-add--interactive.perl:1431 -#, c-format, perl-format +#: git-add--interactive.perl:1383 +#, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:35 git-add--interactive.perl:1432 -#, c-format, perl-format +#: git-add--interactive.perl:1384 +#, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "" @@ -244,8 +233,8 @@ msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:37 git-add--interactive.perl:1434 -#, c-format, perl-format +#: git-add--interactive.perl:1385 +#, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "" @@ -264,13 +253,13 @@ "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:56 git-add--interactive.perl:1437 -#, c-format, perl-format +#: git-add--interactive.perl:1388 +#, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:57 git-add--interactive.perl:1438 -#, c-format, perl-format +#: git-add--interactive.perl:1389 +#, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "" @@ -279,8 +268,8 @@ msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:59 git-add--interactive.perl:1440 -#, c-format, perl-format +#: git-add--interactive.perl:1390 +#, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "" @@ -299,13 +288,13 @@ "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:80 git-add--interactive.perl:1443 -#, c-format, perl-format +#: git-add--interactive.perl:1393 +#, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:81 git-add--interactive.perl:1444 -#, c-format, perl-format +#: git-add--interactive.perl:1394 +#, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "" @@ -314,8 +303,8 @@ msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:83 git-add--interactive.perl:1446 -#, c-format, perl-format +#: git-add--interactive.perl:1395 +#, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "" @@ -334,13 +323,13 @@ "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:103 git-add--interactive.perl:1449 -#, c-format, perl-format +#: git-add--interactive.perl:1398 +#, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:104 git-add--interactive.perl:1450 -#, c-format, perl-format +#: git-add--interactive.perl:1399 +#, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "" @@ -349,8 +338,8 @@ msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:106 git-add--interactive.perl:1452 -#, c-format, perl-format +#: git-add--interactive.perl:1400 +#, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "" @@ -369,15 +358,13 @@ "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:126 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 -#, c-format, perl-format +#: git-add--interactive.perl:1403 +#, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:127 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 -#, c-format, perl-format +#: git-add--interactive.perl:1404 +#, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -387,9 +374,8 @@ msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:129 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 -#, c-format, perl-format +#: git-add--interactive.perl:1405 +#, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -408,13 +394,13 @@ "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 -#, c-format, perl-format +#: git-add--interactive.perl:1408 +#, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 -#, c-format, perl-format +#: git-add--interactive.perl:1409 +#, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -423,8 +409,8 @@ msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 -#, c-format, perl-format +#: git-add--interactive.perl:1410 +#, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -437,13 +423,13 @@ "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 -#, c-format, perl-format +#: git-add--interactive.perl:1413 +#, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 -#, c-format, perl-format +#: git-add--interactive.perl:1414 +#, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -452,8 +438,8 @@ msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 -#, c-format, perl-format +#: git-add--interactive.perl:1415 +#, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -475,47 +461,47 @@ "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:343 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "" -#: add-patch.c:362 add-patch.c:366 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "" -#: add-patch.c:420 +#: add-patch.c:419 msgid "could not parse diff" msgstr "" -#: add-patch.c:439 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "" -#: add-patch.c:453 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "" -#: add-patch.c:612 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "" -#: add-patch.c:613 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" -#: add-patch.c:791 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:806 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -524,11 +510,11 @@ "%.*s" msgstr "" -#: add-patch.c:1082 git-add--interactive.perl:1115 +#: git-add--interactive.perl:1079 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: add-patch.c:1086 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -538,51 +524,45 @@ msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1100 git-add--interactive.perl:1129 +#: git-add--interactive.perl:1093 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -#: add-patch.c:1133 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1178 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "" #. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1247 git-add--interactive.perl:1242 +#: git-add--interactive.perl:1206 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -#: add-patch.c:1290 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "" -#: add-patch.c:1291 git-add--interactive.perl:1346 +#: git-add--interactive.perl:1298 msgid "Apply them to the worktree anyway? " msgstr "" -#: add-patch.c:1298 git-add--interactive.perl:1349 +#: git-add--interactive.perl:1301 msgid "Nothing was applied.\n" msgstr "" -#: add-patch.c:1355 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -595,132 +575,132 @@ "? - print help\n" msgstr "" -#: add-patch.c:1517 add-patch.c:1527 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "" -#: add-patch.c:1522 add-patch.c:1532 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "" -#: add-patch.c:1538 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "" -#: add-patch.c:1549 git-add--interactive.perl:1606 +#: git-add--interactive.perl:1522 msgid "go to which hunk ( to see more)? " msgstr "" -#: add-patch.c:1550 git-add--interactive.perl:1608 +#: git-add--interactive.perl:1524 msgid "go to which hunk? " msgstr "" -#: add-patch.c:1561 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "" -#: add-patch.c:1566 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "" msgstr[1] "" -#: add-patch.c:1575 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "" -#: add-patch.c:1581 git-add--interactive.perl:1661 +#: git-add--interactive.perl:1568 msgid "search for regex? " msgstr "" -#: add-patch.c:1596 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "" -#: add-patch.c:1613 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "" -#: add-patch.c:1620 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "" -#: add-patch.c:1624 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "" -#: add-patch.c:1628 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "" -#: add-patch.c:1680 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "" -#: advice.c:78 +#: advice.c:145 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" -#: advice.c:94 +#: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:178 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:180 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:182 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:184 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:186 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:188 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:196 +#: advice.c:108 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:204 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:209 builtin/merge.c:1379 +#: advice.c:121 builtin/merge.c:1251 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:211 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:212 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:217 +#: builtin/merge.c:1501 msgid "Not possible to fast-forward, aborting." msgstr "" @@ -739,7 +719,7 @@ "* Disable or modify the sparsity rules." msgstr "" -#: advice.c:242 +#: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -770,78 +750,78 @@ msgid "unclosed quote" msgstr "" -#: apply.c:70 +#: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:86 +#: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:136 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:139 +#: apply.c:127 msgid "--3way outside a repository" msgstr "" -#: apply.c:150 +#: apply.c:138 msgid "--index outside a repository" msgstr "" -#: apply.c:153 +#: apply.c:141 msgid "--cached outside a repository" msgstr "" -#: apply.c:800 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:809 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:883 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:921 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:927 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:928 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:933 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:962 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1281 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1371 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -852,531 +832,527 @@ msgstr[0] "" msgstr[1] "" -#: apply.c:1384 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1480 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1549 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1752 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "" -#: apply.c:1754 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "" -#: apply.c:1788 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1825 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1827 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1830 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1978 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2015 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2177 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2263 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2267 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2936 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3057 +#: apply.c:3055 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3069 +#: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3075 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3097 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3105 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3152 +#: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3163 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3171 +#: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3189 +#: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3202 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3209 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3230 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3353 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 -#: setup.c:308 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3413 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3442 apply.c:3709 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3549 apply.c:3724 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3558 apply.c:3732 apply.c:3976 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3593 +#: apply.c:3571 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" -#: apply.c:3596 +#: apply.c:3574 #, c-format msgid "Performing three-way merge...\n" msgstr "" -#: apply.c:3612 apply.c:3616 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3628 +#: apply.c:3606 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "" -#: apply.c:3642 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3647 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3664 +#: apply.c:3642 #, c-format msgid "Falling back to direct application...\n" msgstr "" -#: apply.c:3676 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3749 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3751 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 -#: read-cache.c:1368 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3974 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3978 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3998 +#: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:4003 +#: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:4023 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:4027 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4042 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4134 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4141 +#: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4144 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4153 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4163 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4301 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4335 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4341 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4349 +#: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4355 apply.c:4500 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 -#: builtin/gc.c:2276 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4402 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4472 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4570 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4578 +#: apply.c:4523 msgid "internal error" msgstr "" -#: apply.c:4581 +#: apply.c:4526 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4592 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4614 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4618 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4747 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4755 +#: apply.c:4681 msgid "unrecognized input" msgstr "" -#: apply.c:4775 +#: apply.c:4700 msgid "unable to read index file" msgstr "" -#: apply.c:4932 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4959 +#: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4965 apply.c:4980 +#: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4973 +#: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:5017 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:5020 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "" -#: apply.c:5022 builtin/am.c:2320 +#: apply.c:4927 builtin/am.c:2263 msgid "num" msgstr "" -#: apply.c:5023 +#: apply.c:4928 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:5026 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:5028 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:5032 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:5034 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:5036 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:5038 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:5040 +#: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5042 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:5044 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:5047 +#: apply.c:4950 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5049 +#: apply.c:5027 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" -#: apply.c:5051 +#: apply.c:4954 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5054 builtin/checkout-index.c:196 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5056 +#: apply.c:4959 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 -#: builtin/rebase.c:1051 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3035 msgid "action" msgstr "" -#: apply.c:5058 +#: apply.c:4961 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5061 apply.c:5064 +#: apply.c:4964 apply.c:4967 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5067 +#: apply.c:4970 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5069 +#: apply.c:4972 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5071 +#: apply.c:4974 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5073 +#: apply.c:4976 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "" -#: apply.c:5076 +#: apply.c:4979 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5079 +#: apply.c:4982 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5081 builtin/am.c:2308 +#: apply.c:4984 builtin/am.c:2251 msgid "root" msgstr "" -#: apply.c:5082 +#: apply.c:4985 msgid "prepend to all filenames" msgstr "" @@ -1414,7 +1390,7 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 +#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 #, c-format msgid "deflate error (%d)" msgstr "" @@ -1424,20 +1400,20 @@ msgid "timestamp too large for this system: %" msgstr "" -#: archive.c:14 +#: archive.c:13 msgid "git archive [] [...]" msgstr "" -#: archive.c:15 +#: archive.c:14 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:16 +#: archive.c:15 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" -#: archive.c:17 +#: archive.c:16 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" @@ -1446,193 +1422,190 @@ msgid "cannot read %s" msgstr "" -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 -#: builtin/merge.c:1145 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 +#: builtin/commit.c:722 builtin/merge.c:1047 #, c-format msgid "could not read '%s'" msgstr "" -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "pathspec '%s' não encontrou nenhum arquivo" -#: archive.c:450 +#: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:456 +#: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:469 +#: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:481 +#: archive.c:482 msgid "current working directory is untracked" msgstr "" -#: archive.c:522 +#: archive.c:523 #, c-format msgid "File not found: %s" msgstr "" -#: archive.c:524 +#: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "" -#: archive.c:551 +#: archive.c:436 msgid "fmt" msgstr "fmt" -#: archive.c:551 +#: archive.c:436 msgid "archive format" msgstr "formato do arquivo" -#: archive.c:552 builtin/log.c:1775 +#: archive.c:437 builtin/log.c:1462 msgid "prefix" msgstr "prefixo" -#: archive.c:553 +#: archive.c:438 msgid "prepend prefix to each pathname in the archive" msgstr "preceder cada caminho no arquivo com o prefixo" -#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 -#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 +#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: parse-options.h:165 msgid "file" msgstr "ficheiro" -#: archive.c:555 +#: archive.c:556 msgid "add untracked file to archive" msgstr "" -#: archive.c:558 builtin/archive.c:88 +#: archive.c:440 builtin/archive.c:89 msgid "write the archive to this file" msgstr "escrever o arquivo para este ficheiro" -#: archive.c:560 +#: archive.c:442 msgid "read .gitattributes in working directory" msgstr "leia .gitattributes no diretório de trabalho" -#: archive.c:561 +#: archive.c:443 msgid "report archived files on stderr" msgstr "reportar ficheiros arquivados no stderr" -#: archive.c:563 +#: archive.c:564 msgid "set compression level" msgstr "" -#: archive.c:566 +#: archive.c:456 msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 msgid "repo" msgstr "repo" -#: archive.c:569 builtin/archive.c:90 +#: archive.c:459 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "obter o arquivo do repositório remoto " -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 -#: builtin/notes.c:496 +#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "comando" -#: archive.c:571 builtin/archive.c:92 +#: archive.c:461 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "caminho para o comando git-upload-archive remoto" -#: archive.c:578 +#: archive.c:468 msgid "Unexpected option --remote" msgstr "" -#: archive.c:580 +#: archive.c:470 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:582 +#: archive.c:472 msgid "Unexpected option --output" msgstr "" -#: archive.c:584 +#: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "" -#: archive.c:606 +#: archive.c:494 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:615 +#: archive.c:501 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:203 +#: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:364 +#: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:404 +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:488 +#: bisect.c:460 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:698 +#: bisect.c:668 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:764 +#: bisect.c:722 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:789 +#: bisect.c:746 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:794 +#: bisect.c:751 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:799 +#: bisect.c:756 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:807 +#: bisect.c:764 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1640,7 +1613,7 @@ "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:820 +#: bisect.c:777 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1648,43 +1621,43 @@ "We continue anyway." msgstr "" -#: bisect.c:859 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:909 +#: bisect.c:850 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:939 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:985 builtin/merge.c:154 +#: bisect.c:920 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:1025 +#: bisect.c:950 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1055 +#: bisect.c:969 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1064 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path arguments?\n" msgstr "" -#: bisect.c:1093 +#: bisect.c:996 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1694,45 +1667,43 @@ #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1099 +#: bisect.c:1002 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2776 +#: blame.c:1758 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2790 +#: blame.c:1769 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2811 +#: blame.c:1789 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 -#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 -#: builtin/shortlog.c:255 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "revisão do andamento da configuração falhou" -#: blame.c:2838 +#: blame.c:1816 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2849 +#: blame.c:1827 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2860 +#: blame.c:1838 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1839,153 +1810,152 @@ "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:281 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "Não é um nome de objeto válido: '%s'" -#: branch.c:301 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nome do objecto ambíguo: '%s'." -#: branch.c:306 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:366 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:389 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:44 +#: bundle.c:41 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "" -#: bundle.c:48 +#: bundle.c:45 #, c-format msgid "unknown capability '%s'" msgstr "" -#: bundle.c:74 +#: bundle.c:71 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "" -#: bundle.c:113 +#: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "cabeçalho não reconhecido: %s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 -#: builtin/commit.c:862 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 #, c-format msgid "could not open '%s'" msgstr "não foi possível abrir '%s'" -#: bundle.c:198 +#: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "O repositório não contém estes confirmações de pré-requisitos:" -#: bundle.c:201 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:257 +#: bundle.c:190 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:264 +#: bundle.c:197 msgid "The bundle records a complete history." msgstr "O pacote regista um histórico completo." -#: bundle.c:266 +#: bundle.c:199 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:333 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:340 +#: bundle.c:258 msgid "Could not spawn pack-objects" msgstr "Não foi possível lançar o pack-objects" -#: bundle.c:351 +#: bundle.c:269 msgid "pack-objects died" msgstr "pacote de objectos expirado" -#: bundle.c:400 +#: bundle.c:360 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "a referência '%s' está excluída pelas opções do rev-list" -#: bundle.c:504 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "" -#: bundle.c:506 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "argumento não reconhecido: %s" -#: bundle.c:553 +#: bundle.c:458 msgid "Refusing to create empty bundle." msgstr "Recusando-se a criar um conjunto vazio." -#: bundle.c:563 +#: bundle.c:470 #, c-format msgid "cannot create '%s'" msgstr "não pode criar '%s'" -#: bundle.c:588 +#: bundle.c:498 msgid "index-pack died" msgstr "index-pack expirado" -#: chunk-format.c:117 +#: chunk-format.c:113 msgid "terminating chunk id appears earlier than expected" msgstr "" -#: chunk-format.c:126 +#: chunk-format.c:122 #, c-format msgid "improper chunk offset(s) % and %" msgstr "" -#: chunk-format.c:133 +#: chunk-format.c:129 #, c-format msgid "duplicate chunk ID % found" msgstr "" -#: chunk-format.c:147 +#: chunk-format.c:143 #, c-format msgid "final chunk has non-zero id %" msgstr "" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:204 midx.c:51 +#: commit-graph.c:204 midx.c:47 msgid "invalid hash version" msgstr "" @@ -2030,218 +2000,218 @@ msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:746 commit-graph.c:783 +#: commit-graph.c:745 commit-graph.c:782 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:767 +#: commit-graph.c:766 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:800 +#: commit-graph.c:799 msgid "commit-graph requires overflow generation data but has none" msgstr "" -#: commit-graph.c:1105 builtin/am.c:1342 +#: builtin/am.c:1359 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1367 builtin/pack-objects.c:3070 +#: commit-graph.c:1337 builtin/pack-objects.c:2897 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1398 +#: commit-graph.c:1368 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1415 +#: commit-graph.c:1385 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1435 +#: commit-graph.c:1405 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1454 +#: commit-graph.c:1424 msgid "Computing commit graph topological levels" msgstr "" -#: commit-graph.c:1507 +#: commit-graph.c:1477 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1588 +#: commit-graph.c:1558 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1665 +#: commit-graph.c:1635 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1690 +#: commit-graph.c:1660 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1703 +#: commit-graph.c:1673 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1707 +#: commit-graph.c:1677 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1744 +#: commit-graph.c:1714 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1762 +#: commit-graph.c:1732 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1811 +#: commit-graph.c:1781 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1842 midx.c:1146 +#: commit-graph.c:1812 midx.c:906 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1855 +#: commit-graph.c:1825 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1860 +#: commit-graph.c:1830 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1917 +#: commit-graph.c:1887 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1953 +#: commit-graph.c:1923 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1969 +#: commit-graph.c:1939 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1989 +#: commit-graph.c:1959 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:2122 +#: commit-graph.c:2092 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:2166 +#: commit-graph.c:2136 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2274 +#: commit-graph.c:2244 msgid "" "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2381 +#: commit-graph.c:2351 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2479 +#: commit-graph.c:2450 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2489 +#: commit-graph.c:2460 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2499 commit-graph.c:2514 +#: commit-graph.c:2470 commit-graph.c:2485 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2506 +#: commit-graph.c:2477 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2524 +#: commit-graph.c:2495 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2539 +#: commit-graph.c:2510 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2546 +#: commit-graph.c:2517 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2556 +#: commit-graph.c:2527 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2565 +#: commit-graph.c:2536 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2579 +#: commit-graph.c:2550 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2584 +#: commit-graph.c:2555 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2588 +#: commit-graph.c:2559 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2605 +#: commit-graph.c:2576 #, c-format msgid "commit-graph generation for commit %s is % < %" msgstr "" -#: commit-graph.c:2611 +#: commit-graph.c:2582 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 #, c-format msgid "could not parse %s" msgstr "não foi possível analizar %s" -#: commit.c:55 +#: commit.c:43 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s não é um comprometimento!" -#: commit.c:196 +#: commit.c:194 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2253,38 +2223,38 @@ "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1239 +#: builtin/merge.c:1335 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1243 +#: builtin/merge.c:1338 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1246 +#: builtin/merge.c:1341 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1249 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1503 +#: commit.c:1506 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "memória insuficiente" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2294,35 +2264,35 @@ "This might be due to circular includes." msgstr "" -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "" -#: config.c:201 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:398 +#: config.c:396 #, c-format msgid "invalid config format: %s" msgstr "" -#: config.c:402 +#: config.c:400 #, c-format msgid "missing environment variable name for configuration '%.*s'" msgstr "" -#: config.c:407 +#: config.c:405 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" msgstr "" -#: config.c:443 +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "" @@ -2332,260 +2302,260 @@ msgid "key does not contain variable name: %s" msgstr "" -#: config.c:470 sequencer.c:2804 +#: sequencer.c:1993 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:475 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:495 +#: config.c:511 msgid "empty config key" msgstr "" -#: config.c:513 config.c:525 +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:539 config.c:556 config.c:563 config.c:572 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:606 +#: config.c:622 #, c-format msgid "bogus count in %s" msgstr "" -#: config.c:610 +#: config.c:626 #, c-format msgid "too many entries in %s" msgstr "" -#: config.c:620 +#: config.c:636 #, c-format msgid "missing config key %s" msgstr "" -#: config.c:628 +#: config.c:644 #, c-format msgid "missing config value %s" msgstr "" -#: config.c:979 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:983 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:987 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:991 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:995 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:999 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:1136 +#: config.c:868 msgid "out of range" msgstr "" -#: config.c:1136 +#: config.c:868 msgid "invalid unit" msgstr "" -#: config.c:1137 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:1147 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1150 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1153 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1156 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1159 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1162 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1241 +#: config.c:1257 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "" -#: config.c:1259 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1268 +#: config.c:998 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1361 +#: config.c:1377 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1375 config.c:1386 +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1476 +#: config.c:1494 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1509 +#: config.c:1225 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1581 +#: config.c:1599 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1607 +#: config.c:1625 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1608 +#: config.c:1626 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1669 builtin/pack-objects.c:4053 +#: config.c:1386 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1792 +#: config.c:1809 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1795 +#: config.c:1812 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1813 +#: config.c:1829 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1858 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1914 +#: config.c:1582 msgid "unable to parse command-line config" msgstr "" -#: config.c:2282 +#: config.c:1914 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2456 +#: config.c:2101 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2501 +#: config.c:2170 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2547 +#: config.c:2195 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2549 +#: config.c:2197 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2633 +#: config.c:2644 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2665 +#: config.c:2256 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2694 +#: config.c:2705 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2946 config.c:3273 +#: config.c:2957 config.c:3283 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2957 +#: config.c:2968 #, c-format msgid "opening %s" msgstr "" -#: config.c:2994 builtin/config.c:361 +#: config.c:3005 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:3019 +#: config.c:3030 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:3032 config.c:3286 +#: config.c:2599 config.c:2816 #, c-format msgid "fstat on %s failed" msgstr "" @@ -2595,32 +2565,32 @@ msgid "unable to mmap '%s'%s" msgstr "" -#: config.c:3053 config.c:3291 +#: config.c:3063 config.c:3301 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:3138 config.c:3388 +#: config.c:3148 config.c:3398 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:3172 +#: config.c:2706 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 +#: config.c:2708 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3264 +#: config.c:3274 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3431 +#: config.c:3441 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2629,7 +2599,7 @@ msgid "the remote end hung up upon initial contact" msgstr "" -#: connect.c:63 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -2651,79 +2621,79 @@ msgid "expected flush after capabilities" msgstr "" -#: connect.c:265 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" -#: connect.c:286 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "" -#: connect.c:308 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" -#: connect.c:310 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:349 +#: connect.c:347 msgid "invalid packet" msgstr "" -#: connect.c:369 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:499 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "" -#: connect.c:528 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:532 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "" -#: connect.c:535 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "" -#: connect.c:670 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:721 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:761 connect.c:824 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:765 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:769 connect.c:840 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:791 connect.c:868 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2731,77 +2701,77 @@ msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:797 connect.c:874 +#: connect.c:793 connect.c:870 msgid "done." msgstr "" -#: connect.c:828 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:834 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:971 connect.c:1303 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:973 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:983 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:1054 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1194 +#: connect.c:1190 msgid "newline is forbidden in git:// hosts and repo paths" msgstr "" -#: connect.c:1251 +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1263 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1280 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1392 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1440 +#: connect.c:1436 msgid "unable to fork" msgstr "" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 msgid "Checking connectivity" msgstr "" -#: connected.c:122 +#: connected.c:78 msgid "Could not run 'git rev-list'" msgstr "Não foi possível executar 'git rev-list'" -#: connected.c:146 +#: connected.c:98 msgid "failed write to rev-list" msgstr "" -#: connected.c:151 +#: connected.c:105 msgid "failed to close rev-list's stdin" msgstr "" @@ -2822,7 +2792,7 @@ "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:206 +#: convert.c:215 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" @@ -2901,23 +2871,23 @@ msgid "path name too long for external filter" msgstr "" -#: convert.c:935 +#: convert.c:934 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1236 +#: convert.c:1234 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1416 convert.c:1449 +#: convert.c:1414 convert.c:1447 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1492 +#: convert.c:1490 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -2935,68 +2905,68 @@ msgid "refusing to work with credential missing protocol field" msgstr "" -#: credential.c:395 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "" -#: credential.c:439 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "" -#: credential.c:512 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "" -#: date.c:138 +#: date.c:116 msgid "in the future" msgstr "no futuro" -#: date.c:144 +#: date.c:122 #, c-format msgid "% second ago" msgid_plural "% seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:151 +#: date.c:129 #, c-format msgid "% minute ago" msgid_plural "% minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:158 +#: date.c:136 #, c-format msgid "% hour ago" msgid_plural "% hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:165 +#: date.c:143 #, c-format msgid "% day ago" msgid_plural "% days ago" msgstr[0] "" msgstr[1] "" -#: date.c:171 +#: date.c:149 #, c-format msgid "% week ago" msgid_plural "% weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:178 +#: date.c:156 #, c-format msgid "% month ago" msgid_plural "% months ago" msgstr[0] "" msgstr[1] "" -#: date.c:189 +#: date.c:167 #, c-format msgid "% year" msgid_plural "% years" @@ -3004,14 +2974,14 @@ msgstr[1] "" #. TRANSLATORS: "%s" is " years" -#: date.c:192 +#: date.c:170 #, c-format msgid "%s, % month ago" msgid_plural "%s, % months ago" msgstr[0] "" msgstr[1] "" -#: date.c:197 date.c:202 +#: date.c:175 date.c:180 #, c-format msgid "% year ago" msgid_plural "% years ago" @@ -3042,76 +3012,76 @@ msgid "Marked %d islands, done.\n" msgstr "" -#: diff-merges.c:70 +#: diff-merges.c:80 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "" -#: diff-lib.c:561 +#: diff-lib.c:538 msgid "--merge-base does not work with ranges" msgstr "" -#: diff-lib.c:563 +#: diff-lib.c:540 msgid "--merge-base only works with commits" msgstr "" -#: diff-lib.c:580 +#: diff-lib.c:557 msgid "unable to get HEAD" msgstr "" -#: diff-lib.c:587 +#: diff-lib.c:564 msgid "no merge base found" msgstr "" -#: diff-lib.c:589 +#: diff-lib.c:566 msgid "multiple merge bases found" msgstr "" -#: diff-no-index.c:237 +#: diff-no-index.c:238 msgid "git diff --no-index [] " msgstr "" -#: diff-no-index.c:262 +#: diff-no-index.c:263 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" -#: diff.c:157 +#: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:162 +#: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:298 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:326 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -#: diff.c:334 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:411 +#: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Valor desconhecido para 'diff.submodule' configurar variável: '%s'" -#: diff.c:471 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3120,16 +3090,16 @@ "Erros encontrados em 'diff.dirstat' configurar variável:\n" "%s" -#: diff.c:4290 +#: diff.c:3822 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4642 +#: diff.c:4146 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4645 +#: diff.c:4149 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" @@ -3144,22 +3114,22 @@ "with -G and -S" msgstr "" -#: diff.c:4730 +#: diff.c:4237 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4778 +#: diff.c:4760 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 -#: parse-options.c:217 parse-options.c:221 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4815 +#: diff.c:4403 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3168,497 +3138,497 @@ "Falha ao analisar o parâmetro de opção --dirstat/-X:\n" "%s" -#: diff.c:4900 +#: diff.c:4882 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4924 +#: diff.c:4906 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4938 +#: diff.c:4920 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4988 diff.c:4994 +#: diff.c:4970 diff.c:4976 #, c-format msgid "%s expects / form" msgstr "" -#: diff.c:5006 +#: diff.c:4988 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:5027 +#: diff.c:5009 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:5046 +#: diff.c:5028 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5086 +#: diff.c:5068 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5122 diff.c:5142 +#: diff.c:5104 diff.c:5124 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5246 +#: diff.c:5228 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "" -#: diff.c:5295 +#: diff.c:5277 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5351 +#: diff.c:5333 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5387 +#: diff.c:5369 msgid "Diff output format options" msgstr "" -#: diff.c:5389 diff.c:5395 +#: diff.c:5371 diff.c:5377 msgid "generate patch" msgstr "" -#: diff.c:5392 builtin/log.c:179 +#: builtin/log.c:153 msgid "suppress diff output" msgstr "" -#: diff.c:5397 diff.c:5511 diff.c:5518 +#: diff.c:5379 diff.c:5493 diff.c:5500 msgid "" msgstr "" -#: diff.c:5398 diff.c:5401 +#: diff.c:5380 diff.c:5383 msgid "generate diffs with lines context" msgstr "" -#: diff.c:5403 +#: diff.c:5385 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5406 +#: diff.c:5388 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5410 +#: diff.c:5392 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5414 +#: diff.c:5396 msgid "machine friendly --stat" msgstr "" -#: diff.c:5417 +#: diff.c:5399 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5419 diff.c:5427 +#: diff.c:5401 diff.c:5409 msgid "..." msgstr "" -#: diff.c:5420 +#: diff.c:5402 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5424 +#: diff.c:5406 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5428 +#: diff.c:5410 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5432 +#: diff.c:5414 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5435 +#: diff.c:5417 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5438 +#: diff.c:5420 msgid "show only names of changed files" msgstr "" -#: diff.c:5441 +#: diff.c:5423 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5443 +#: diff.c:5425 msgid "[,[,]]" msgstr "" -#: diff.c:5444 +#: diff.c:5426 msgid "generate diffstat" msgstr "" -#: diff.c:5446 diff.c:5449 diff.c:5452 +#: diff.c:5428 diff.c:5431 diff.c:5434 msgid "" msgstr "" -#: diff.c:5447 +#: diff.c:5429 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5450 +#: diff.c:5432 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5453 +#: diff.c:5435 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5455 +#: diff.c:5437 msgid "" msgstr "" -#: diff.c:5456 +#: diff.c:5438 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5459 +#: diff.c:5441 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5462 +#: diff.c:5444 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5465 +#: diff.c:5447 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5467 +#: diff.c:5449 msgid "show colored diff" msgstr "" -#: diff.c:5468 +#: diff.c:5450 msgid "" msgstr "" -#: diff.c:5469 +#: diff.c:5451 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5472 +#: diff.c:5454 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or -" "-numstat" msgstr "" -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572 msgid "" msgstr "" -#: diff.c:5476 +#: diff.c:5458 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5479 +#: diff.c:5461 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5482 +#: diff.c:5464 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5485 +#: diff.c:5467 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5488 +#: diff.c:5470 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5492 diff.c:5497 diff.c:5502 +#: diff.c:5474 diff.c:5479 diff.c:5484 msgid "" msgstr "" -#: diff.c:5493 +#: diff.c:5475 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5498 +#: diff.c:5480 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5503 +#: diff.c:5485 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5506 +#: diff.c:5488 msgid "Diff rename options" msgstr "" -#: diff.c:5507 +#: diff.c:5489 msgid "[/]" msgstr "" -#: diff.c:5508 +#: diff.c:5490 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5512 +#: diff.c:5494 msgid "detect renames" msgstr "" -#: diff.c:5516 +#: diff.c:5498 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5519 +#: diff.c:5501 msgid "detect copies" msgstr "" -#: diff.c:5523 +#: diff.c:5505 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5525 +#: diff.c:5507 msgid "disable rename detection" msgstr "" -#: diff.c:5528 +#: diff.c:5510 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5530 +#: diff.c:5512 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5533 +#: diff.c:5515 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5535 +#: diff.c:5517 msgid "Diff algorithm options" msgstr "" -#: diff.c:5537 +#: diff.c:5519 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5540 +#: diff.c:5522 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5543 +#: diff.c:5525 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5546 +#: diff.c:5528 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5549 +#: diff.c:5531 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5552 +#: diff.c:5534 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606 msgid "" msgstr "" -#: diff.c:5555 +#: diff.c:5537 msgid "ignore changes whose all lines match " msgstr "" -#: diff.c:5558 +#: diff.c:5540 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5561 +#: diff.c:5543 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5565 +#: diff.c:5547 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5567 +#: diff.c:5549 msgid "" msgstr "" -#: diff.c:5568 +#: diff.c:5550 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5570 +#: diff.c:5552 msgid "" msgstr "" -#: diff.c:5571 +#: diff.c:5553 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5573 diff.c:5582 diff.c:5585 +#: diff.c:5555 diff.c:5564 diff.c:5567 msgid "" msgstr "" -#: diff.c:5574 +#: diff.c:5556 msgid "show word diff, using to delimit changed words" msgstr "" -#: diff.c:5577 +#: diff.c:5559 msgid "use to decide what a word is" msgstr "" -#: diff.c:5580 +#: diff.c:5562 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "" -#: diff.c:5583 +#: diff.c:5565 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5586 +#: diff.c:5568 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5589 +#: diff.c:5571 msgid "Other diff options" msgstr "" -#: diff.c:5591 +#: diff.c:5573 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5595 +#: diff.c:5577 msgid "treat all files as text" msgstr "" -#: diff.c:5597 +#: diff.c:5579 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5599 +#: diff.c:5581 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5601 +#: diff.c:5583 msgid "disable all output of the program" msgstr "" -#: diff.c:5603 +#: diff.c:5585 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5605 +#: diff.c:5587 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5607 +#: diff.c:5589 msgid "" msgstr "" -#: diff.c:5608 +#: diff.c:5590 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5611 +#: diff.c:5593 msgid "" msgstr "" -#: diff.c:5612 +#: diff.c:5594 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5616 +#: diff.c:5598 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5619 +#: diff.c:5601 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5621 +#: diff.c:5603 msgid "" msgstr "" -#: diff.c:5622 +#: diff.c:5604 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5625 +#: diff.c:5607 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5628 +#: diff.c:5610 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5631 +#: diff.c:5613 msgid "treat in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5634 +#: diff.c:5616 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5635 diff.c:5638 +#: diff.c:5617 diff.c:5620 msgid "" msgstr "" -#: diff.c:5636 +#: diff.c:5618 msgid "show the change in the specified path first" msgstr "" -#: diff.c:5639 +#: diff.c:5621 msgid "skip the output to the specified path" msgstr "" -#: diff.c:5641 +#: diff.c:5623 msgid "" msgstr "" -#: diff.c:5642 +#: diff.c:5624 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5644 +#: diff.c:5626 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5645 +#: diff.c:5627 msgid "select files by diff type" msgstr "" -#: diff.c:5647 +#: diff.c:5629 msgid "" msgstr "" -#: diff.c:5648 +#: diff.c:5630 msgid "Output to a specific file" msgstr "" @@ -3666,11 +3636,11 @@ msgid "exhaustive rename detection was skipped due to too many files." msgstr "" -#: diff.c:6309 +#: diff.c:5496 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6312 +#: diff.c:5499 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3681,7 +3651,7 @@ msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:1564 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "" @@ -3690,70 +3660,70 @@ msgid "No such path '%s' in the diff" msgstr "" -#: dir.c:593 +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:733 dir.c:762 dir.c:775 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "" -#: dir.c:790 dir.c:804 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "" -#: dir.c:820 +#: dir.c:809 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:830 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1214 +#: dir.c:1206 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2464 +#: dir.c:1866 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2766 +#: dir.c:2108 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2890 +#: dir.c:2738 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3158 +#: builtin/clone.c:276 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: dir.c:3837 +#: dir.c:3543 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3884 dir.c:3889 +#: dir.c:3024 dir.c:3029 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3918 +#: dir.c:3054 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:77 +#: editor.c:61 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -3762,12 +3732,12 @@ msgid "Filtering content" msgstr "" -#: entry.c:498 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "" -#: environment.c:143 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" @@ -3777,267 +3747,266 @@ msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:193 +#: fetch-pack.c:253 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:196 +#: fetch-pack.c:185 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:207 +#: fetch-pack.c:265 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:227 +#: fetch-pack.c:285 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:238 +#: fetch-pack.c:227 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:299 +#: fetch-pack.c:337 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:428 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:400 fetch-pack.c:1440 +#: fetch-pack.c:434 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:402 fetch-pack.c:1442 +#: fetch-pack.c:436 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:405 fetch-pack.c:1445 +#: fetch-pack.c:439 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:407 fetch-pack.c:1447 +#: fetch-pack.c:441 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:410 fetch-pack.c:1451 +#: fetch-pack.c:444 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:450 +#: fetch-pack.c:485 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:467 +#: fetch-pack.c:499 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:498 +#: fetch-pack.c:532 msgid "giving up" msgstr "" -#: fetch-pack.c:511 progress.c:339 +#: fetch-pack.c:542 progress.c:229 msgid "done" msgstr "" -#: fetch-pack.c:523 +#: fetch-pack.c:554 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:559 +#: fetch-pack.c:600 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:774 +#: fetch-pack.c:788 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:860 +#: fetch-pack.c:829 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:868 +#: fetch-pack.c:837 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:962 +#: fetch-pack.c:895 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:968 +#: fetch-pack.c:957 msgid "fetch-pack: invalid index-pack output" msgstr "" -#: fetch-pack.c:985 +#: fetch-pack.c:911 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:987 +#: fetch-pack.c:913 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:1030 +#: fetch-pack.c:993 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:1040 +#: fetch-pack.c:940 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1100 +#: fetch-pack.c:999 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1105 +#: fetch-pack.c:1003 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1109 +#: fetch-pack.c:1005 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1111 +#: fetch-pack.c:1100 msgid "Server does not support this repository's object format" msgstr "" -#: fetch-pack.c:1124 +#: fetch-pack.c:1016 msgid "no common commits" msgstr "" -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238 msgid "source repository is shallow, reject to clone." msgstr "" -#: fetch-pack.c:1139 fetch-pack.c:1671 +#: fetch-pack.c:1028 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1253 +#: fetch-pack.c:1242 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1257 +#: fetch-pack.c:1246 #, c-format msgid "the server does not support algorithm '%s'" msgstr "" -#: fetch-pack.c:1290 +#: fetch-pack.c:1279 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1297 +#: fetch-pack.c:985 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1340 fetch-pack.c:2053 +#: fetch-pack.c:1329 fetch-pack.c:2034 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1358 +#: fetch-pack.c:1347 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1364 +#: fetch-pack.c:1353 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1398 +#: fetch-pack.c:1387 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1403 +#: fetch-pack.c:1392 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1413 +#: fetch-pack.c:1402 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1415 +#: fetch-pack.c:1404 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1456 +#: fetch-pack.c:1445 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1505 +#: fetch-pack.c:1494 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1510 +#: fetch-pack.c:1499 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1515 +#: fetch-pack.c:1504 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1545 +#: fetch-pack.c:1534 msgid "git fetch-pack: expected response end packet" msgstr "" -#: fetch-pack.c:1949 +#: fetch-pack.c:1190 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1972 builtin/clone.c:581 +#: builtin/clone.c:661 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:2075 +#: fetch-pack.c:2056 msgid "unexpected 'ready' from remote" msgstr "" -#: fetch-pack.c:2098 +#: fetch-pack.c:1212 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:2101 +#: fetch-pack.c:1215 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 -#: gpg-interface.c:918 +#: gpg-interface.c:211 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:332 gpg-interface.c:454 +#: gpg-interface.c:214 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" @@ -4084,7 +4053,7 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "" -#: gpg-interface.c:874 +#: gpg-interface.c:181 msgid "gpg failed to sign the data" msgstr "O gpg não conseguiu inscrever os dados" @@ -4118,115 +4087,115 @@ msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:533 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:1928 +#: grep.c:2022 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': incapaz de ler %s" -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 -#: builtin/rm.c:136 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1956 +#: grep.c:2050 #, c-format msgid "'%s': short read" msgstr "" -#: help.c:24 +#: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "" -#: help.c:25 +#: common-cmds.h:10 msgid "work on the current change (see also: git help everyday)" msgstr "" -#: help.c:26 +#: common-cmds.h:11 msgid "examine the history and state (see also: git help revisions)" msgstr "" -#: help.c:27 +#: common-cmds.h:12 msgid "grow, mark and tweak your common history" msgstr "" -#: help.c:28 +#: common-cmds.h:13 msgid "collaborate (see also: git help workflows)" msgstr "" -#: help.c:32 +#: help.c:31 msgid "Main Porcelain Commands" msgstr "" -#: help.c:33 +#: help.c:32 msgid "Ancillary Commands / Manipulators" msgstr "" -#: help.c:34 +#: help.c:33 msgid "Ancillary Commands / Interrogators" msgstr "" -#: help.c:35 +#: help.c:34 msgid "Interacting with Others" msgstr "" -#: help.c:36 +#: help.c:35 msgid "Low-level Commands / Manipulators" msgstr "" -#: help.c:37 +#: help.c:36 msgid "Low-level Commands / Interrogators" msgstr "" -#: help.c:38 +#: help.c:37 msgid "Low-level Commands / Syncing Repositories" msgstr "" -#: help.c:39 +#: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:313 +#: help.c:179 #, c-format msgid "available git commands in '%s'" msgstr "Comandos do gip disponíveis em '%s'" -#: help.c:320 +#: help.c:186 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos git disponíveis em outro lugar no seu $PATH" -#: help.c:329 +#: help.c:217 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:378 git.c:100 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "" -#: help.c:418 +#: help.c:405 msgid "The Git concept guides are:" msgstr "" -#: help.c:442 +#: help.c:429 msgid "See 'git help ' to read about a specific subcommand" msgstr "" -#: help.c:447 +#: help.c:434 msgid "External commands" msgstr "" -#: help.c:462 +#: help.c:449 msgid "Command aliases" msgstr "" -#: help.c:543 +#: help.c:281 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4235,21 +4204,21 @@ "'%s' parece ser um comando git, mas não pudemos\n" "executá-lo. É possível que git-%s esteja danificado?" -#: help.c:565 help.c:662 +#: help.c:376 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' não é um comando git. Veja 'git --help'." -#: help.c:613 +#: help.c:336 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh, não! O seu sistema relata a completa ausência de comandos Git." -#: help.c:635 +#: help.c:358 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:640 +#: help.c:363 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" @@ -4259,12 +4228,12 @@ msgid "Run '%s' instead? (y/N)" msgstr "" -#: help.c:654 +#: help.c:368 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:666 +#: help.c:380 msgid "" "\n" "The most similar command is" @@ -4274,16 +4243,16 @@ msgstr[0] "" msgstr[1] "" -#: help.c:706 +#: help.c:395 msgid "git version []" msgstr "" -#: help.c:761 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:765 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -4297,7 +4266,7 @@ "\n" "Você quis dizer algo como em um destes itens?" -#: hook.c:27 +#: run-command.c:1274 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -4312,7 +4281,7 @@ msgid "Committer identity unknown\n" msgstr "" -#: ident.c:362 +#: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4327,35 +4296,35 @@ "\n" msgstr "" -#: ident.c:397 +#: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "" -#: ident.c:402 +#: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -#: ident.c:419 +#: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "" -#: ident.c:425 +#: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "" -#: ident.c:433 +#: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" -#: ident.c:439 +#: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:454 builtin/commit.c:648 +#: ident.c:416 builtin/commit.c:582 #, c-format msgid "invalid date format: %s" msgstr "" @@ -4387,7 +4356,7 @@ msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:264 +#: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "" @@ -4415,12 +4384,12 @@ msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:398 +#: list-objects.c:395 #, c-format msgid "unable to load root tree for commit %s" msgstr "" -#: lockfile.c:152 +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -4432,7 +4401,7 @@ "remove the file manually to continue." msgstr "" -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" @@ -4447,7 +4416,7 @@ msgid "unexpected line: '%s'" msgstr "" -#: ls-refs.c:178 +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "" @@ -4455,44 +4424,44 @@ msgid "quoted CRLF detected" msgstr "" -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "" -#: merge-ort.c:1584 merge-recursive.c:1211 +#: merge-ort.c:1116 merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-ort.c:1593 merge-recursive.c:1218 +#: merge-ort.c:1125 merge-recursive.c:1212 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-ort.c:1602 merge-recursive.c:1225 +#: merge-ort.c:1134 merge-recursive.c:1219 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-ort.c:1612 merge-ort.c:1620 +#: merge-ort.c:1144 merge-ort.c:1151 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "" -#: merge-ort.c:1642 +#: merge-ort.c:1172 #, c-format msgid "Failed to merge submodule %s" msgstr "" -#: merge-ort.c:1649 +#: merge-ort.c:1179 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" "%s\n" msgstr "" -#: merge-ort.c:1653 merge-recursive.c:1281 +#: merge-ort.c:1183 merge-recursive.c:1273 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4503,42 +4472,42 @@ "which will accept this suggestion.\n" msgstr "" -#: merge-ort.c:1666 +#: merge-ort.c:1196 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" -#: merge-ort.c:1887 merge-recursive.c:1372 +#: merge-recursive.c:1029 msgid "Failed to execute internal merge" msgstr "Falha ao executar mescla interna" -#: merge-ort.c:1892 merge-recursive.c:1377 +#: merge-recursive.c:1034 #, c-format msgid "Unable to add %s to database" msgstr "Não foi possível adicionar %s ao banco de dados" -#: merge-ort.c:1899 merge-recursive.c:1410 +#: merge-recursive.c:1800 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-ort.c:2038 merge-recursive.c:2132 +#: merge-ort.c:1566 merge-recursive.c:2122 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-ort.c:2048 merge-recursive.c:2142 +#: merge-ort.c:1576 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-ort.c:2106 +#: merge-ort.c:1634 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " @@ -4546,47 +4515,47 @@ "majority of the files." msgstr "" -#: merge-ort.c:2260 merge-recursive.c:2478 +#: merge-ort.c:1788 merge-recursive.c:2468 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-ort.c:2400 merge-recursive.c:3261 +#: merge-ort.c:1932 merge-recursive.c:3244 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-ort.c:2407 merge-recursive.c:3268 +#: merge-ort.c:1939 merge-recursive.c:3251 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-ort.c:2420 merge-recursive.c:3264 +#: merge-ort.c:1952 merge-recursive.c:3247 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:2428 merge-recursive.c:3271 +#: merge-ort.c:1960 merge-recursive.c:3254 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:2584 +#: merge-ort.c:2103 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" -#: merge-ort.c:2679 +#: merge-ort.c:2198 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " @@ -4594,67 +4563,67 @@ "markers." msgstr "" -#: merge-ort.c:2698 merge-ort.c:2722 +#: merge-ort.c:2217 merge-ort.c:2241 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "" -#: merge-ort.c:3212 merge-recursive.c:3022 +#: merge-recursive.c:1661 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-ort.c:3215 merge-recursive.c:3025 +#: merge-recursive.c:1664 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-ort.c:3644 +#: merge-ort.c:2981 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "" -#: merge-ort.c:3721 +#: merge-ort.c:3055 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" -#: merge-ort.c:3728 +#: merge-ort.c:3062 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." msgstr "" -#: merge-ort.c:3819 merge-recursive.c:3101 +#: merge-recursive.c:1743 msgid "content" msgstr "" -#: merge-ort.c:3821 merge-recursive.c:3105 +#: merge-recursive.c:1750 msgid "add/add" msgstr "" -#: merge-ort.c:3823 merge-recursive.c:3150 +#: merge-recursive.c:1804 git-submodule.sh:879 msgid "submodule" msgstr "" -#: merge-ort.c:3825 merge-recursive.c:3151 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-ort.c:3856 +#: merge-ort.c:3198 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." msgstr "" -#: merge-ort.c:4152 +#: merge-ort.c:3433 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -4664,192 +4633,192 @@ #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4521 +#: merge-ort.c:3730 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3716 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 +#: builtin/merge.c:1412 msgid "Already up to date." msgstr "" -#: merge-recursive.c:353 +#: merge-recursive.c:235 msgid "(bad commit)\n" msgstr "(submissão inválida)\n" -#: merge-recursive.c:381 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:390 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:881 +#: merge-recursive.c:771 #, c-format msgid "failed to create path '%s'%s" msgstr "falha ao criar o caminho '%s'%s" -#: merge-recursive.c:892 +#: merge-recursive.c:782 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "A remover %s para criar espaço para subdiretório\n" -#: merge-recursive.c:906 merge-recursive.c:925 +#: merge-recursive.c:796 merge-recursive.c:815 msgid ": perhaps a D/F conflict?" msgstr ": talvez um conflito de D/F?" -#: merge-recursive.c:915 +#: merge-recursive.c:805 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "recusada a liberação de arquivo não-rastreado em '%s'" -#: merge-recursive.c:956 builtin/cat-file.c:41 +#: merge-recursive.c:847 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "Não foi possível ler o objeto %s '%s'" -#: merge-recursive.c:961 +#: merge-recursive.c:849 #, c-format msgid "blob expected for %s '%s'" msgstr "bolha esperada para %s '%s'" -#: merge-recursive.c:986 +#: merge-recursive.c:873 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:997 +#: merge-recursive.c:884 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:1002 +#: merge-recursive.c:889 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "sem saber o que fazer com %06o %s '%s'" -#: merge-recursive.c:1233 merge-recursive.c:1246 +#: merge-recursive.c:1227 merge-recursive.c:1239 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1236 merge-recursive.c:1249 +#: merge-recursive.c:1230 merge-recursive.c:1242 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1273 +#: merge-recursive.c:1265 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1277 +#: merge-recursive.c:1269 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1278 +#: merge-recursive.c:1270 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1290 +#: merge-recursive.c:1282 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1434 +#: merge-recursive.c:1424 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1506 +#: merge-recursive.c:1146 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1511 +#: merge-recursive.c:1151 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1518 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1523 +#: merge-recursive.c:1163 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1558 +#: merge-recursive.c:1197 msgid "rename" msgstr "" -#: merge-recursive.c:1558 +#: merge-recursive.c:1197 msgid "renamed" msgstr "" -#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1619 +#: merge-recursive.c:1609 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1677 +#: merge-recursive.c:1667 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1708 +#: merge-recursive.c:1254 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1703 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1740 +#: merge-recursive.c:1279 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1745 +#: merge-recursive.c:1284 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1837 +#: merge-recursive.c:1346 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2100 +#: merge-recursive.c:2090 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4857,170 +4826,168 @@ "getting a majority of the files." msgstr "" -#: merge-recursive.c:2234 +#: merge-recursive.c:2224 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:3089 +#: merge-recursive.c:1733 msgid "modify" msgstr "" -#: merge-recursive.c:3089 +#: merge-recursive.c:1733 msgid "modified" msgstr "" -#: merge-recursive.c:3128 +#: merge-recursive.c:1786 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3181 +#: merge-recursive.c:1604 merge-recursive.c:1834 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3385 +#: merge-recursive.c:1899 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3408 +#: merge-recursive.c:1925 msgid "file/directory" msgstr "" -#: merge-recursive.c:3413 +#: merge-recursive.c:1931 msgid "directory/file" msgstr "" -#: merge-recursive.c:3420 +#: merge-recursive.c:1938 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3429 +#: merge-recursive.c:1947 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3438 +#: merge-recursive.c:3421 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3491 +#: merge-recursive.c:2000 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3585 +#: merge-recursive.c:2097 msgid "Merging:" msgstr "" -#: merge-recursive.c:3598 +#: merge-recursive.c:2110 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3648 +#: merge-recursive.c:2149 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3816 +#: merge-recursive.c:2212 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 -#: builtin/stash.c:489 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 msgid "Unable to write index." msgstr "" -#: merge.c:41 +#: merge.c:74 msgid "failed to read the cache" msgstr "falha ao ler o cache" -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 -#: builtin/stash.c:269 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 +#: builtin/checkout.c:599 builtin/clone.c:759 msgid "unable to write new index file" msgstr "impossível escrever novo arquivo de índice" -#: midx.c:78 +#: midx.c:74 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "" -#: midx.c:109 +#: midx.c:105 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:125 +#: midx.c:121 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:130 +#: midx.c:126 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:135 +#: midx.c:131 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:152 +#: midx.c:148 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:154 +#: midx.c:150 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:156 +#: midx.c:152 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:158 +#: midx.c:154 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:174 +#: midx.c:170 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:221 +#: midx.c:214 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:271 +#: midx.c:264 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:502 +#: midx.c:490 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:508 +#: midx.c:496 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:576 +#: midx.c:564 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:892 +#: midx.c:880 builtin/index-pack.c:1535 msgid "cannot store reverse index file" msgstr "" @@ -5047,11 +5014,11 @@ msgid "could not open index for %s" msgstr "" -#: midx.c:1201 +#: midx.c:933 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:1244 +#: midx.c:1024 #, c-format msgid "unknown preferred pack: '%s'" msgstr "" @@ -5061,17 +5028,17 @@ msgid "cannot select preferred pack %s with no objects" msgstr "" -#: midx.c:1321 +#: midx.c:979 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1367 +#: midx.c:1029 #, c-format msgid "preferred pack '%s' is expired" msgstr "" -#: midx.c:1380 +#: midx.c:1045 msgid "no pack files to index." msgstr "" @@ -5083,17 +5050,17 @@ msgid "could not write multi-pack-index" msgstr "" -#: midx.c:1486 builtin/clean.c:37 +#: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "" -#: midx.c:1517 +#: midx.c:1156 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1577 +#: midx.c:1214 msgid "multi-pack-index file exists, but failed to parse" msgstr "" @@ -5101,65 +5068,65 @@ msgid "incorrect checksum" msgstr "" -#: midx.c:1588 +#: midx.c:1222 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1603 +#: midx.c:1237 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" -#: midx.c:1608 +#: midx.c:1242 msgid "the midx contains no oid" msgstr "" -#: midx.c:1617 +#: midx.c:1251 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1626 +#: midx.c:1260 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1646 +#: midx.c:1280 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1653 +#: midx.c:1287 msgid "Verifying object offsets" msgstr "" -#: midx.c:1669 +#: midx.c:1303 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1675 +#: midx.c:1309 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1684 +#: midx.c:1318 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" -#: midx.c:1709 +#: midx.c:1343 msgid "Counting referenced objects" msgstr "" -#: midx.c:1719 +#: midx.c:1353 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1911 +#: midx.c:1544 msgid "could not start pack-objects" msgstr "" -#: midx.c:1931 +#: midx.c:1564 msgid "could not finish pack-objects" msgstr "" @@ -5178,7 +5145,7 @@ msgid "unable to join lazy_name thread: %s" msgstr "" -#: notes-merge.c:277 +#: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -5186,21 +5153,21 @@ "commit/abort the previous merge before you start a new notes merge." msgstr "" -#: notes-merge.c:284 +#: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" -#: notes-utils.c:46 +#: notes-utils.c:43 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:105 +#: notes-utils.c:102 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:115 +#: notes-utils.c:112 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -5209,80 +5176,80 @@ #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:145 +#: notes-utils.c:142 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object-file.c:459 +#: object-file.c:526 #, c-format msgid "" "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: object-file.c:517 +#: object-file.c:577 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: object-file.c:591 +#: object-file.c:649 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: object-file.c:598 +#: object-file.c:656 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: object-file.c:641 +#: object-file.c:699 msgid "unable to fdopen alternates lockfile" msgstr "" -#: object-file.c:659 +#: object-file.c:717 msgid "unable to read alternates file" msgstr "" -#: object-file.c:666 +#: object-file.c:724 msgid "unable to move new alternates file into place" msgstr "" -#: object-file.c:701 +#: sha1_file.c:592 #, c-format msgid "path '%s' does not exist" msgstr "" -#: object-file.c:722 +#: sha1_file.c:618 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: object-file.c:728 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: object-file.c:734 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: object-file.c:742 +#: sha1_file.c:638 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: object-file.c:773 +#: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "" -#: object-file.c:823 +#: object-file.c:860 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: object-file.c:973 +#: object-file.c:1010 #, c-format msgid "attempting to mmap % over limit %" msgstr "" @@ -5292,31 +5259,31 @@ msgid "mmap failed%s" msgstr "" -#: object-file.c:1174 +#: object-file.c:1195 #, c-format msgid "object file %s is empty" msgstr "" -#: object-file.c:1293 object-file.c:2499 +#: object-file.c:1330 object-file.c:2524 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: object-file.c:1295 object-file.c:2503 +#: object-file.c:1332 object-file.c:2528 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: object-file.c:1417 +#: object-file.c:1470 #, c-format msgid "unable to parse %s header" msgstr "" -#: object-file.c:1419 +#: object-file.c:1374 msgid "invalid object type" msgstr "" -#: object-file.c:1430 +#: object-file.c:1461 #, c-format msgid "unable to unpack %s header" msgstr "" @@ -5326,161 +5293,161 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "" -#: object-file.c:1664 +#: object-file.c:1697 #, c-format msgid "failed to read object %s" msgstr "" -#: object-file.c:1668 +#: object-file.c:1701 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: object-file.c:1672 +#: object-file.c:1705 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1676 +#: object-file.c:1709 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1781 +#: object-file.c:1814 #, c-format msgid "unable to write file %s" msgstr "" -#: object-file.c:1788 +#: object-file.c:1821 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: object-file.c:1795 +#: object-file.c:1828 msgid "file write error" msgstr "" -#: object-file.c:1815 +#: object-file.c:1848 msgid "error when closing loose object file" msgstr "" -#: object-file.c:1882 +#: object-file.c:1913 #, c-format msgid "" "insufficient permission for adding an object to repository database %s" msgstr "" -#: object-file.c:1884 +#: object-file.c:1915 msgid "unable to create temporary file" msgstr "" -#: object-file.c:1908 +#: object-file.c:1939 msgid "unable to write loose object file" msgstr "" -#: object-file.c:1914 +#: object-file.c:1945 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: object-file.c:1918 +#: object-file.c:1949 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: object-file.c:1922 +#: object-file.c:1953 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: object-file.c:1933 builtin/pack-objects.c:1243 +#: object-file.c:1963 builtin/pack-objects.c:1097 #, c-format msgid "failed utime() on %s" msgstr "" -#: object-file.c:2011 +#: object-file.c:2040 #, c-format msgid "cannot read object for %s" msgstr "" -#: object-file.c:2062 +#: object-file.c:2091 msgid "corrupt commit" msgstr "" -#: object-file.c:2070 +#: object-file.c:2099 msgid "corrupt tag" msgstr "" -#: object-file.c:2170 +#: object-file.c:2199 #, c-format msgid "read error while indexing %s" msgstr "" -#: object-file.c:2173 +#: object-file.c:2202 #, c-format msgid "short read while indexing %s" msgstr "" -#: object-file.c:2246 object-file.c:2256 +#: object-file.c:2275 object-file.c:2285 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: object-file.c:2262 +#: object-file.c:2291 #, c-format msgid "%s: unsupported file type" msgstr "" -#: object-file.c:2286 builtin/fetch.c:1445 +#: object-file.c:2315 #, c-format msgid "%s is not a valid object" msgstr "" -#: object-file.c:2288 +#: object-file.c:2317 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: object-file.c:2315 +#: builtin/index-pack.c:157 #, c-format msgid "unable to open %s" msgstr "" -#: object-file.c:2510 +#: object-file.c:2535 object-file.c:2588 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: object-file.c:2533 +#: object-file.c:2559 #, c-format msgid "unable to mmap %s" msgstr "" -#: object-file.c:2539 +#: object-file.c:2564 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: object-file.c:2544 +#: object-file.c:2570 #, c-format msgid "unable to parse header of %s" msgstr "" -#: object-file.c:2555 +#: object-file.c:2581 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: object-name.c:480 +#: object-name.c:486 #, c-format msgid "short object ID %s is ambiguous" msgstr "" -#: object-name.c:491 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "" -#: object-name.c:790 +#: object-name.c:796 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -5493,62 +5460,62 @@ "running \"git config advice.objectNameWarning false\"" msgstr "" -#: object-name.c:910 +#: object-name.c:916 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "" -#: object-name.c:918 +#: object-name.c:924 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "" -#: object-name.c:1696 +#: object-name.c:1702 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "" -#: object-name.c:1702 +#: object-name.c:1708 #, c-format msgid "" "path '%s' exists, but not '%s'\n" "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" msgstr "" -#: object-name.c:1711 +#: object-name.c:1717 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "" -#: object-name.c:1739 +#: object-name.c:1745 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" "hint: Did you mean ':%d:%s'?" msgstr "" -#: object-name.c:1755 +#: object-name.c:1761 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" msgstr "" -#: object-name.c:1763 +#: object-name.c:1769 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "" -#: object-name.c:1765 +#: object-name.c:1771 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "" -#: object-name.c:1778 +#: object-name.c:1784 msgid "relative path syntax can't be used outside working tree" msgstr "" -#: object-name.c:1916 +#: object-name.c:1922 #, c-format msgid "invalid object name '%.*s'." msgstr "" @@ -5563,17 +5530,17 @@ msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:250 +#: object.c:232 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:263 +#: object.c:239 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:283 object.c:295 +#: object.c:265 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "" @@ -5586,7 +5553,7 @@ msgid "load_reverse_index: could not open pack" msgstr "" -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251 #, c-format msgid "unable to get size of %s" msgstr "" @@ -5596,7 +5563,7 @@ msgid "could not find %s in pack %s at offset %" msgstr "" -#: pack-bitmap.c:1952 builtin/rev-list.c:92 +#: pack-bitmap.c:1547 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "" @@ -5626,26 +5593,26 @@ msgid "reverse-index file %s has unsupported hash id %" msgstr "" -#: pack-write.c:251 +#: pack-write.c:250 msgid "cannot both write and verify reverse index" msgstr "" -#: pack-write.c:270 +#: pack-write.c:271 #, c-format msgid "could not stat: %s" msgstr "" -#: pack-write.c:282 +#: pack-write.c:283 #, c-format msgid "failed to make %s readable" msgstr "" -#: pack-write.c:520 +#: pack-write.c:522 #, c-format msgid "could not write '%s' promisor file" msgstr "" -#: packfile.c:626 +#: packfile.c:561 msgid "offset before end of packfile (broken .idx?)" msgstr "" @@ -5654,17 +5621,17 @@ msgid "packfile %s cannot be mapped%s" msgstr "" -#: packfile.c:1923 +#: packfile.c:1694 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1927 +#: packfile.c:1698 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format msgid "option `%s' expects a numerical value" msgstr "" @@ -5679,76 +5646,76 @@ msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: parse-options-cb.c:108 #, c-format msgid "malformed object name '%s'" msgstr "" -#: parse-options.c:58 +#: parse-options.c:38 #, c-format msgid "%s requires a value" msgstr "" -#: parse-options.c:93 +#: parse-options.c:73 #, c-format msgid "%s is incompatible with %s" msgstr "" -#: parse-options.c:98 +#: parse-options.c:78 #, c-format msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:112 parse-options.c:116 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "" -#: parse-options.c:114 +#: parse-options.c:94 #, c-format msgid "%s isn't available" msgstr "" -#: parse-options.c:237 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:393 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:427 parse-options.c:435 +#: parse-options.c:420 parse-options.c:428 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:677 parse-options.c:1053 +#: parse-options.c:668 parse-options.c:988 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options.c:891 +#: parse-options.c:879 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:893 +#: parse-options.c:881 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:895 +#: parse-options.c:883 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:919 +#: parse-options.c:619 msgid "..." msgstr "" -#: parse-options.c:933 +#: parse-options.c:638 #, c-format msgid "usage: %s" msgstr "" @@ -5756,7 +5723,7 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:948 +#: parse-options.c:644 #, c-format msgid " or: %s" msgstr "" @@ -5785,92 +5752,92 @@ msgid "%*s%s" msgstr "" -#: parse-options.c:992 +#: parse-options.c:647 #, c-format msgid " %s" msgstr "" -#: parse-options.c:1039 +#: parse-options.c:686 msgid "-NUM" msgstr "" -#: path.c:922 +#: path.c:891 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:150 +#: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:168 +#: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:171 +#: pathspec.c:150 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:214 +#: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:279 +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:286 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:326 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:347 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:352 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:390 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:449 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:465 +#: pathspec.c:466 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "" -#: pathspec.c:541 +#: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:551 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:618 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:663 +#: pathspec.c:664 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -5891,7 +5858,7 @@ msgid "flush packet write failed" msgstr "" -#: pkt-line.c:153 +#: pkt-line.c:153 pkt-line.c:265 msgid "protocol error: impossibly long line" msgstr "" @@ -5899,7 +5866,7 @@ msgid "packet write with format failed" msgstr "" -#: pkt-line.c:204 pkt-line.c:252 +#: pkt-line.c:204 msgid "packet write failed - data exceeds max packet size" msgstr "" @@ -5908,25 +5875,25 @@ msgid "packet write failed: %s" msgstr "" -#: pkt-line.c:349 pkt-line.c:350 +#: pkt-line.c:328 pkt-line.c:329 msgid "read error" msgstr "" -#: pkt-line.c:360 pkt-line.c:361 +#: pkt-line.c:339 pkt-line.c:340 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:390 pkt-line.c:392 +#: pkt-line.c:369 pkt-line.c:371 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:434 sideband.c:165 +#: fetch-pack.c:284 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" @@ -5940,23 +5907,23 @@ msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:1051 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:31 +#: promisor-remote.c:30 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "" -#: promisor-remote.c:38 promisor-remote.c:40 +#: promisor-remote.c:35 promisor-remote.c:37 msgid "promisor-remote: could not write to fetch subprocess" msgstr "" -#: promisor-remote.c:44 +#: promisor-remote.c:41 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "" -#: promisor-remote.c:54 +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" @@ -5965,183 +5932,181 @@ msgid "object-info: expected flush after arguments" msgstr "" -#: prune-packed.c:35 +#: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "" -#: range-diff.c:67 +#: range-diff.c:78 msgid "could not start `log`" msgstr "" -#: range-diff.c:69 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "" -#: range-diff.c:97 sequencer.c:5605 +#: sequencer.c:3285 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:111 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:304 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "" -#: range-diff.c:559 +#: range-diff.c:558 msgid "--left-only and --right-only are mutually exclusive" msgstr "" -#: range-diff.c:562 range-diff.c:564 +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:710 +#: read-cache.c:708 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:726 +#: read-cache.c:724 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:748 +#: read-cache.c:746 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:753 builtin/submodule--helper.c:3241 +#: read-cache.c:751 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:805 +#: read-cache.c:803 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:824 +#: read-cache.c:822 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:835 +#: read-cache.c:833 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1373 +#: read-cache.c:1356 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1588 +#: read-cache.c:1571 msgid "Refresh index" msgstr "" -#: read-cache.c:1720 +#: read-cache.c:1473 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1730 +#: read-cache.c:1483 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1786 +#: read-cache.c:1766 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1789 +#: read-cache.c:1769 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1798 +#: read-cache.c:1778 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1832 +#: read-cache.c:1812 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1834 +#: read-cache.c:1814 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1871 +#: read-cache.c:1851 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1887 +#: read-cache.c:1867 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1944 +#: read-cache.c:1924 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1947 +#: read-cache.c:1927 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1950 +#: read-cache.c:1930 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 -#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 +#: builtin/rm.c:271 builtin/submodule--helper.c:326 msgid "index file corrupt" msgstr "" -#: read-cache.c:2209 +#: read-cache.c:2180 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2222 +#: read-cache.c:2193 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2255 +#: read-cache.c:2226 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2259 +#: read-cache.c:2230 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2263 +#: read-cache.c:2234 #, c-format msgid "%s: index file smaller than expected" msgstr "" @@ -6151,68 +6116,69 @@ msgid "%s: unable to map index file%s" msgstr "" -#: read-cache.c:2310 +#: read-cache.c:2280 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2337 +#: read-cache.c:2307 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2375 +#: read-cache.c:2345 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2434 +#: read-cache.c:2392 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3108 +#: read-cache.c:3138 msgid "failed to convert to a sparse-index" msgstr "" -#: read-cache.c:3179 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3192 +#: read-cache.c:2461 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3204 +#: read-cache.c:2473 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3233 +#: read-cache.c:3263 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3390 +#: read-cache.c:3412 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" -#: rebase-interactive.c:11 +#: sequencer.c:3231 +#, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: rebase-interactive.c:33 +#: sequencer.c:3146 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -6250,19 +6216,19 @@ msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:75 +#: git-rebase--interactive.sh:171 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:78 +#: git-rebase--interactive.sh:175 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:84 +#: git-rebase--interactive.sh:836 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -6271,33 +6237,33 @@ "\n" msgstr "" -#: rebase-interactive.c:89 +#: git-rebase--interactive.sh:991 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 -#: builtin/rebase.c:190 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:119 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229 +#: builtin/rebase.c:253 #, c-format msgid "could not write '%s'." msgstr "" -#: rebase-interactive.c:196 +#: sequencer.c:3212 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:203 +#: sequencer.c:3219 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -6313,91 +6279,91 @@ msgid "%s: 'preserve' superseded by 'merges'" msgstr "" -#: ref-filter.c:42 wt-status.c:2036 +#: ref-filter.c:35 wt-status.c:1842 msgid "gone" msgstr "" -#: ref-filter.c:43 +#: ref-filter.c:36 #, c-format msgid "ahead %d" msgstr "" -#: ref-filter.c:44 +#: ref-filter.c:37 #, c-format msgid "behind %d" msgstr "" -#: ref-filter.c:45 +#: ref-filter.c:38 #, c-format msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:235 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:)" msgstr "" -#: ref-filter.c:237 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:259 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:263 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:265 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:320 +#: ref-filter.c:260 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:344 +#: ref-filter.c:282 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:352 +#: ref-filter.c:290 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:364 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:377 +#: ref-filter.c:315 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "" -#: ref-filter.c:396 +#: ref-filter.c:334 #, c-format msgid "expected %%(trailers:key=)" msgstr "" -#: ref-filter.c:398 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:429 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:431 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" @@ -6407,47 +6373,47 @@ msgid "unrecognized %%(raw) argument: %s" msgstr "" -#: ref-filter.c:458 +#: ref-filter.c:384 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "" -#: ref-filter.c:462 +#: ref-filter.c:388 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "" -#: ref-filter.c:476 +#: ref-filter.c:402 #, c-format msgid "unrecognized email option: %s" msgstr "" -#: ref-filter.c:506 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:,)" msgstr "" -#: ref-filter.c:518 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:525 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:534 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:542 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:560 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" @@ -6457,63 +6423,63 @@ msgid "%%(rest) does not take arguments" msgstr "" -#: ref-filter.c:680 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:707 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:711 +#: ref-filter.c:619 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:844 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:910 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:912 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:914 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:946 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:948 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:950 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:965 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:1027 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "" @@ -6528,81 +6494,87 @@ msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "" -#: ref-filter.c:1706 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1709 +#: ref-filter.c:1559 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "" -#: ref-filter.c:1712 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: ref-filter.c:1716 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: ref-filter.c:1719 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1722 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "" -#: ref-filter.c:1754 ref-filter.c:1972 +#: ref-filter.c:1364 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1764 +#: ref-filter.c:1367 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2155 +#: ref-filter.c:1819 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2245 +#: ref-filter.c:1886 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2250 refs.c:673 +#: ref-filter.c:1891 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2623 +#: ref-filter.c:2152 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2726 +#: ref-filter.c:2246 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2731 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "" -#: refs.c:261 +#: refs.c:264 #, c-format msgid "%s does not point to a valid object!" msgstr "" -#: refs.c:563 +#: refs.c:566 #, c-format msgid "" "Using '%s' as the name for the initial branch. This default branch name\n" @@ -6617,81 +6589,81 @@ "\tgit branch -m \n" msgstr "" -#: refs.c:585 +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "" -#: refs.c:595 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" msgstr "" -#: refs.c:671 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:920 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:927 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:992 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1084 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1155 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2062 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2142 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2153 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2253 refs.c:2283 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2259 refs.c:2294 +#: refs.c:2248 refs.c:2283 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1271 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1285 refs/packed-backend.c:1549 -#: refs/packed-backend.c:1559 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528 +#: refs/packed-backend.c:1538 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1288 refs/packed-backend.c:1562 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541 #, c-format msgid "could not delete references: %s" msgstr "" @@ -6714,17 +6686,17 @@ msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:590 +#: remote.c:795 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:594 +#: remote.c:799 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:598 +#: remote.c:803 #, c-format msgid "%s tracks both %s and %s" msgstr "" @@ -6819,45 +6791,45 @@ msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1724 remote.c:1825 +#: remote.c:1726 remote.c:1828 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1733 +#: remote.c:1735 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1736 +#: remote.c:1738 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1742 +#: remote.c:1744 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1757 +#: remote.c:1759 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1769 +#: remote.c:1771 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1779 +#: remote.c:1782 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1792 +#: remote.c:1795 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1814 +#: remote.c:1817 msgid "cannot resolve 'simple' push to a single destination" msgstr "" @@ -6871,42 +6843,42 @@ msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2119 +#: remote.c:2132 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2123 +#: remote.c:2136 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2126 +#: remote.c:2139 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2130 +#: remote.c:2143 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2133 +#: remote.c:2146 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2137 +#: remote.c:2150 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2143 +#: remote.c:2156 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2146 +#: remote.c:2159 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6914,11 +6886,11 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2154 +#: remote.c:2167 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2157 +#: remote.c:2170 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6929,7 +6901,7 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2167 +#: remote.c:2180 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -6966,7 +6938,7 @@ msgid "there were errors while writing '%s' (%s)" msgstr "" -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "" @@ -7011,8 +6983,8 @@ msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 +#: submodule.c:1894 builtin/submodule--helper.c:1246 +#: builtin/submodule--helper.c:1256 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -7050,7 +7022,7 @@ msgid "could not determine HEAD revision" msgstr "" -#: reset.c:70 reset.c:76 sequencer.c:3705 +#: reset.c:70 reset.c:76 sequencer.c:3669 #, c-format msgid "failed to find tree of %s" msgstr "" @@ -7059,7 +7031,7 @@ msgid "--unsorted-input is incompatible with --no-walk" msgstr "" -#: revision.c:2346 +#: revision.c:2343 msgid "--unpacked= no longer supported" msgstr "" @@ -7067,106 +7039,105 @@ msgid "--no-walk is incompatible with --unsorted-input" msgstr "" -#: revision.c:2690 +#: revision.c:2277 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2693 +#: revision.c:2280 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2895 +#: revision.c:2892 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:1278 +#: run-command.c:1275 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: send-pack.c:150 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:152 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:154 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:378 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:435 +#: send-pack.c:433 msgid "send-pack: unable to fork off fetch subprocess" msgstr "" -#: send-pack.c:457 +#: send-pack.c:455 msgid "push negotiation failed; proceeding anyway with push" msgstr "" -#: send-pack.c:528 +#: send-pack.c:520 msgid "the receiving end does not support this repository's hash algorithm" msgstr "" -#: send-pack.c:537 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:539 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:546 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:551 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:197 +#: sequencer.c:158 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:325 +#: sequencer.c:324 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 -#: builtin/rm.c:408 +#: builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:355 +#: sequencer.c:267 msgid "revert" msgstr "" -#: sequencer.c:357 +#: sequencer.c:269 msgid "cherry-pick" msgstr "" -#: sequencer.c:359 +#: sequencer.c:358 msgid "rebase" msgstr "" -#: sequencer.c:361 +#: sequencer.c:360 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:420 +#: sequencer.c:330 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -7192,109 +7163,108 @@ "run \"git revert --abort\"." msgstr "" -#: sequencer.c:448 sequencer.c:3290 +#: sequencer.c:346 sequencer.c:2245 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:455 +#: sequencer.c:353 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 -#: sequencer.c:3574 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:499 +#: sequencer.c:405 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:503 +#: sequencer.c:409 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:535 +#: sequencer.c:438 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:574 builtin/tag.c:610 +#: builtin/commit.c:1155 builtin/tag.c:542 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:685 +#: sequencer.c:526 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:699 +#: sequencer.c:562 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:713 +#: sequencer.c:542 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:793 +#: sequencer.c:779 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:804 +#: sequencer.c:790 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 -#: builtin/am.c:822 builtin/rebase.c:694 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1044 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:851 +#: sequencer.c:837 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:856 +#: sequencer.c:842 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:861 +#: sequencer.c:847 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:865 +#: sequencer.c:851 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:870 +#: sequencer.c:856 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:872 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:874 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:939 +#: sequencer.c:658 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7311,11 +7281,11 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:1229 +#: sequencer.c:915 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1235 +#: sequencer.c:922 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7330,7 +7300,7 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1248 +#: sequencer.c:935 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7344,364 +7314,363 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1290 +#: sequencer.c:975 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1292 +#: sequencer.c:977 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1338 +#: sequencer.c:1023 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1340 +#: sequencer.c:1025 msgid "detached HEAD" msgstr "" -#: sequencer.c:1344 +#: sequencer.c:1029 msgid " (root-commit)" msgstr "" -#: sequencer.c:1365 +#: sequencer.c:1050 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1367 +#: sequencer.c:1052 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 +#: sequencer.c:1056 builtin/commit.c:1491 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1427 sequencer.c:2312 +#: sequencer.c:1107 sequencer.c:1673 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1471 sequencer.c:1591 +#: sequencer.c:1134 sequencer.c:1186 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1502 sequencer.c:1534 +#: sequencer.c:1485 sequencer.c:1517 #, c-format msgid "invalid author identity '%s'" msgstr "" -#: sequencer.c:1508 +#: sequencer.c:1491 msgid "corrupt author: missing date information" msgstr "" -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 +#: builtin/merge.c:851 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 -#: t/helper/test-fast-rebase.c:217 +#: sequencer.c:2324 sequencer.c:2679 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:1623 +#: sequencer.c:1213 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1628 +#: sequencer.c:1218 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1711 sequencer.c:1992 +#: sequencer.c:1412 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1753 +#: sequencer.c:1387 git-rebase--interactive.sh:452 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1754 +#: sequencer.c:1402 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1755 +#: sequencer.c:1738 msgid "The 1st commit message will be skipped:" msgstr "" -#: sequencer.c:1756 +#: sequencer.c:1407 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1757 +#: sequencer.c:1359 sequencer.c:1384 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1904 sequencer.c:1961 +#: sequencer.c:1378 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1951 +#: sequencer.c:1368 sequencer.c:3265 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1953 sequencer.c:3601 +#: sequencer.c:1370 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1955 +#: sequencer.c:1372 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1979 +#: sequencer.c:1395 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:2089 +#: sequencer.c:1479 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:2096 +#: sequencer.c:2079 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:2115 +#: sequencer.c:1498 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:2123 sequencer.c:2131 +#: sequencer.c:1506 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:2137 +#: sequencer.c:1516 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:2156 +#: sequencer.c:1535 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:2222 +#: sequencer.c:1600 sequencer.c:2397 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:2282 +#: sequencer.c:1654 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:2283 +#: sequencer.c:1655 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2304 +#: sequencer.c:2287 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2362 +#: sequencer.c:1712 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2370 +#: sequencer.c:1718 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2450 +#: sequencer.c:1792 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2459 +#: sequencer.c:1801 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2502 +#: sequencer.c:2477 #, c-format msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2563 +#: sequencer.c:1844 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2574 +#: sequencer.c:1852 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2622 builtin/rebase.c:184 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2660 +#: sequencer.c:2635 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2669 +#: sequencer.c:2644 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2709 +#: sequencer.c:1906 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2711 +#: sequencer.c:1908 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2716 +#: sequencer.c:1913 msgid "no commits parsed." msgstr "" -#: sequencer.c:2727 +#: sequencer.c:1924 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2729 +#: sequencer.c:1926 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2807 +#: sequencer.c:1996 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2916 +#: sequencer.c:2897 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2936 +#: sequencer.c:2062 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:3031 sequencer.c:4905 +#: sequencer.c:1702 msgid "empty commit set passed" msgstr "" -#: sequencer.c:3048 +#: sequencer.c:3029 msgid "revert is already in progress" msgstr "" -#: sequencer.c:3050 +#: sequencer.c:3031 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:3053 +#: sequencer.c:3034 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:3055 +#: sequencer.c:3036 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:3069 +#: sequencer.c:2104 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:3084 +#: sequencer.c:2118 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:3144 sequencer.c:4615 +#: sequencer.c:2173 sequencer.c:2761 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:3146 sequencer.c:3157 +#: sequencer.c:2175 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:3148 sequencer.c:3192 +#: sequencer.c:2177 sequencer.c:2212 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:3178 builtin/grep.c:772 +#: sequencer.c:2198 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:3180 +#: sequencer.c:2200 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:3181 +#: sequencer.c:2201 msgid "unexpected end of file" msgstr "" -#: sequencer.c:3187 +#: sequencer.c:2207 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:3198 +#: sequencer.c:2218 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:3239 +#: sequencer.c:3220 msgid "no revert in progress" msgstr "" -#: sequencer.c:3248 +#: sequencer.c:3229 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:3258 +#: sequencer.c:3239 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:3265 +#: sequencer.c:3246 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3268 +#: sequencer.c:3249 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3430 sequencer.c:4506 +#: sequencer.c:2362 sequencer.c:2659 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3447 +#: sequencer.c:3428 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3455 +#: sequencer.c:3436 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7713,27 +7682,27 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:3465 +#: sequencer.c:3446 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3472 +#: sequencer.c:3453 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 +#: sequencer.c:2402 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3502 +#: sequencer.c:3483 #, c-format msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3517 +#: sequencer.c:2426 #, c-format msgid "" "execution failed: %s\n" @@ -7743,11 +7712,11 @@ "\n" msgstr "" -#: sequencer.c:3523 +#: sequencer.c:2432 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3529 +#: sequencer.c:2438 #, c-format msgid "" "execution succeeded: %s\n" @@ -7758,90 +7727,90 @@ "\n" msgstr "" -#: sequencer.c:3591 +#: sequencer.c:3571 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3664 +#: sequencer.c:3625 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3669 +#: sequencer.c:3630 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3748 +#: sequencer.c:3714 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3780 +#: sequencer.c:3747 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3802 +#: sequencer.c:3769 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3811 +#: sequencer.c:3778 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3823 +#: sequencer.c:3790 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3878 +#: sequencer.c:3806 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:4024 +#: sequencer.c:3989 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:4040 +#: sequencer.c:4005 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:4121 +#: git-rebase.sh:586 msgid "Cannot autostash" msgstr "" -#: sequencer.c:4124 +#: sequencer.c:4082 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: sequencer.c:4130 +#: sequencer.c:4088 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: sequencer.c:4133 +#: sequencer.c:4091 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: sequencer.c:4137 +#: sequencer.c:4095 msgid "could not reset --hard" msgstr "" -#: sequencer.c:4162 +#: sequencer.c:2497 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:4174 +#: sequencer.c:2509 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:4177 +#: sequencer.c:4135 #, c-format msgid "" "%s\n" @@ -7849,29 +7818,29 @@ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:4182 +#: sequencer.c:4140 msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:4183 +#: sequencer.c:4141 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:4255 +#: git-rebase--interactive.sh:735 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:4270 +#: sequencer.c:4249 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:4272 +#: sequencer.c:4251 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4304 +#: sequencer.c:4259 #, c-format msgid "" "Could not execute the todo command\n" @@ -7884,88 +7853,88 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:4350 +#: sequencer.c:4305 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4396 +#: sequencer.c:2595 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4466 +#: sequencer.c:2637 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4514 +#: sequencer.c:2667 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4519 +#: sequencer.c:2672 sequencer.c:3262 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4533 +#: sequencer.c:2686 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4593 +#: sequencer.c:4560 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "" -#: sequencer.c:4645 +#: sequencer.c:2770 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4654 +#: sequencer.c:2784 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4656 +#: sequencer.c:2786 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4658 +#: sequencer.c:2788 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4661 +#: sequencer.c:2791 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4697 sequencer.c:4736 +#: sequencer.c:4664 sequencer.c:4703 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4752 +#: sequencer.c:2775 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4762 +#: sequencer.c:2801 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4882 +#: sequencer.c:2881 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4886 +#: sequencer.c:2885 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4921 +#: sequencer.c:2918 msgid "can't revert as initial commit" msgstr "" @@ -7978,23 +7947,23 @@ msgid "use --reapply-cherry-picks to include skipped commits" msgstr "" -#: sequencer.c:5408 +#: sequencer.c:3023 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5411 +#: sequencer.c:3026 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5669 sequencer.c:5686 +#: sequencer.c:5615 sequencer.c:5632 msgid "nothing to do" msgstr "" -#: sequencer.c:5705 +#: sequencer.c:5651 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5805 +#: sequencer.c:3401 msgid "the script was already rearranged." msgstr "" @@ -8003,14 +7972,14 @@ msgid "'%s' is outside repository at '%s'" msgstr "" -#: setup.c:185 +#: setup.c:171 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" -#: setup.c:198 +#: setup.c:184 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8018,12 +7987,12 @@ "'git [...] -- [...]'" msgstr "" -#: setup.c:264 +#: setup.c:233 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:283 +#: setup.c:252 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8031,15 +8000,15 @@ "'git [...] -- [...]'" msgstr "" -#: setup.c:419 +#: setup.c:388 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:423 builtin/rev-parse.c:895 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:658 +#: setup.c:506 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" @@ -8056,97 +8025,97 @@ msgstr[0] "" msgstr[1] "" -#: setup.c:701 +#: setup.c:533 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:703 +#: setup.c:535 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:705 +#: setup.c:537 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:707 +#: setup.c:539 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:709 +#: setup.c:541 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:711 +#: setup.c:543 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:813 +#: setup.c:642 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:827 +#: setup.c:656 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:856 setup.c:858 setup.c:889 +#: setup.c:685 setup.c:687 setup.c:718 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 msgid "cannot come back to cwd" msgstr "" -#: setup.c:988 +#: setup.c:827 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1231 +#: setup.c:1057 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1240 setup.c:1246 +#: setup.c:1069 setup.c:1075 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1251 +#: setup.c:816 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1257 +#: setup.c:1088 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1381 +#: setup.c:1172 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1443 +#: setup.c:1230 msgid "fork failed" msgstr "" -#: setup.c:1448 +#: setup.c:1235 msgid "setsid failed" msgstr "" -#: sparse-index.c:273 +#: sparse-index.c:239 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "" @@ -8203,13 +8172,13 @@ msgstr[0] "" msgstr[1] "" -#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 -#: builtin/rebase.c:650 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: strbuf.c:1183 +#: strbuf.c:1177 #, c-format msgid "could not edit '%s'" msgstr "" @@ -8219,7 +8188,7 @@ msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule-config.c:304 +#: submodule-config.c:263 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" @@ -8228,175 +8197,175 @@ msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule-config.c:499 +#: submodule-config.c:436 #, c-format msgid "invalid value for %s" msgstr "" -#: submodule-config.c:767 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:114 submodule.c:143 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:118 submodule.c:147 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:154 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:165 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:358 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:389 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:466 +#: submodule.c:436 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "" -#: submodule.c:844 +#: submodule.c:818 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "" -#: submodule.c:954 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1042 +#: submodule.c:1006 #, c-format msgid "" "Could not run 'git rev-list --not --remotes -n 1' command in " "submodule %s" msgstr "" -#: submodule.c:1165 +#: submodule.c:1129 #, c-format msgid "process for submodule '%s' failed" msgstr "" -#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1205 +#: submodule.c:1169 #, c-format msgid "Pushing submodule '%s'\n" msgstr "" -#: submodule.c:1208 +#: submodule.c:1172 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "" -#: submodule.c:1491 +#: submodule.c:1464 #, c-format msgid "Fetching submodule %s%s\n" msgstr "" -#: submodule.c:1525 +#: submodule.c:1498 #, c-format msgid "Could not access submodule '%s'\n" msgstr "" -#: submodule.c:1680 +#: submodule.c:1653 #, c-format msgid "" "Errors during submodule fetch:\n" "%s" msgstr "" -#: submodule.c:1705 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1722 +#: submodule.c:1695 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "" -#: submodule.c:1763 +#: submodule.c:1736 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "" -#: submodule.c:1838 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1851 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1868 +#: submodule.c:1839 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1895 submodule.c:2210 +#: submodule.c:1981 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1917 +#: submodule.c:1887 msgid "could not reset submodule index" msgstr "" -#: submodule.c:1959 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:2013 +#: submodule.c:1981 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2081 +#: submodule.c:2049 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2102 +#: submodule.c:1878 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2114 submodule.c:2174 +#: submodule.c:1890 submodule.c:1946 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2118 +#: submodule.c:2086 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2124 +#: submodule.c:1897 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8404,11 +8373,11 @@ "'%s'\n" msgstr "" -#: submodule.c:2255 +#: submodule.c:2025 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2295 +#: submodule.c:2064 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -8418,57 +8387,56 @@ msgid "failed to lstat '%s'" msgstr "" -#: trailer.c:244 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 -#: trailer.c:570 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 -#: builtin/remote.c:327 +#: trailer.c:539 trailer.c:544 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:743 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:763 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573 +#: trailer.c:753 msgid "could not read from stdin" msgstr "" -#: trailer.c:1024 wrapper.c:684 +#: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:1026 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:1028 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:1040 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "" -#: trailer.c:1080 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -8515,7 +8483,7 @@ msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1251 +#: transport-helper.c:549 transport-helper.c:1247 #, c-format msgid "could not read ref %s" msgstr "" @@ -8533,7 +8501,7 @@ msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1475 +#: transport-helper.c:661 transport.c:1471 msgid "operation not supported by protocol" msgstr "" @@ -8542,7 +8510,7 @@ msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:693 transport.c:404 +#: transport-helper.c:693 transport.c:397 msgid "--negotiate-only requires protocol v2" msgstr "" @@ -8555,115 +8523,115 @@ msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:859 +#: transport-helper.c:855 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:942 +#: transport-helper.c:938 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:945 +#: transport-helper.c:941 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:948 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:953 +#: transport-helper.c:949 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:957 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --%s" msgstr "" -#: transport-helper.c:964 +#: transport-helper.c:960 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:1064 +#: transport-helper.c:1060 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1069 +#: transport-helper.c:1065 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1116 +#: transport-helper.c:1112 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1121 +#: transport-helper.c:1117 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1146 +#: transport-helper.c:1142 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1228 +#: transport-helper.c:1224 #, c-format msgid "unsupported object format '%s'" msgstr "" -#: transport-helper.c:1237 +#: transport-helper.c:1233 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1389 +#: transport-helper.c:1385 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1416 +#: transport-helper.c:1412 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1465 +#: transport-helper.c:1461 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1469 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1488 transport-helper.c:1492 +#: transport-helper.c:1484 transport-helper.c:1488 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1529 +#: transport-helper.c:1525 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1533 +#: transport-helper.c:1529 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1551 transport-helper.c:1560 +#: transport-helper.c:1547 transport-helper.c:1556 msgid "can't start thread for copying data" msgstr "" -#: transport.c:116 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" @@ -8673,53 +8641,53 @@ msgid "could not read bundle '%s'" msgstr "" -#: transport.c:227 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:279 +#: transport.c:272 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:280 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:407 +#: transport.c:400 msgid "server does not support wait-for-done" msgstr "" -#: transport.c:759 +#: transport.c:751 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:834 +#: transport.c:826 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:967 +#: transport.c:960 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:1033 +#: transport.c:1026 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:1082 +#: transport.c:1079 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1185 +#: transport.c:916 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1189 +#: transport.c:920 #, c-format msgid "" "\n" @@ -8735,122 +8703,122 @@ "\n" msgstr "" -#: transport.c:1197 +#: transport.c:928 msgid "Aborting." msgstr "" -#: transport.c:1344 +#: transport.c:1340 msgid "failed to push all needed submodules" msgstr "" -#: tree-walk.c:33 +#: tree-walk.c:31 msgid "too-short tree object" msgstr "" -#: tree-walk.c:39 +#: tree-walk.c:37 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:43 +#: tree-walk.c:41 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:118 +#: tree-walk.c:114 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:108 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:117 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:122 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:125 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:129 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:138 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:143 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:148 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8858,7 +8826,7 @@ "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8866,40 +8834,40 @@ "%%s" msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:161 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:164 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:166 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:165 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update submodule:\n" @@ -8929,7 +8897,7 @@ "%s" msgstr "" -#: unpack-trees.c:264 +#: unpack-trees.c:251 #, c-format msgid "Aborting\n" msgstr "" @@ -8952,16 +8920,16 @@ "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1620 +#: unpack-trees.c:1519 msgid "Updating index flags" msgstr "" -#: unpack-trees.c:2772 +#: unpack-trees.c:2608 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" -#: upload-pack.c:1561 +#: upload-pack.c:1548 msgid "expected flush after fetch arguments" msgstr "" @@ -8998,100 +8966,100 @@ msgid "Fetching objects" msgstr "" -#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 +#: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:303 +#: worktree.c:291 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:314 +#: worktree.c:302 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:326 +#: worktree.c:314 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:332 +#: worktree.c:320 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:328 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: worktree.c:603 +#: worktree.c:608 msgid "not a directory" msgstr "" -#: worktree.c:612 +#: worktree.c:617 msgid ".git is not a file" msgstr "" -#: worktree.c:614 +#: worktree.c:619 msgid ".git file broken" msgstr "" -#: worktree.c:616 +#: worktree.c:621 msgid ".git file incorrect" msgstr "" -#: worktree.c:722 +#: worktree.c:727 msgid "not a valid path" msgstr "" -#: worktree.c:728 +#: worktree.c:733 msgid "unable to locate repository; .git is not a file" msgstr "" -#: worktree.c:732 +#: worktree.c:737 msgid "" "unable to locate repository; .git file does not reference a repository" msgstr "" -#: worktree.c:736 +#: worktree.c:741 msgid "unable to locate repository; .git file broken" msgstr "" -#: worktree.c:742 +#: worktree.c:747 msgid "gitdir unreadable" msgstr "" -#: worktree.c:746 +#: worktree.c:751 msgid "gitdir incorrect" msgstr "" -#: worktree.c:771 +#: worktree.c:776 msgid "not a valid directory" msgstr "" -#: worktree.c:777 +#: worktree.c:782 msgid "gitdir file does not exist" msgstr "" -#: worktree.c:782 worktree.c:791 +#: worktree.c:787 worktree.c:796 #, c-format msgid "unable to read gitdir file (%s)" msgstr "" -#: worktree.c:801 +#: worktree.c:806 #, c-format msgid "short read (expected % bytes, read %)" msgstr "" -#: worktree.c:809 +#: worktree.c:814 msgid "invalid gitdir file" msgstr "" -#: worktree.c:817 +#: worktree.c:822 msgid "gitdir file points to non-existent location" msgstr "" @@ -9100,26 +9068,26 @@ msgid "could not setenv '%s'" msgstr "" -#: wrapper.c:203 +#: builtin/index-pack.c:320 #, c-format msgid "unable to create '%s'" msgstr "" -#: wrapper.c:205 wrapper.c:375 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:406 wrapper.c:607 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:615 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "" -#: wt-status.c:158 +#: wt-status.c:151 msgid "Unmerged paths:" msgstr "" @@ -9132,35 +9100,35 @@ msgid " (use \"git restore --source=%s --staged ...\" to unstage)" msgstr "" -#: wt-status.c:193 wt-status.c:225 +#: wt-status.c:180 wt-status.c:207 msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:197 +#: wt-status.c:184 msgid " (use \"git add ...\" to mark resolution)" msgstr "" -#: wt-status.c:199 wt-status.c:203 +#: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:201 +#: wt-status.c:188 msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1125 +#: wt-status.c:199 wt-status.c:1007 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1134 +#: wt-status.c:217 wt-status.c:1016 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:238 +#: wt-status.c:221 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:240 +#: wt-status.c:223 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" @@ -9169,109 +9137,109 @@ " (use \"git restore ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:243 +#: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:254 +#: wt-status.c:238 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: wt-status.c:266 +#: wt-status.c:253 msgid "both deleted:" msgstr "" -#: wt-status.c:268 +#: wt-status.c:255 msgid "added by us:" msgstr "" -#: wt-status.c:270 +#: wt-status.c:257 msgid "deleted by them:" msgstr "" -#: wt-status.c:272 +#: wt-status.c:259 msgid "added by them:" msgstr "" -#: wt-status.c:274 +#: wt-status.c:261 msgid "deleted by us:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:263 msgid "both added:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:265 msgid "both modified:" msgstr "" -#: wt-status.c:288 +#: wt-status.c:275 msgid "new file:" msgstr "" -#: wt-status.c:290 +#: wt-status.c:277 msgid "copied:" msgstr "" -#: wt-status.c:292 +#: wt-status.c:279 msgid "deleted:" msgstr "" -#: wt-status.c:294 +#: wt-status.c:281 msgid "modified:" msgstr "" -#: wt-status.c:296 +#: wt-status.c:283 msgid "renamed:" msgstr "" -#: wt-status.c:298 +#: wt-status.c:285 msgid "typechange:" msgstr "" -#: wt-status.c:300 +#: wt-status.c:287 msgid "unknown:" msgstr "" -#: wt-status.c:302 +#: wt-status.c:289 msgid "unmerged:" msgstr "" -#: wt-status.c:382 +#: wt-status.c:369 msgid "new commits, " msgstr "" -#: wt-status.c:384 +#: wt-status.c:371 msgid "modified content, " msgstr "" -#: wt-status.c:386 +#: wt-status.c:373 msgid "untracked content, " msgstr "" -#: wt-status.c:958 +#: wt-status.c:847 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:989 +#: wt-status.c:879 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:991 +#: wt-status.c:881 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1073 +#: wt-status.c:963 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1165 +#: wt-status.c:1115 #, c-format msgid "" "\n" @@ -9279,209 +9247,209 @@ "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1195 +#: wt-status.c:1076 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1198 +#: wt-status.c:1079 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1200 +#: wt-status.c:1081 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1204 +#: wt-status.c:1086 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1207 +#: wt-status.c:1089 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1216 +#: wt-status.c:1099 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1219 +#: wt-status.c:1102 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1223 +#: wt-status.c:1106 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1225 +#: wt-status.c:1108 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1227 +#: wt-status.c:1110 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1360 +#: wt-status.c:1242 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1362 +#: wt-status.c:1244 msgid "No commands done." msgstr "" -#: wt-status.c:1365 +#: wt-status.c:1247 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1376 +#: wt-status.c:1258 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1263 msgid "No commands remaining." msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1266 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1392 +#: wt-status.c:1274 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1404 +#: wt-status.c:1287 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1409 +#: wt-status.c:1292 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1422 +#: wt-status.c:1306 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1424 +#: wt-status.c:1308 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1426 +#: wt-status.c:1310 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1433 +#: wt-status.c:1316 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1320 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1442 +#: wt-status.c:1325 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1445 +#: wt-status.c:1328 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1449 +#: wt-status.c:1332 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1454 +#: wt-status.c:1337 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1457 +#: wt-status.c:1340 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1342 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1470 +#: wt-status.c:1420 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1473 +#: wt-status.c:1352 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1480 +#: wt-status.c:1357 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1483 +#: wt-status.c:1433 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1486 +#: wt-status.c:1360 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1488 +#: wt-status.c:1438 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1490 +#: wt-status.c:1362 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1500 +#: wt-status.c:1450 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1503 +#: wt-status.c:1371 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1509 +#: wt-status.c:1376 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1512 +#: wt-status.c:1462 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1515 +#: wt-status.c:1379 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1517 +#: wt-status.c:1467 msgid " (use \"git revert --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1519 +#: wt-status.c:1381 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1529 +#: wt-status.c:1392 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1533 +#: wt-status.c:1396 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1536 +#: wt-status.c:1399 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" @@ -9489,52 +9457,52 @@ msgid "You are in a sparse checkout." msgstr "" -#: wt-status.c:1550 +#: wt-status.c:1497 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" -#: wt-status.c:1794 +#: wt-status.c:1596 msgid "On branch " msgstr "" -#: wt-status.c:1801 +#: wt-status.c:1602 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1803 +#: wt-status.c:1604 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1808 +#: wt-status.c:1609 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1810 +#: wt-status.c:1611 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1813 +#: wt-status.c:1614 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1830 +#: wt-status.c:1634 msgid "Initial commit" msgstr "" -#: wt-status.c:1831 +#: wt-status.c:1635 msgid "No commits yet" msgstr "" -#: wt-status.c:1845 +#: wt-status.c:1649 msgid "Untracked files" msgstr "" -#: wt-status.c:1847 +#: wt-status.c:1651 msgid "Ignored files" msgstr "" -#: wt-status.c:1851 +#: wt-status.c:1655 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9542,228 +9510,228 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1857 +#: wt-status.c:1661 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1859 +#: wt-status.c:1663 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1865 +#: wt-status.c:1669 msgid "No changes" msgstr "" -#: wt-status.c:1870 +#: wt-status.c:1674 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1874 +#: wt-status.c:1677 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1878 +#: wt-status.c:1680 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1882 +#: wt-status.c:1683 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1886 +#: wt-status.c:1686 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1890 wt-status.c:1896 +#: wt-status.c:1689 wt-status.c:1694 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1893 +#: wt-status.c:1692 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1898 +#: wt-status.c:1696 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:2003 +#: wt-status.c:1809 msgid "No commits yet on " msgstr "" -#: wt-status.c:2007 +#: wt-status.c:1813 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:2038 +#: wt-status.c:1844 msgid "different" msgstr "" -#: wt-status.c:2040 wt-status.c:2048 +#: wt-status.c:1846 wt-status.c:1854 msgid "behind " msgstr "" -#: wt-status.c:2043 wt-status.c:2046 +#: wt-status.c:1849 wt-status.c:1852 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2569 +#: wt-status.c:2358 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2575 +#: wt-status.c:2364 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2577 +#: wt-status.c:2366 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:183 +#: compat/simple-ipc/ipc-unix-socket.c:178 msgid "could not send IPC command" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:190 +#: compat/simple-ipc/ipc-unix-socket.c:185 msgid "could not read IPC response" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:870 +#: compat/simple-ipc/ipc-unix-socket.c:862 #, c-format msgid "could not start accept_thread '%s'" msgstr "" -#: compat/simple-ipc/ipc-unix-socket.c:882 +#: compat/simple-ipc/ipc-unix-socket.c:874 #, c-format msgid "could not start worker[0] for '%s'" msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:347 +#: compat/precompose_utf8.c:58 builtin/clone.c:440 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:26 +#: builtin/add.c:24 msgid "git add [] [--] ..." msgstr "" -#: builtin/add.c:64 +#: builtin/add.c:61 #, c-format msgid "cannot chmod %cx '%s'" msgstr "" -#: builtin/add.c:106 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:111 builtin/commit.c:298 +#: builtin/add.c:88 builtin/commit.c:257 msgid "updating files failed" msgstr "" -#: builtin/add.c:121 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:205 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:317 builtin/rev-parse.c:993 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "" -#: builtin/add.c:330 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "" -#: builtin/add.c:333 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "" -#: builtin/add.c:336 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:338 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:343 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 -#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "" -#: builtin/add.c:374 +#: builtin/add.c:294 msgid "interactive picking" msgstr "" -#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:376 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:377 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:378 +#: builtin/add.c:298 msgid "update tracked files" msgstr "" -#: builtin/add.c:379 +#: builtin/add.c:299 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:380 +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:381 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:384 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:386 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:387 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:388 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "" @@ -9771,19 +9739,19 @@ msgid "allow updating entries outside of the sparse-checkout cone" msgstr "" -#: builtin/add.c:391 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:393 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:395 +#: builtin/add.c:386 msgid "backend for `git stash -p`" msgstr "" -#: builtin/add.c:413 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9801,192 +9769,192 @@ "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:442 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:462 +#: builtin/add.c:451 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" "\"git config advice.addIgnoredFile false\"" msgstr "" -#: builtin/add.c:477 +#: builtin/add.c:380 msgid "adding files failed" msgstr "" -#: builtin/add.c:513 +#: builtin/add.c:488 msgid "--dry-run is incompatible with --interactive/--patch" msgstr "" -#: builtin/add.c:515 builtin/commit.c:358 +#: builtin/add.c:490 builtin/commit.c:357 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "" -#: builtin/add.c:532 +#: builtin/add.c:507 msgid "--pathspec-from-file is incompatible with --edit" msgstr "" -#: builtin/add.c:544 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:547 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:551 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 -#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 +#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363 +#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1637 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "" -#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 -#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 +#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369 +#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1643 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" -#: builtin/add.c:583 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:585 +#: builtin/add.c:557 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" "\"git config advice.addEmptyPathspec false\"" msgstr "" -#: builtin/am.c:366 +#: builtin/am.c:414 msgid "could not parse author script" msgstr "" -#: builtin/am.c:456 +#: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:498 +#: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:536 +#: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:562 +#: builtin/am.c:602 msgid "fseek failed" msgstr "" -#: builtin/am.c:750 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:815 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:863 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:868 builtin/am.c:880 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "" -#: builtin/am.c:875 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:968 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:973 builtin/clone.c:300 +#: builtin/am.c:1013 builtin/clone.c:405 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:978 +#: builtin/am.c:1018 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1127 +#: builtin/am.c:1162 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1128 +#: builtin/am.c:1163 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1129 +#: builtin/am.c:1164 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1224 +#: builtin/am.c:1222 msgid "" "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1252 +#: builtin/am.c:1271 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1317 +#: builtin/am.c:1315 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1320 +#: builtin/am.c:1337 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1539 +#: builtin/am.c:1554 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1541 +#: builtin/am.c:1556 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1560 +#: builtin/am.c:1575 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1566 +#: builtin/am.c:1581 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1592 +#: builtin/am.c:1606 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1624 +#: builtin/am.c:1637 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1676 builtin/am.c:1680 +#: builtin/am.c:1683 builtin/am.c:1687 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1698 +#: builtin/am.c:1708 msgid "Commit Body is:" msgstr "" @@ -9994,46 +9962,45 @@ #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1708 -#, c-format +#: builtin/am.c:1718 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1754 builtin/commit.c:409 +#: builtin/am.c:1148 builtin/commit.c:342 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1758 +#: builtin/am.c:1768 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1798 builtin/am.c:1865 +#: builtin/am.c:1808 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1815 +#: builtin/am.c:1824 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1821 +#: builtin/am.c:1832 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1825 +#: builtin/am.c:1823 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1868 +#: builtin/am.c:1882 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1875 +#: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10041,201 +10008,197 @@ "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 -#: builtin/reset.c:361 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 +#: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2035 builtin/am.c:2111 +#: builtin/am.c:2048 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2079 +#: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2187 +#: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2226 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2230 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2210 msgid "git am [] [( | )...]" msgstr "" -#: builtin/am.c:2265 +#: builtin/am.c:2211 msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2271 +#: builtin/am.c:2217 msgid "run interactively" msgstr "" -#: builtin/am.c:2273 +#: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:640 builtin/stash.c:961 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:182 msgid "be quiet" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2275 msgid "add a Signed-off-by trailer to the commit message" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2283 +#: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2285 +#: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2287 +#: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2289 +#: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2297 +#: builtin/am.c:2294 msgid "pass it through git-mailinfo" msgstr "" -#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 -#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 -#: builtin/am.c:2327 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 +#: builtin/am.c:2270 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 -#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 -#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 -#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:315 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257 msgid "n" msgstr "" -#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 -#: builtin/verify-tag.c:38 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/am.c:2324 +#: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2330 +#: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2332 +#: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2335 +#: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2338 +#: builtin/am.c:2281 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2341 +#: builtin/am.c:2338 msgid "restore the original branch and abort the patching operation" msgstr "" -#: builtin/am.c:2344 +#: builtin/am.c:2341 msgid "abort the patching operation but keep HEAD where it is" msgstr "" -#: builtin/am.c:2348 +#: builtin/am.c:2345 msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2353 +#: builtin/am.c:2294 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2355 +#: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 -#: builtin/revert.c:117 builtin/tag.c:460 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 msgid "key-id" msgstr "" -#: builtin/am.c:2358 builtin/rebase.c:1100 +#: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2361 +#: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2379 +#: builtin/am.c:2320 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2386 +#: builtin/am.c:2327 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2401 +#: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2425 +#: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2431 +#: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2441 +#: builtin/am.c:2438 msgid "interactive mode requires patches on the command line" msgstr "" @@ -10243,32 +10206,32 @@ msgid "git apply [] [...]" msgstr "" -#: builtin/archive.c:18 +#: builtin/archive.c:20 msgid "could not redirect output" msgstr "" -#: builtin/archive.c:35 +#: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "" -#: builtin/archive.c:59 +#: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "" -#: builtin/archive.c:62 +#: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "" -#: builtin/archive.c:63 +#: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "" -#: builtin/archive.c:67 +#: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:23 msgid "git bisect--helper --bisect-reset []" msgstr "" @@ -10313,12 +10276,12 @@ msgid "git bisect--helper --bisect-run ..." msgstr "" -#: builtin/bisect--helper.c:109 +#: builtin/bisect--helper.c:107 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "" -#: builtin/bisect--helper.c:116 +#: builtin/bisect--helper.c:114 #, c-format msgid "could not write to file '%s'" msgstr "" @@ -10328,69 +10291,69 @@ msgid "cannot open file '%s' for reading" msgstr "" -#: builtin/bisect--helper.c:170 +#: builtin/bisect--helper.c:46 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:50 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:184 +#: builtin/bisect--helper.c:60 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:194 +#: builtin/bisect--helper.c:71 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:218 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:227 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:276 +#: builtin/bisect--helper.c:259 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:288 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:314 +#: builtin/bisect--helper.c:297 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:341 +#: builtin/bisect--helper.c:324 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:345 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10398,7 +10361,7 @@ "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:365 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -10406,120 +10369,118 @@ #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. -#: builtin/bisect--helper.c:373 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:434 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:437 +#: builtin/bisect--helper.c:420 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:447 +#: builtin/bisect--helper.c:430 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021 msgid "revision walk setup failed\n" msgstr "" -#: builtin/bisect--helper.c:536 +#: builtin/bisect--helper.c:519 #, c-format msgid "could not open '%s' for appending" msgstr "" -#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668 +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:682 +#: builtin/bisect--helper.c:665 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:713 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:728 +#: builtin/bisect--helper.c:711 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" -#: builtin/bisect--helper.c:749 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:752 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:772 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:830 +#: builtin/bisect--helper.c:813 msgid "You need to start by \"git bisect start\"\n" msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. -#: builtin/bisect--helper.c:841 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:859 +#: builtin/bisect--helper.c:842 msgid "Please call `--bisect-state` with at least one argument" msgstr "" -#: builtin/bisect--helper.c:872 +#: builtin/bisect--helper.c:855 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "" -#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880 #, c-format msgid "Bad rev input: %s" msgstr "" -#: builtin/bisect--helper.c:904 +#: builtin/bisect--helper.c:887 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "" -#: builtin/bisect--helper.c:936 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "" -#: builtin/bisect--helper.c:986 +#: builtin/bisect--helper.c:969 #, c-format msgid "'%s'?? what are you talking about?" msgstr "" -#: builtin/bisect--helper.c:998 +#: builtin/bisect--helper.c:981 #, c-format msgid "cannot read file '%s' for replaying" msgstr "" -#: builtin/bisect--helper.c:1107 builtin/bisect--helper.c:1274 +#: git-bisect.sh:453 msgid "bisect run failed: no command provided." msgstr "" @@ -10538,12 +10499,11 @@ msgid "cannot open file '%s' for writing" msgstr "" -#: builtin/bisect--helper.c:1152 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "" -#: builtin/bisect--helper.c:1154 -#, c-format +#: git-bisect.sh:504 msgid "bisect run success" msgstr "" @@ -10559,39 +10519,39 @@ "code %d" msgstr "" -#: builtin/bisect--helper.c:1192 +#: builtin/bisect--helper.c:1054 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:1194 +#: builtin/bisect--helper.c:1056 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:1196 +#: builtin/bisect--helper.c:1058 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:1198 +#: builtin/bisect--helper.c:1060 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:1200 +#: builtin/bisect--helper.c:1062 msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:1202 +#: builtin/bisect--helper.c:1064 msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:1204 +#: builtin/bisect--helper.c:1066 msgid "list the bisection steps so far" msgstr "" -#: builtin/bisect--helper.c:1206 +#: builtin/bisect--helper.c:1068 msgid "replay the bisection process from the given file" msgstr "" -#: builtin/bisect--helper.c:1208 +#: builtin/bisect--helper.c:1070 msgid "skip some commits for checkout" msgstr "" @@ -10603,183 +10563,180 @@ msgid "use ... to automatically bisect." msgstr "" -#: builtin/bisect--helper.c:1214 +#: builtin/bisect--helper.c:1072 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:1229 +#: builtin/bisect--helper.c:1087 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:1234 +#: builtin/bisect--helper.c:1098 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/bisect--helper.c:1243 +#: builtin/bisect--helper.c:1107 msgid "--bisect-next requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:1254 +#: builtin/bisect--helper.c:1118 msgid "--bisect-log requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:1259 +#: builtin/bisect--helper.c:1123 msgid "no logfile given" msgstr "" -#: builtin/blame.c:32 +#: builtin/blame.c:27 msgid "git blame [] [] [] [--] " msgstr "" -#: builtin/blame.c:37 +#: builtin/blame.c:32 msgid " are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:406 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:413 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "" -#: builtin/blame.c:724 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:742 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:841 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:867 msgid "show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:868 msgid "do not show object names of boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:865 +#: builtin/blame.c:869 msgid "do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:866 +#: builtin/blame.c:870 msgid "show work cost statistics" msgstr "" -#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 -#: builtin/merge.c:298 builtin/multi-pack-index.c:103 -#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 -#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 -#: builtin/send-pack.c:202 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/blame.c:868 +#: builtin/blame.c:872 msgid "show output score for blame entries" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:873 msgid "show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:870 +#: builtin/blame.c:874 msgid "show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:871 +#: builtin/blame.c:875 msgid "show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:872 +#: builtin/blame.c:876 msgid "show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:877 msgid "use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:878 msgid "show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:879 msgid "show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:880 msgid "suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:881 msgid "show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:882 msgid "ignore whitespace differences" msgstr "" -#: builtin/blame.c:879 builtin/log.c:1823 +#: builtin/blame.c:883 builtin/log.c:1820 msgid "rev" msgstr "" -#: builtin/blame.c:879 +#: builtin/blame.c:883 msgid "ignore when blaming" msgstr "" -#: builtin/blame.c:880 +#: builtin/blame.c:884 msgid "ignore revisions from " msgstr "" -#: builtin/blame.c:881 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:882 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "" -#: builtin/blame.c:883 +#: builtin/blame.c:887 msgid "spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:884 +#: builtin/blame.c:888 msgid "use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:885 +#: builtin/blame.c:889 msgid "use 's contents as the final image" msgstr "" -#: builtin/blame.c:886 builtin/blame.c:887 +#: builtin/blame.c:704 builtin/blame.c:705 msgid "score" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:890 msgid "find line copies within and across files" msgstr "" -#: builtin/blame.c:887 +#: builtin/blame.c:891 msgid "find line movements within and across files" msgstr "" -#: builtin/blame.c:888 +#: builtin/blame.c:892 msgid "range" msgstr "" -#: builtin/blame.c:889 +#: builtin/blame.c:893 msgid "process only line range , or function :" msgstr "" -#: builtin/blame.c:944 +#: builtin/blame.c:753 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -10791,18 +10748,18 @@ #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:804 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1111 +#: builtin/blame.c:890 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1156 +#: builtin/blame.c:936 msgid "Blaming lines" msgstr "" @@ -10810,161 +10767,161 @@ msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "" -#: builtin/branch.c:30 +#: builtin/branch.c:28 msgid "git branch [] [-l] [-f] []" msgstr "" -#: builtin/branch.c:31 +#: builtin/branch.c:29 msgid "git branch [] [-r] (-d | -D) ..." msgstr "" -#: builtin/branch.c:32 +#: builtin/branch.c:30 msgid "git branch [] (-m | -M) [] " msgstr "" -#: builtin/branch.c:33 +#: builtin/branch.c:31 msgid "git branch [] (-c | -C) [] " msgstr "" -#: builtin/branch.c:34 +#: builtin/branch.c:32 msgid "git branch [] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:35 +#: builtin/branch.c:33 msgid "git branch [] [-r | -a] [--format]" msgstr "" -#: builtin/branch.c:154 +#: builtin/branch.c:146 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:158 +#: builtin/branch.c:150 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:172 +#: builtin/branch.c:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:176 +#: builtin/branch.c:168 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:189 +#: builtin/branch.c:181 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:223 +#: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:230 +#: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:244 +#: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:260 +#: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:291 +#: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:292 +#: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:441 builtin/tag.c:63 +#: builtin/branch.c:417 builtin/tag.c:58 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:472 +#: builtin/branch.c:471 msgid "could not resolve HEAD" msgstr "" -#: builtin/branch.c:478 +#: builtin/branch.c:477 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "" -#: builtin/branch.c:493 +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:497 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:514 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:516 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:527 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:556 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:558 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:562 +#: builtin/branch.c:517 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:565 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:571 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:580 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:582 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:598 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10972,247 +10929,247 @@ "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:586 msgid "Generic options" msgstr "" -#: builtin/branch.c:634 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:635 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:636 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:592 msgid "do not use" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:594 msgid "upstream" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:641 +#: builtin/branch.c:640 msgid "unset the upstream info" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:596 msgid "use colored output" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:646 builtin/branch.c:648 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:652 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:655 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:656 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:657 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:659 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:660 +#: builtin/branch.c:614 msgid "list branch names" msgstr "" -#: builtin/branch.c:661 +#: builtin/branch.c:660 msgid "show current branch name" msgstr "" -#: builtin/branch.c:662 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:664 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:665 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:666 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:667 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 -#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 -#: builtin/tag.c:475 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:414 msgid "object" msgstr "" -#: builtin/branch.c:671 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 -#: builtin/verify-tag.c:38 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:696 builtin/clone.c:678 +#: builtin/branch.c:652 builtin/clone.c:735 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:720 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:773 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:798 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:807 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:812 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:819 builtin/branch.c:842 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:836 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:840 +#: builtin/branch.c:789 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:846 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:856 +#: builtin/branch.c:854 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" msgstr "" -#: builtin/branch.c:860 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -#: builtin/bugreport.c:16 +#: builtin/bugreport.c:15 msgid "git version:\n" msgstr "" -#: builtin/bugreport.c:22 +#: builtin/bugreport.c:21 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "" -#: builtin/bugreport.c:32 +#: builtin/bugreport.c:31 msgid "compiler info: " msgstr "" -#: builtin/bugreport.c:35 +#: builtin/bugreport.c:34 msgid "libc info: " msgstr "" -#: builtin/bugreport.c:49 +#: builtin/bugreport.c:80 msgid "not run from a git repository - no hooks to show\n" msgstr "" -#: builtin/bugreport.c:62 +#: builtin/bugreport.c:90 msgid "git bugreport [-o|--output-directory ] [-s|--suffix ]" msgstr "" -#: builtin/bugreport.c:69 +#: builtin/bugreport.c:97 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -11231,33 +11188,33 @@ "You can delete any lines you don't wish to share.\n" msgstr "" -#: builtin/bugreport.c:108 +#: builtin/bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "" -#: builtin/bugreport.c:110 +#: builtin/bugreport.c:138 msgid "specify a strftime format suffix for the filename" msgstr "" -#: builtin/bugreport.c:132 +#: builtin/bugreport.c:160 #, c-format msgid "could not create leading directories for '%s'" msgstr "" -#: builtin/bugreport.c:139 +#: builtin/bugreport.c:167 msgid "System Info" msgstr "" -#: builtin/bugreport.c:142 +#: builtin/bugreport.c:170 msgid "Enabled Hooks" msgstr "" -#: builtin/bugreport.c:149 +#: builtin/bugreport.c:180 #, c-format msgid "unable to write to %s" msgstr "" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c:190 #, c-format msgid "Created new report at '%s'.\n" msgstr "" @@ -11278,27 +11235,27 @@ msgid "git bundle unbundle [...]" msgstr "" -#: builtin/bundle.c:65 builtin/pack-objects.c:3876 +#: builtin/pack-objects.c:2962 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878 +#: builtin/pack-objects.c:2964 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:69 builtin/pack-objects.c:3880 +#: builtin/pack-objects.c:2966 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:72 builtin/pack-objects.c:3883 +#: builtin/pack-objects.c:2969 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/bundle.c:74 +#: builtin/bundle.c:76 msgid "specify bundle format version" msgstr "" -#: builtin/bundle.c:94 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "" @@ -11306,12 +11263,12 @@ msgid "do not show bundle details" msgstr "" -#: builtin/bundle.c:126 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:182 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "" @@ -11319,149 +11276,148 @@ msgid "Unbundling objects" msgstr "" -#: builtin/bundle.c:219 builtin/remote.c:1733 +#: builtin/remote.c:1629 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/cat-file.c:622 +#: builtin/cat-file.c:523 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " msgstr "" -#: builtin/cat-file.c:623 +#: builtin/cat-file.c:599 msgid "" "git cat-file (--batch[=] | --batch-check[=]) [--follow-" "symlinks] [--textconv | --filters]" msgstr "" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:561 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:562 msgid "show object type" msgstr "" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:563 msgid "show object size" msgstr "" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:565 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:667 +#: builtin/cat-file.c:566 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:669 +#: builtin/cat-file.c:568 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:671 +#: builtin/cat-file.c:570 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:672 +#: builtin/cat-file.c:571 git-submodule.sh:878 msgid "blob" msgstr "" -#: builtin/cat-file.c:673 +#: builtin/cat-file.c:572 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:675 +#: builtin/cat-file.c:574 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:676 +#: builtin/cat-file.c:575 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:678 +#: builtin/cat-file.c:577 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:682 +#: builtin/cat-file.c:580 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:686 +#: builtin/cat-file.c:583 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:688 +#: builtin/cat-file.c:585 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:690 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "" -#: builtin/check-attr.c:13 +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | ...] [--] ..." msgstr "" -#: builtin/check-attr.c:14 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | ...]" msgstr "" -#: builtin/check-attr.c:21 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "" -#: builtin/check-attr.c:22 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "" -#: builtin/check-attr.c:25 builtin/check-ignore.c:27 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 -#: builtin/worktree.c:494 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "" -#: builtin/check-ignore.c:29 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "" -#: builtin/check-ignore.c:31 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:170 +#: builtin/check-ignore.c:164 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:176 +#: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:179 +#: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -11486,63 +11442,62 @@ msgid "git checkout--worker []" msgstr "" -#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 -#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 -#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 +#: builtin/worktree.c:570 msgid "string" msgstr "" -#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend " msgstr "" -#: builtin/checkout-index.c:152 +#: builtin/checkout-index.c:128 msgid "git checkout-index [] [--] [...]" msgstr "" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:192 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:194 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:198 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:200 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:204 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:33 +#: builtin/checkout.c:27 msgid "git checkout [] " msgstr "" -#: builtin/checkout.c:34 +#: builtin/checkout.c:28 msgid "git checkout [] [] -- ..." msgstr "" @@ -11554,148 +11509,148 @@ msgid "git restore [] [--source=] ..." msgstr "" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:192 builtin/checkout.c:231 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:208 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:261 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:278 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:294 +#: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:411 +#: builtin/checkout.c:414 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:416 +#: builtin/checkout.c:419 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:423 +#: builtin/checkout.c:426 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 -#: builtin/checkout.c:456 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 +#: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:459 builtin/checkout.c:462 +#: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:466 +#: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:470 +#: builtin/checkout.c:473 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:474 +#: builtin/checkout.c:477 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:479 builtin/checkout.c:484 +#: builtin/checkout.c:482 builtin/checkout.c:487 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:558 builtin/checkout.c:565 +#: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:736 +#: builtin/checkout.c:505 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:786 +#: builtin/checkout.c:793 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:879 +#: builtin/checkout.c:636 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:921 +#: builtin/checkout.c:677 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:681 builtin/clone.c:689 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:929 +#: builtin/checkout.c:685 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:932 +#: builtin/checkout.c:688 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:936 +#: builtin/checkout.c:692 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:938 builtin/checkout.c:1369 +#: builtin/checkout.c:694 builtin/checkout.c:1039 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:940 +#: builtin/checkout.c:696 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:747 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:997 +#: builtin/checkout.c:753 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11710,7 +11665,7 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:772 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11727,26 +11682,26 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:804 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:808 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1095 builtin/checkout.c:1364 +#: builtin/checkout.c:836 builtin/checkout.c:1034 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1184 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1184 +#: builtin/checkout.c:1191 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -11758,305 +11713,303 @@ "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1201 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1267 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:940 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 +#: builtin/checkout.c:980 builtin/worktree.c:249 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1336 builtin/checkout.c:1705 +#: builtin/checkout.c:1009 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1390 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1392 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1386 builtin/checkout.c:1394 +#: builtin/checkout.c:1393 builtin/checkout.c:1401 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1389 +#: builtin/checkout.c:1396 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1412 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1409 +#: builtin/checkout.c:1416 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1413 +#: builtin/checkout.c:1420 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1417 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1421 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1432 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1048 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 +#: builtin/checkout.c:1051 builtin/checkout.c:1055 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 -#: builtin/checkout.c:1458 builtin/checkout.c:1463 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 +#: builtin/checkout.c:1070 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1460 +#: builtin/checkout.c:1467 #, c-format msgid "'%s' cannot take " msgstr "" -#: builtin/checkout.c:1468 +#: builtin/checkout.c:1075 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1482 msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1518 +#: builtin/checkout.c:1122 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 msgid "style" msgstr "" -#: builtin/checkout.c:1520 +#: builtin/checkout.c:1127 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1532 builtin/worktree.c:489 +#: builtin/checkout.c:1112 builtin/worktree.c:391 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1113 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1120 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1115 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1115 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1539 builtin/merge.c:302 +#: builtin/checkout.c:1124 builtin/merge.c:239 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1134 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1555 +#: builtin/checkout.c:1116 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1118 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1130 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1620 +#: builtin/checkout.c:1624 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1624 +#: builtin/checkout.c:1628 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1661 +#: builtin/checkout.c:1185 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1670 #, c-format msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1702 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1714 +#: builtin/checkout.c:1226 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1233 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1237 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1738 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 +#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1634 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1241 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1759 msgid "you must specify path(s) to restore" msgstr "" -#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 -#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2958 -#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 -#: builtin/worktree.c:487 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 +#: builtin/worktree.c:389 msgid "branch" msgstr "" -#: builtin/checkout.c:1782 +#: builtin/checkout.c:1108 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1784 +#: builtin/checkout.c:1110 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1111 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1791 msgid "second guess 'git checkout ' (default)" msgstr "" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1792 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1833 +#: builtin/checkout.c:1837 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1835 +#: builtin/checkout.c:1839 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1841 msgid "second guess 'git switch '" msgstr "" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1843 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1873 +#: builtin/checkout.c:1877 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1875 +#: builtin/checkout.c:1879 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1881 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1883 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1880 +#: builtin/checkout.c:1884 msgid "use overlay mode" msgstr "" -#: builtin/clean.c:29 +#: builtin/clean.c:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:35 +#: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:36 +#: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "" @@ -12066,7 +12019,7 @@ msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -12075,7 +12028,7 @@ " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -12088,33 +12041,33 @@ " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:519 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:522 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:659 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:693 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:714 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:755 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:786 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12125,68 +12078,68 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:838 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:900 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:902 +#: builtin/clean.c:912 msgid "force" msgstr "" -#: builtin/clean.c:903 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:905 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 -#: builtin/show-ref.c:179 +#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "" -#: builtin/clean.c:907 +#: builtin/clean.c:917 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:925 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:928 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clean.c:940 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clone.c:45 +#: builtin/clone.c:40 msgid "git clone [] [--] []" msgstr "" @@ -12194,152 +12147,144 @@ msgid "don't clone shallow repository" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:85 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:90 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:105 +#: builtin/clone.c:92 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:94 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:109 +#: builtin/clone.c:96 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:111 +#: builtin/clone.c:98 builtin/clone.c:102 msgid "pathspec" msgstr "" -#: builtin/clone.c:111 +#: builtin/clone.c:98 builtin/clone.c:102 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:115 +#: builtin/clone.c:105 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:116 builtin/init-db.c:539 +#: builtin/clone.c:106 builtin/init-db.c:476 msgid "template-directory" msgstr "" -#: builtin/clone.c:117 builtin/init-db.c:540 +#: builtin/clone.c:107 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 -#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1577 msgid "reference repository" msgstr "" -#: builtin/clone.c:123 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:2515 +#: builtin/clone.c:113 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 -#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 -#: t/helper/test-simple-ipc.c:597 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:115 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:117 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:129 +#: builtin/clone.c:119 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 -#: builtin/pull.c:212 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 +#: builtin/pull.c:211 msgid "depth" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:121 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 -#: builtin/pull.c:215 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: parse-options.h:154 msgid "time" msgstr "" -#: builtin/clone.c:133 +#: builtin/clone.c:123 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 -#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 +#: builtin/clone.c:124 builtin/fetch.c:155 msgid "revision" msgstr "" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 +#: builtin/clone.c:125 builtin/fetch.c:156 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:137 builtin/submodule--helper.c:1882 -#: builtin/submodule--helper.c:2529 +#: builtin/clone.c:127 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:129 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:141 +#: builtin/clone.c:131 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:142 builtin/init-db.c:548 +#: builtin/clone.c:132 builtin/init-db.c:485 msgid "gitdir" msgstr "" -#: builtin/clone.c:143 builtin/init-db.c:549 +#: builtin/clone.c:133 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:144 +#: builtin/clone.c:134 msgid "key=value" msgstr "" -#: builtin/clone.c:145 +#: builtin/clone.c:135 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 -#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 -#: builtin/push.c:576 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 -#: builtin/push.c:578 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "" @@ -12351,177 +12296,177 @@ msgid "initialize sparse-checkout file to include only files at root" msgstr "" -#: builtin/clone.c:231 +#: builtin/clone.c:329 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:304 +#: builtin/clone.c:409 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:322 +#: builtin/clone.c:436 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:353 +#: builtin/clone.c:445 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:357 +#: builtin/clone.c:449 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:362 +#: builtin/clone.c:476 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:389 +#: builtin/clone.c:475 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:403 +#: builtin/clone.c:517 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:480 +#: builtin/clone.c:566 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:597 +#: builtin/clone.c:677 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:645 +#: builtin/clone.c:761 msgid "failed to initialize sparse-checkout" msgstr "" -#: builtin/clone.c:668 +#: builtin/clone.c:726 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:701 +#: builtin/clone.c:756 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:779 +#: builtin/clone.c:801 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:842 +#: builtin/clone.c:864 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:844 +#: builtin/clone.c:866 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:886 builtin/receive-pack.c:2493 +#: builtin/clone.c:906 builtin/receive-pack.c:1946 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:890 +#: builtin/clone.c:910 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:903 +#: builtin/clone.c:923 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:906 +#: builtin/clone.c:926 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:920 +#: builtin/clone.c:939 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:924 builtin/fetch.c:2029 +#: builtin/clone.c:945 builtin/fetch.c:1455 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:934 +#: builtin/clone.c:955 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:940 +#: builtin/clone.c:1055 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:954 +#: builtin/clone.c:965 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 -#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 +#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 +#: builtin/worktree.c:255 builtin/worktree.c:285 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:974 +#: builtin/clone.c:985 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:994 +#: builtin/clone.c:1005 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1007 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1025 +#: builtin/clone.c:1031 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1080 builtin/remote.c:200 builtin/remote.c:710 +#: builtin/remote.c:195 builtin/remote.c:635 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/clone.c:1121 +#: builtin/clone.c:1093 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1123 +#: builtin/clone.c:1095 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1125 +#: builtin/clone.c:1097 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1127 +#: builtin/clone.c:1099 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1132 +#: builtin/clone.c:1102 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1137 +#: builtin/clone.c:1107 msgid "--local is ignored" msgstr "" @@ -12529,12 +12474,12 @@ msgid "remote transport reported error" msgstr "" -#: builtin/clone.c:1228 builtin/clone.c:1239 +#: builtin/clone.c:1169 builtin/clone.c:1177 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1242 +#: builtin/clone.c:1180 msgid "You appear to have cloned an empty repository." msgstr "" @@ -12566,103 +12511,104 @@ msgid "padding space between columns" msgstr "" -#: builtin/column.c:51 +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "" -#: builtin/commit-graph.c:13 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" -#: builtin/commit-graph.c:16 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir ] [--append] [--" "split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters ] [--[no-]progress] " msgstr "" -#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 +#: builtin/fetch.c:162 builtin/log.c:1466 msgid "dir" msgstr "" -#: builtin/commit-graph.c:52 +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 msgid "the object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:73 +#: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:100 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "" -#: builtin/commit-graph.c:155 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "" -#: builtin/commit-graph.c:205 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:207 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:209 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:213 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:219 +#: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:221 +#: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:223 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "" -#: builtin/commit-graph.c:225 +#: builtin/commit-graph.c:234 msgid "maximum number of changed-path Bloom filters to compute" msgstr "" -#: builtin/commit-graph.c:251 +#: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" -#: builtin/commit-graph.c:282 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "" -#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 +#: builtin/multi-pack-index.c:180 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -12678,72 +12624,71 @@ msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559 #, c-format msgid "not a valid object name %s" msgstr "" -#: builtin/commit-tree.c:94 +#: builtin/commit-tree.c:96 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "" -#: builtin/commit-tree.c:96 +#: builtin/commit-tree.c:98 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "" -#: builtin/commit-tree.c:109 +#: builtin/commit-tree.c:111 msgid "parent" msgstr "" -#: builtin/commit-tree.c:110 +#: builtin/commit-tree.c:112 msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 -#: builtin/tag.c:454 +#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:391 msgid "message" msgstr "" -#: builtin/commit-tree.c:113 builtin/commit.c:1626 +#: builtin/commit.c:1420 msgid "commit message" msgstr "" -#: builtin/commit-tree.c:116 +#: builtin/commit-tree.c:118 msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 -#: builtin/pull.c:180 builtin/revert.c:118 +#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" -#: builtin/commit-tree.c:131 +#: builtin/commit-tree.c:133 msgid "must give exactly one tree" msgstr "" -#: builtin/commit-tree.c:138 +#: builtin/commit-tree.c:140 msgid "git commit-tree: failed to read" msgstr "" -#: builtin/commit.c:42 +#: builtin/commit.c:37 msgid "git commit [] [--] ..." msgstr "" -#: builtin/commit.c:47 +#: builtin/commit.c:42 msgid "git status [] [--] ..." msgstr "" -#: builtin/commit.c:52 +#: builtin/commit.c:47 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:57 +#: builtin/commit.c:52 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -12752,15 +12697,15 @@ "\n" msgstr "" -#: builtin/commit.c:64 +#: builtin/commit.c:63 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "" -#: builtin/commit.c:67 +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "" -#: builtin/commit.c:70 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -12773,111 +12718,111 @@ "\n" msgstr "" -#: builtin/commit.c:325 +#: builtin/commit.c:284 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:361 +#: builtin/commit.c:360 msgid "--pathspec-from-file with -a does not make sense" msgstr "" -#: builtin/commit.c:375 +#: builtin/commit.c:1141 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:387 +#: builtin/commit.c:325 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:396 +#: builtin/commit.c:331 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:411 +#: builtin/commit.c:344 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:413 +#: builtin/commit.c:346 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509 +#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:490 +#: builtin/commit.c:427 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:492 +#: builtin/commit.c:429 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:494 +#: builtin/commit.c:493 msgid "cannot do a partial commit during a rebase." msgstr "" -#: builtin/commit.c:502 +#: builtin/commit.c:437 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:521 +#: builtin/commit.c:456 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:619 +#: builtin/commit.c:553 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:621 +#: builtin/commit.c:555 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:640 +#: builtin/commit.c:574 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:693 +#: builtin/commit.c:626 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166 +#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:759 builtin/shortlog.c:416 +#: builtin/commit.c:675 builtin/shortlog.c:309 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:761 +#: builtin/commit.c:677 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:765 +#: builtin/commit.c:681 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:802 +#: builtin/commit.c:801 #, c-format msgid "cannot combine -m with --fixup:%s" msgstr "" -#: builtin/commit.c:814 builtin/commit.c:830 +#: builtin/commit.c:710 builtin/commit.c:718 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:821 +#: builtin/commit.c:715 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:881 +#: builtin/commit.c:769 msgid "could not write commit template" msgstr "" @@ -12888,7 +12833,7 @@ "with '%c' will be ignored.\n" msgstr "" -#: builtin/commit.c:896 +#: builtin/commit.c:805 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12902,7 +12847,7 @@ "with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "" -#: builtin/commit.c:904 +#: builtin/commit.c:813 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12910,7 +12855,7 @@ "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:916 +#: builtin/commit.c:900 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -12919,7 +12864,7 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:921 +#: builtin/commit.c:905 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -12928,376 +12873,375 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:948 +#: builtin/commit.c:830 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:956 +#: builtin/commit.c:838 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:963 +#: builtin/commit.c:845 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:981 +#: builtin/commit.c:862 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:1026 +#: builtin/commit.c:1018 msgid "unable to pass trailers to --trailers" msgstr "" -#: builtin/commit.c:1066 +#: builtin/commit.c:928 msgid "Error building trees" msgstr "" -#: builtin/commit.c:1080 builtin/tag.c:317 +#: builtin/commit.c:942 builtin/tag.c:256 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1124 +#: builtin/commit.c:986 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1138 +#: builtin/commit.c:1000 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1156 builtin/commit.c:1450 +#: builtin/commit.c:1014 builtin/commit.c:1264 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1196 +#: builtin/commit.c:1052 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1227 +#: builtin/commit.c:1219 msgid "You are in the middle of a merge -- cannot reword." msgstr "" -#: builtin/commit.c:1229 +#: builtin/commit.c:1221 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "" -#: builtin/commit.c:1232 +#: builtin/commit.c:1224 #, c-format msgid "cannot combine reword option of --fixup with path '%s'" msgstr "" -#: builtin/commit.c:1234 +#: builtin/commit.c:1226 msgid "" "reword option of --fixup is mutually exclusive with --patch/--interactive/--" "all/--include/--only" msgstr "" -#: builtin/commit.c:1253 +#: builtin/commit.c:1085 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1260 +#: builtin/commit.c:1094 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1263 +#: builtin/commit.c:1097 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1265 +#: builtin/commit.c:1099 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1267 +#: builtin/commit.c:1261 msgid "You are in the middle of a rebase -- cannot amend." msgstr "" -#: builtin/commit.c:1270 +#: builtin/commit.c:1102 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1280 +#: builtin/commit.c:1112 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1282 +#: builtin/commit.c:1114 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1291 +#: builtin/commit.c:1122 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1309 +#: builtin/commit.c:1139 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1337 +#: builtin/commit.c:1331 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "" -#: builtin/commit.c:1354 +#: builtin/commit.c:1345 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c:1278 builtin/commit.c:1443 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1487 builtin/commit.c:1656 +#: builtin/commit.c:1280 builtin/commit.c:1445 msgid "show branch information" msgstr "" -#: builtin/commit.c:1489 +#: builtin/commit.c:1282 msgid "show stash information" msgstr "" -#: builtin/commit.c:1491 builtin/commit.c:1658 +#: builtin/commit.c:1284 builtin/commit.c:1447 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1286 msgid "version" msgstr "" -#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 -#: builtin/worktree.c:691 +#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 +#: builtin/worktree.c:541 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1496 builtin/commit.c:1662 +#: builtin/commit.c:1289 builtin/commit.c:1451 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1499 builtin/commit.c:1665 +#: builtin/commit.c:1292 builtin/commit.c:1454 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 +#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 msgid "mode" msgstr "" -#: builtin/commit.c:1502 builtin/commit.c:1668 +#: builtin/commit.c:1295 builtin/commit.c:1457 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1506 +#: builtin/commit.c:1299 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1508 parse-options.h:192 +#: builtin/commit.c:1301 parse-options.h:167 msgid "when" msgstr "" -#: builtin/commit.c:1509 +#: builtin/commit.c:1302 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1511 +#: builtin/commit.c:1304 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1512 +#: builtin/commit.c:1503 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1514 +#: builtin/commit.c:1505 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1537 +#: builtin/commit.c:1323 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1413 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1414 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1416 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 +#: builtin/commit.c:1417 builtin/tag.c:393 msgid "read message from file" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1418 msgid "author" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1418 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1625 builtin/gc.c:550 +#: builtin/commit.c:1419 builtin/gc.c:359 msgid "date" msgstr "" -#: builtin/commit.c:1625 +#: builtin/commit.c:1419 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:327 ref-filter.h:92 +#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 +#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1627 +#: builtin/commit.c:1421 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1628 +#: builtin/commit.c:1422 msgid "reuse message from specified commit" msgstr "" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . #. -#: builtin/commit.c:1633 +#: builtin/commit.c:1621 msgid "[(amend|reword):]commit" msgstr "" -#: builtin/commit.c:1633 +#: builtin/commit.c:1621 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" -#: builtin/commit.c:1634 +#: builtin/commit.c:1424 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1635 +#: builtin/commit.c:1425 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "" -#: builtin/commit.c:1636 +#: builtin/commit.c:1624 msgid "add custom trailer(s)" msgstr "" -#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 -#: builtin/pull.c:146 builtin/revert.c:110 +#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "" -#: builtin/commit.c:1638 +#: builtin/commit.c:1427 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1639 +#: builtin/commit.c:1428 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1641 +#: builtin/commit.c:1430 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1646 +#: builtin/commit.c:1435 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1647 +#: builtin/commit.c:1436 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1648 +#: builtin/commit.c:1437 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1438 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1650 +#: builtin/commit.c:1439 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1651 +#: builtin/commit.c:1440 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1441 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1653 +#: builtin/commit.c:1442 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1666 +#: builtin/commit.c:1455 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1667 +#: builtin/commit.c:1456 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1674 +#: builtin/commit.c:1461 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1676 +#: builtin/commit.c:1463 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1752 +#: builtin/commit.c:1536 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1759 +#: builtin/commit.c:1543 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1780 +#: builtin/commit.c:1562 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1787 +#: builtin/commit.c:1573 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1792 +#: builtin/commit.c:1578 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1803 +#: builtin/commit.c:1788 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "" -#: builtin/commit.c:1839 +#: builtin/commit.c:1824 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -#: builtin/config.c:11 +#: builtin/config.c:10 msgid "git config []" msgstr "" @@ -13310,19 +13254,19 @@ msgid "only one type at a time" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:58 msgid "Config file location" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:59 msgid "use global config file" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:60 msgid "use system config file" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:61 msgid "use repository config file" msgstr "" @@ -13330,19 +13274,19 @@ msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:62 msgid "use given config file" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:63 msgid "blob-id" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:64 msgid "Action" msgstr "" @@ -13358,7 +13302,7 @@ msgid "get values for regexp: name-regex [value-pattern]" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "" @@ -13366,7 +13310,7 @@ msgid "replace all matching variables: name value [value-pattern]" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "" @@ -13378,15 +13322,15 @@ msgid "remove all matches: name [value-pattern]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:147 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:75 msgid "list all" msgstr "" @@ -13394,19 +13338,19 @@ msgid "use string equality when comparing values to 'value-pattern'" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:76 msgid "open an editor" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:79 msgid "Type" msgstr "" @@ -13414,15 +13358,15 @@ msgid "value is given this type" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "" @@ -13430,31 +13374,31 @@ msgid "value is --bool or string" msgstr "" -#: builtin/config.c:159 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:160 +#: builtin/config.c:84 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:161 +#: builtin/config.c:85 msgid "Other" msgstr "" -#: builtin/config.c:162 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:163 +#: builtin/config.c:87 msgid "show variable names only" msgstr "" -#: builtin/config.c:164 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:165 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" @@ -13495,7 +13439,7 @@ msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:483 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "" @@ -13511,7 +13455,7 @@ msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:627 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13525,7 +13469,7 @@ msgid "only one config file at a time" msgstr "" -#: builtin/config.c:658 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "" @@ -13591,12 +13535,12 @@ msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:851 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:864 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13608,15 +13552,15 @@ msgid "no such section: %s" msgstr "" -#: builtin/count-objects.c:90 +#: builtin/count-objects.c:88 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:100 +#: builtin/count-objects.c:98 msgid "print sizes in human readable format" msgstr "" -#: builtin/credential-cache--daemon.c:227 +#: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -13625,7 +13569,7 @@ "\tchmod 0700 %s" msgstr "" -#: builtin/credential-cache--daemon.c:276 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "" @@ -13633,7 +13577,7 @@ msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" -#: builtin/credential-cache.c:180 +#: builtin/credential-cache.c:154 msgid "credential-cache unavailable; no unix socket support" msgstr "" @@ -13642,27 +13586,27 @@ msgid "unable to get credential storage lock in %d ms" msgstr "" -#: builtin/describe.c:26 +#: builtin/describe.c:22 msgid "git describe [] [...]" msgstr "" -#: builtin/describe.c:27 +#: builtin/describe.c:23 msgid "git describe [] --dirty" msgstr "" -#: builtin/describe.c:63 +#: builtin/describe.c:57 msgid "head" msgstr "" -#: builtin/describe.c:63 +#: builtin/describe.c:57 msgid "lightweight" msgstr "" -#: builtin/describe.c:63 +#: builtin/describe.c:57 msgid "annotated" msgstr "" -#: builtin/describe.c:277 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "" @@ -13672,131 +13616,131 @@ msgid "tag '%s' is externally known as '%s'" msgstr "" -#: builtin/describe.c:328 +#: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:330 +#: builtin/describe.c:319 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:424 +#: builtin/describe.c:392 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:428 +#: builtin/describe.c:396 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:458 +#: builtin/describe.c:426 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:461 +#: builtin/describe.c:429 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:529 +#: builtin/describe.c:497 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:532 +#: builtin/describe.c:500 builtin/log.c:502 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:508 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:554 +#: builtin/describe.c:522 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:555 +#: builtin/describe.c:523 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:556 +#: builtin/describe.c:524 msgid "use any ref" msgstr "" -#: builtin/describe.c:557 +#: builtin/describe.c:525 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:558 +#: builtin/describe.c:526 msgid "always use long format" msgstr "" -#: builtin/describe.c:559 +#: builtin/describe.c:527 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:562 +#: builtin/describe.c:530 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:564 +#: builtin/describe.c:532 msgid "consider most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:566 +#: builtin/describe.c:534 msgid "only consider tags matching " msgstr "" -#: builtin/describe.c:568 +#: builtin/describe.c:536 msgid "do not consider tags matching " msgstr "" -#: builtin/describe.c:570 builtin/name-rev.c:535 +#: builtin/describe.c:538 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:571 builtin/describe.c:574 +#: builtin/describe.c:539 builtin/describe.c:542 msgid "mark" msgstr "" -#: builtin/describe.c:572 +#: builtin/describe.c:540 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:575 +#: builtin/describe.c:543 msgid "append on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:593 +#: builtin/describe.c:561 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:622 +#: builtin/describe.c:590 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:673 +#: builtin/describe.c:640 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:675 +#: builtin/describe.c:642 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -13808,12 +13752,12 @@ msgid "--merge-base only works with two commits" msgstr "" -#: builtin/diff.c:92 +#: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:259 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "" @@ -13823,21 +13767,21 @@ msgid "%s...%s: no merge base" msgstr "" -#: builtin/diff.c:486 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:532 builtin/grep.c:698 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:543 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:548 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -13847,21 +13791,21 @@ msgid "%s...%s: multiple merge bases, using %s" msgstr "" -#: builtin/difftool.c:31 +#: builtin/difftool.c:29 msgid "git difftool [] [ []] [--] [...]" msgstr "" -#: builtin/difftool.c:293 +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:295 +#: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:303 +#: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "" @@ -13890,20 +13834,20 @@ msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:651 +#: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "" @@ -13911,7 +13855,7 @@ msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:710 msgid "tool" msgstr "" @@ -13933,27 +13877,27 @@ msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:720 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:732 +#: builtin/difftool.c:735 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:739 +#: builtin/difftool.c:742 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:745 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:750 +#: builtin/difftool.c:739 msgid "no given for --tool=" msgstr "" -#: builtin/difftool.c:757 +#: builtin/difftool.c:746 msgid "no given for --extcmd=" msgstr "" @@ -13961,7 +13905,7 @@ msgid "git env--helper --type=[bool|ulong] " msgstr "" -#: builtin/env--helper.c:42 builtin/hash-object.c:96 +#: builtin/hash-object.c:96 msgid "type" msgstr "" @@ -13986,99 +13930,99 @@ "`%s`" msgstr "" -#: builtin/fast-export.c:29 +#: builtin/fast-export.c:26 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:869 +#: builtin/fast-export.c:868 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:998 msgid "show progress after objects" msgstr "" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1000 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1003 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1208 msgid "dump marks to this file" msgstr "" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1210 msgid "import marks from this file" msgstr "" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 msgid "import marks from this file if it exists" msgstr "" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1216 msgid "fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1218 msgid "output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1220 msgid "use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1221 msgid "skip output of blob data" msgstr "" -#: builtin/fast-export.c:1223 builtin/log.c:1826 +#: builtin/fast-export.c:1016 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1223 msgid "apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1018 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert to in anonymized output" msgstr "" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1229 msgid "reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1231 msgid "show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1233 msgid "label tags with mark ids" msgstr "" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" @@ -14116,19 +14060,19 @@ msgid "Lockfile created but not reported: %s" msgstr "" -#: builtin/fetch.c:35 +#: builtin/fetch.c:25 msgid "git fetch [] [ [...]]" msgstr "" -#: builtin/fetch.c:36 +#: builtin/fetch.c:26 msgid "git fetch [] " msgstr "" -#: builtin/fetch.c:37 +#: builtin/fetch.c:27 msgid "git fetch --multiple [] [( | )...]" msgstr "" -#: builtin/fetch.c:38 +#: builtin/fetch.c:28 msgid "git fetch --all []" msgstr "" @@ -14136,15 +14080,15 @@ msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:145 builtin/pull.c:189 +#: builtin/fetch.c:124 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:147 builtin/pull.c:249 +#: builtin/fetch.c:147 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:149 builtin/pull.c:192 +#: builtin/fetch.c:126 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" @@ -14152,7 +14096,7 @@ msgid "use atomic transaction to update references" msgstr "" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "" @@ -14160,19 +14104,19 @@ msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:156 +#: builtin/fetch.c:131 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:158 builtin/pull.c:199 +#: builtin/fetch.c:133 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:160 +#: builtin/fetch.c:135 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:162 +#: builtin/fetch.c:137 msgid "number of submodules fetched in parallel" msgstr "" @@ -14180,19 +14124,19 @@ msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" -#: builtin/fetch.c:166 builtin/pull.c:202 +#: builtin/fetch.c:139 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:168 +#: builtin/fetch.c:141 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 +#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 msgid "on-demand" msgstr "" -#: builtin/fetch.c:170 +#: builtin/fetch.c:143 msgid "control recursive fetching of submodules" msgstr "" @@ -14200,50 +14144,49 @@ msgid "write fetched references to the FETCH_HEAD file" msgstr "" -#: builtin/fetch.c:176 builtin/pull.c:210 +#: builtin/fetch.c:147 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:178 +#: builtin/fetch.c:149 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 -#: builtin/pull.c:222 +#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:183 builtin/pull.c:216 +#: builtin/fetch.c:154 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:189 builtin/pull.c:225 +#: builtin/fetch.c:160 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:192 +#: builtin/fetch.c:163 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:195 +#: builtin/fetch.c:166 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:199 builtin/pull.c:228 +#: builtin/fetch.c:170 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:200 builtin/pull.c:230 +#: builtin/fetch.c:171 builtin/pull.c:220 msgid "refmap" msgstr "" -#: builtin/fetch.c:201 builtin/pull.c:231 +#: builtin/fetch.c:172 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:208 builtin/pull.c:244 +#: builtin/fetch.c:208 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" @@ -14255,7 +14198,7 @@ msgid "run 'maintenance --auto' after fetching" msgstr "" -#: builtin/fetch.c:217 builtin/pull.c:247 +#: builtin/fetch.c:217 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" @@ -14267,73 +14210,73 @@ msgid "accept refspecs from stdin" msgstr "" -#: builtin/fetch.c:586 +#: builtin/fetch.c:431 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:760 +#: builtin/fetch.c:549 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:862 +#: builtin/fetch.c:642 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:866 +#: builtin/fetch.c:646 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 +#: builtin/fetch.c:659 builtin/fetch.c:739 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:880 +#: builtin/fetch.c:660 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:890 +#: builtin/fetch.c:669 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 -#: builtin/fetch.c:962 +#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 +#: builtin/fetch.c:734 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:895 +#: builtin/fetch.c:889 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:917 +#: builtin/fetch.c:689 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:692 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:923 +#: builtin/fetch.c:695 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:962 +#: builtin/fetch.c:734 msgid "forced update" msgstr "" -#: builtin/fetch.c:967 +#: builtin/fetch.c:739 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1065 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1069 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14342,7 +14285,7 @@ " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:1105 +#: builtin/fetch.c:784 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" @@ -14352,47 +14295,47 @@ msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1223 builtin/fetch.c:1371 +#: builtin/fetch.c:892 builtin/fetch.c:988 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1244 +#: builtin/fetch.c:903 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1341 +#: builtin/fetch.c:958 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1342 +#: builtin/fetch.c:959 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:991 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1375 builtin/remote.c:1128 +#: builtin/fetch.c:992 builtin/remote.c:1024 msgid "(none)" msgstr "" -#: builtin/fetch.c:1398 +#: builtin/fetch.c:1015 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1417 +#: builtin/fetch.c:1034 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1420 +#: builtin/fetch.c:1037 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" @@ -14402,50 +14345,50 @@ msgid "the object %s does not exist" msgstr "" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1618 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1648 +#: builtin/fetch.c:1633 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1650 +#: builtin/fetch.c:1635 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1652 +#: builtin/fetch.c:1637 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1654 +#: builtin/fetch.c:1639 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1783 builtin/fetch.c:1846 +#: builtin/fetch.c:1277 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 +#: builtin/fetch.c:1279 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1790 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1909 +#: builtin/fetch.c:1350 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1945 +#: builtin/fetch.c:1394 msgid "You need to specify a tag name." msgstr "" @@ -14453,83 +14396,83 @@ msgid "--negotiate-only needs one or more --negotiate-tip=*" msgstr "" -#: builtin/fetch.c:2013 +#: builtin/fetch.c:1439 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:2015 +#: builtin/fetch.c:1441 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:2020 +#: builtin/fetch.c:1446 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:2022 +#: builtin/fetch.c:1448 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:2039 +#: builtin/fetch.c:1464 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:2041 +#: builtin/fetch.c:1466 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:2050 +#: builtin/fetch.c:1475 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:2057 +#: builtin/fetch.c:1482 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:2073 +#: builtin/fetch.c:2055 msgid "must supply remote when using --negotiate-only" msgstr "" -#: builtin/fetch.c:2078 +#: builtin/fetch.c:2060 msgid "Protocol does not support --negotiate-only, exiting." msgstr "" -#: builtin/fetch.c:2097 +#: builtin/fetch.c:2079 msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" msgstr "" -#: builtin/fetch.c:2101 +#: builtin/fetch.c:2083 msgid "--atomic can only be used when fetching from one remote" msgstr "" -#: builtin/fetch.c:2105 +#: builtin/fetch.c:2087 msgid "--stdin can only be used when fetching from one remote" msgstr "" -#: builtin/fmt-merge-msg.c:7 +#: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:21 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c:673 msgid "use as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "" @@ -14549,47 +14492,47 @@ msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c:37 msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:41 builtin/tag.c:481 +#: builtin/for-each-ref.c:39 builtin/tag.c:420 msgid "respect format colors" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "" @@ -14597,19 +14540,19 @@ msgid "git for-each-repo --config= " msgstr "" -#: builtin/for-each-repo.c:34 +#: builtin/for-each-repo.c:37 msgid "config" msgstr "" -#: builtin/for-each-repo.c:35 +#: builtin/for-each-repo.c:38 msgid "config key storing a list of repository paths" msgstr "" -#: builtin/for-each-repo.c:43 +#: builtin/for-each-repo.c:46 msgid "missing --config=" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 +#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128 msgid "unknown" msgstr "" @@ -14625,101 +14568,101 @@ msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:124 builtin/fsck.c:127 +#: builtin/fsck.c:123 builtin/fsck.c:126 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:136 +#: builtin/fsck.c:135 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:152 +#: builtin/fsck.c:151 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:264 +#: builtin/fsck.c:263 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:291 +#: builtin/fsck.c:290 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:311 +#: builtin/fsck.c:310 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:321 +#: builtin/fsck.c:320 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:332 +#: builtin/fsck.c:331 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:349 +#: builtin/fsck.c:348 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:387 +#: builtin/fsck.c:386 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:406 +#: builtin/fsck.c:405 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:411 +#: builtin/fsck.c:410 msgid "broken links" msgstr "" -#: builtin/fsck.c:420 +#: builtin/fsck.c:419 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:428 +#: builtin/fsck.c:427 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:457 +#: builtin/fsck.c:456 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:482 +#: builtin/fsck.c:481 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:496 +#: builtin/fsck.c:495 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:530 +#: builtin/fsck.c:529 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:537 +#: builtin/fsck.c:536 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:591 +#: builtin/fsck.c:590 msgid "notice: No default references" msgstr "" @@ -14728,7 +14671,7 @@ msgid "%s: hash-path mismatch, found at: %s" msgstr "" -#: builtin/fsck.c:624 +#: builtin/fsck.c:605 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" @@ -14738,133 +14681,133 @@ msgid "%s: object is of unknown type '%s': %s" msgstr "" -#: builtin/fsck.c:644 +#: builtin/fsck.c:618 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:664 +#: builtin/fsck.c:638 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:653 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:688 +#: builtin/fsck.c:568 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:704 +#: builtin/fsck.c:671 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:709 builtin/index-pack.c:859 +#: builtin/index-pack.c:853 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:716 +#: builtin/fsck.c:683 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:722 +#: builtin/fsck.c:689 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:726 +#: builtin/fsck.c:693 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:738 +#: builtin/fsck.c:705 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:743 +#: builtin/fsck.c:710 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:752 +#: builtin/fsck.c:719 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:783 +#: builtin/fsck.c:660 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:789 +#: builtin/fsck.c:666 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:790 +#: builtin/fsck.c:667 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:791 +#: builtin/fsck.c:668 msgid "report tags" msgstr "" -#: builtin/fsck.c:792 +#: builtin/fsck.c:669 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:793 +#: builtin/fsck.c:670 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:794 +#: builtin/fsck.c:671 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:795 +#: builtin/fsck.c:672 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:796 +#: builtin/fsck.c:673 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:797 builtin/mktag.c:76 +#: builtin/fsck.c:674 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:799 +#: builtin/fsck.c:676 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:800 builtin/prune.c:134 +#: builtin/fsck.c:677 builtin/prune.c:108 msgid "show progress" msgstr "" -#: builtin/fsck.c:801 +#: builtin/fsck.c:678 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:861 builtin/index-pack.c:261 +#: builtin/fsck.c:742 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:889 +#: builtin/fsck.c:855 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:900 +#: builtin/fsck.c:866 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:39 +#: builtin/gc.c:27 msgid "git gc []" msgstr "" -#: builtin/gc.c:93 +#: builtin/gc.c:80 #, c-format msgid "Failed to fstat %s: %s" msgstr "" @@ -14874,12 +14817,12 @@ msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:487 builtin/init-db.c:57 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 +#: builtin/notes.c:234 builtin/tag.c:506 #, c-format msgid "cannot read '%s'" msgstr "" @@ -14894,19 +14837,19 @@ "%s" msgstr "" -#: builtin/gc.c:551 +#: builtin/gc.c:360 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:553 +#: builtin/gc.c:362 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:554 +#: builtin/gc.c:363 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:557 +#: builtin/gc.c:366 msgid "force running gc even if there may be another gc running" msgstr "" @@ -14924,28 +14867,28 @@ msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:607 +#: builtin/gc.c:412 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:609 +#: builtin/gc.c:414 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:610 +#: builtin/gc.c:415 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:650 +#: builtin/gc.c:440 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" -#: builtin/gc.c:705 +#: builtin/gc.c:487 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -14964,131 +14907,131 @@ msgid "unrecognized --schedule argument '%s'" msgstr "" -#: builtin/gc.c:868 +#: builtin/gc.c:869 msgid "failed to write commit-graph" msgstr "" -#: builtin/gc.c:904 +#: builtin/gc.c:905 msgid "failed to prefetch remotes" msgstr "" -#: builtin/gc.c:1020 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "" -#: builtin/gc.c:1037 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "" -#: builtin/gc.c:1088 +#: builtin/gc.c:1091 msgid "failed to write multi-pack-index" msgstr "" -#: builtin/gc.c:1104 +#: builtin/gc.c:1109 msgid "'git multi-pack-index expire' failed" msgstr "" -#: builtin/gc.c:1163 +#: builtin/gc.c:1170 msgid "'git multi-pack-index repack' failed" msgstr "" -#: builtin/gc.c:1172 +#: builtin/gc.c:1179 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" -#: builtin/gc.c:1276 +#: builtin/gc.c:1283 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "" -#: builtin/gc.c:1306 +#: builtin/gc.c:1313 #, c-format msgid "task '%s' failed" msgstr "" -#: builtin/gc.c:1388 +#: builtin/gc.c:1395 #, c-format msgid "'%s' is not a valid task" msgstr "" -#: builtin/gc.c:1393 +#: builtin/gc.c:1400 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "" -#: builtin/gc.c:1408 +#: builtin/gc.c:1415 msgid "run tasks based on the state of the repository" msgstr "" -#: builtin/gc.c:1409 +#: builtin/gc.c:1416 msgid "frequency" msgstr "" -#: builtin/gc.c:1410 +#: builtin/gc.c:1417 msgid "run tasks based on frequency" msgstr "" -#: builtin/gc.c:1413 +#: builtin/gc.c:1420 msgid "do not report progress or other information over stderr" msgstr "" -#: builtin/gc.c:1414 +#: builtin/gc.c:1421 msgid "task" msgstr "" -#: builtin/gc.c:1415 +#: builtin/gc.c:1422 msgid "run a specific task" msgstr "" -#: builtin/gc.c:1432 +#: builtin/gc.c:1439 msgid "use at most one of --auto and --schedule=" msgstr "" -#: builtin/gc.c:1475 +#: builtin/gc.c:1482 msgid "failed to run 'git config'" msgstr "" -#: builtin/gc.c:1627 +#: builtin/gc.c:1547 #, c-format msgid "failed to expand path '%s'" msgstr "" -#: builtin/gc.c:1654 builtin/gc.c:1692 +#: builtin/gc.c:1576 msgid "failed to start launchctl" msgstr "" -#: builtin/gc.c:1767 builtin/gc.c:2220 +#: builtin/gc.c:1613 #, c-format msgid "failed to create directories for '%s'" msgstr "" -#: builtin/gc.c:1794 +#: builtin/gc.c:1674 #, c-format msgid "failed to bootstrap service %s" msgstr "" -#: builtin/gc.c:1887 +#: builtin/gc.c:1745 msgid "failed to create temp xml file" msgstr "" -#: builtin/gc.c:1977 +#: builtin/gc.c:1835 msgid "failed to start schtasks" msgstr "" -#: builtin/gc.c:2046 +#: builtin/gc.c:1879 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" -#: builtin/gc.c:2063 +#: builtin/gc.c:1896 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" -#: builtin/gc.c:2067 +#: builtin/gc.c:1900 msgid "failed to open stdin of 'crontab'" msgstr "" -#: builtin/gc.c:2109 +#: builtin/gc.c:1942 msgid "'crontab' died" msgstr "" @@ -15100,8 +15043,7 @@ msgid "failed to run systemctl" msgstr "" -#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 -#: builtin/worktree.c:945 +#: builtin/worktree.c:768 builtin/worktree.c:782 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -15120,7 +15062,7 @@ msgid "%s scheduler is not available" msgstr "" -#: builtin/gc.c:2432 +#: builtin/gc.c:1976 msgid "another process is scheduling background maintenance" msgstr "" @@ -15136,29 +15078,29 @@ msgid "scheduler to trigger git maintenance run" msgstr "" -#: builtin/gc.c:2478 +#: builtin/gc.c:2000 msgid "failed to add repo to global config" msgstr "" -#: builtin/gc.c:2487 +#: builtin/gc.c:2010 msgid "git maintenance []" msgstr "" -#: builtin/gc.c:2506 +#: builtin/gc.c:2029 #, c-format msgid "invalid subcommand: %s" msgstr "" -#: builtin/grep.c:30 +#: builtin/grep.c:27 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" -#: builtin/grep.c:239 +#: builtin/grep.c:225 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:293 +#: builtin/grep.c:283 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" @@ -15167,258 +15109,257 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785 -#: builtin/pack-objects.c:3142 +#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657 +#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:672 +#: builtin/grep.c:637 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:752 +#: builtin/grep.c:703 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:790 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:853 +#: builtin/grep.c:792 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:794 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:796 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:798 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:801 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:803 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:805 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:868 +#: builtin/grep.c:807 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:870 +#: builtin/grep.c:809 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:873 +#: builtin/grep.c:812 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:862 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:814 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:818 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:821 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:824 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:827 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:830 msgid "show line numbers" msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:881 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:831 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:896 +#: builtin/grep.c:832 msgid "show filenames" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:834 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:836 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:838 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:841 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:843 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:910 +#: builtin/grep.c:897 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:846 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:913 +#: builtin/grep.c:847 msgid "highlight matches" msgstr "" -#: builtin/grep.c:915 +#: builtin/grep.c:849 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:917 +#: builtin/grep.c:851 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:920 +#: builtin/grep.c:854 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:923 +#: builtin/grep.c:857 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:925 +#: builtin/grep.c:859 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:927 +#: builtin/grep.c:861 msgid "use worker threads" msgstr "" -#: builtin/grep.c:928 +#: builtin/grep.c:862 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:931 +#: builtin/grep.c:865 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:933 +#: builtin/grep.c:867 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:936 +#: builtin/grep.c:870 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:938 +#: builtin/grep.c:872 msgid "match " msgstr "" -#: builtin/grep.c:940 +#: builtin/grep.c:874 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:952 +#: builtin/grep.c:886 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:954 +#: builtin/grep.c:888 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:957 +#: builtin/grep.c:894 msgid "pager" msgstr "" -#: builtin/grep.c:957 +#: builtin/grep.c:894 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:961 +#: builtin/grep.c:898 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1027 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1063 +#: builtin/grep.c:994 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1071 +#: builtin/grep.c:1001 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1101 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1105 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1108 builtin/pack-objects.c:4059 +#: builtin/grep.c:1041 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139 +#: builtin/grep.c:1036 builtin/index-pack.c:1519 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1145 +#: builtin/grep.c:1065 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1171 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1174 +#: builtin/grep.c:1161 msgid "--untracked cannot be used with --cached" msgstr "" -#: builtin/grep.c:1180 +#: builtin/grep.c:1167 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1188 +#: builtin/grep.c:1175 msgid "both --cached and trees are given" msgstr "" @@ -15457,35 +15398,35 @@ msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:55 +#: builtin/help.c:43 msgid "print all available commands" msgstr "" -#: builtin/help.c:57 +#: builtin/help.c:44 msgid "exclude guides" msgstr "" -#: builtin/help.c:58 +#: builtin/help.c:46 msgid "show man page" msgstr "" -#: builtin/help.c:59 +#: builtin/help.c:47 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:49 msgid "show info page" msgstr "" -#: builtin/help.c:63 +#: builtin/help.c:57 msgid "print command description" msgstr "" -#: builtin/help.c:65 +#: builtin/help.c:45 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:67 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "" @@ -15503,62 +15444,62 @@ msgid "git help [-c|--config]" msgstr "" -#: builtin/help.c:196 +#: builtin/help.c:67 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:223 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:236 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:244 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 +#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:340 +#: builtin/help.c:211 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:352 +#: builtin/help.c:223 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:467 +#: builtin/help.c:340 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:483 +#: builtin/help.c:357 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:490 +#: builtin/help.c:365 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:551 builtin/help.c:562 git.c:348 +#: builtin/help.c:444 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:565 git.c:380 +#: builtin/help.c:534 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "" @@ -15567,221 +15508,221 @@ msgid "this option doesn't take any other arguments" msgstr "" -#: builtin/help.c:602 builtin/help.c:629 +#: builtin/help.c:466 builtin/help.c:483 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:624 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:207 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c:227 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c:230 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:272 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c:282 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c:283 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:295 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:324 builtin/pack-objects.c:756 +#: builtin/index-pack.c:302 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:305 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:358 +#: builtin/index-pack.c:340 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:342 #, c-format msgid "pack version % unsupported" msgstr "" -#: builtin/index-pack.c:376 +#: builtin/index-pack.c:360 #, c-format msgid "pack has bad object at offset %: %s" msgstr "" -#: builtin/index-pack.c:482 +#: builtin/index-pack.c:481 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:530 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:539 +#: builtin/index-pack.c:538 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:547 +#: builtin/index-pack.c:546 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:577 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:580 +#: builtin/index-pack.c:579 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:606 +#: builtin/index-pack.c:605 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781 -#: builtin/index-pack.c:820 builtin/index-pack.c:829 +#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 +#: builtin/index-pack.c:818 builtin/index-pack.c:827 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:754 builtin/pack-objects.c:292 -#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 +#: builtin/index-pack.c:753 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:276 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:818 +#: builtin/index-pack.c:816 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:838 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:843 builtin/index-pack.c:862 +#: builtin/index-pack.c:850 builtin/index-pack.c:869 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:864 +#: builtin/index-pack.c:858 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:925 builtin/index-pack.c:972 +#: builtin/index-pack.c:930 builtin/index-pack.c:961 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1131 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1131 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1190 +#: builtin/index-pack.c:1165 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1170 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1173 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1210 +#: builtin/index-pack.c:1185 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1233 +#: builtin/index-pack.c:1208 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905 +#: builtin/index-pack.c:1219 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1277 +#: builtin/index-pack.c:1261 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1267 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1279 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1299 +#: builtin/index-pack.c:1283 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1323 +#: builtin/index-pack.c:1307 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1419 +#: builtin/index-pack.c:1383 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1446 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "" -#: builtin/index-pack.c:1464 +#: builtin/index-pack.c:1422 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1472 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot close written %s file '%s'" msgstr "" @@ -15791,100 +15732,100 @@ msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "" -#: builtin/index-pack.c:1514 +#: builtin/index-pack.c:1454 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150 +#: builtin/index-pack.c:1513 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1581 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1645 +#: builtin/index-pack.c:1583 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1631 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1638 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1742 +#: builtin/index-pack.c:1675 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1796 builtin/index-pack.c:1799 -#: builtin/index-pack.c:1819 builtin/index-pack.c:1823 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1829 builtin/init-db.c:379 builtin/init-db.c:614 +#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613 #, c-format msgid "unknown hash algorithm '%s'" msgstr "" -#: builtin/index-pack.c:1848 +#: builtin/index-pack.c:1763 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1850 +#: builtin/index-pack.c:1765 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1852 +#: builtin/index-pack.c:1856 msgid "--object-format cannot be used with --stdin" msgstr "" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1771 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584 +#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:63 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:68 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:82 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:88 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:92 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "" @@ -15894,155 +15835,155 @@ msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:138 +#: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:263 +#: builtin/init-db.c:262 #, c-format msgid "invalid initial branch name: '%s'" msgstr "" -#: builtin/init-db.c:354 +#: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:357 +#: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:373 +#: builtin/init-db.c:372 msgid "attempt to reinitialize repository with different hash" msgstr "" -#: builtin/init-db.c:397 builtin/init-db.c:400 +#: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:432 +#: builtin/init-db.c:431 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "" -#: builtin/init-db.c:463 +#: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:464 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:468 +#: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Repositório vazio Git partilhado inicializado em %s%s\n" -#: builtin/init-db.c:469 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Repositório vazio Git inicializado em %s%s\n" -#: builtin/init-db.c:518 +#: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:544 +#: builtin/init-db.c:481 msgid "permissions" msgstr "" -#: builtin/init-db.c:545 +#: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:551 +#: builtin/init-db.c:550 msgid "override the name of the initial branch" msgstr "" -#: builtin/init-db.c:552 builtin/verify-pack.c:74 +#: builtin/init-db.c:551 builtin/verify-pack.c:74 msgid "hash" msgstr "" -#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:552 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "" -#: builtin/init-db.c:560 +#: builtin/init-db.c:559 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "" -#: builtin/init-db.c:591 builtin/init-db.c:596 +#: builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:600 builtin/init-db.c:655 +#: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:627 +#: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:679 +#: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/init-db.c:684 +#: builtin/init-db.c:683 msgid "--separate-git-dir incompatible with bare repository" msgstr "" -#: builtin/interpret-trailers.c:16 +#: builtin/interpret-trailers.c:15 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "[(=|:)])...] [...]" msgstr "" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "" -#: builtin/interpret-trailers.c:96 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "" -#: builtin/interpret-trailers.c:99 +#: builtin/interpret-trailers.c:96 msgid "where to place the new trailer" msgstr "" -#: builtin/interpret-trailers.c:101 +#: builtin/interpret-trailers.c:98 msgid "action if trailer already exists" msgstr "" -#: builtin/interpret-trailers.c:103 +#: builtin/interpret-trailers.c:100 msgid "action if trailer is missing" msgstr "" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:102 msgid "output only the trailers" msgstr "" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:103 msgid "do not apply config rules" msgstr "" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:104 msgid "join whitespace-continued values" msgstr "" -#: builtin/interpret-trailers.c:108 +#: builtin/interpret-trailers.c:105 msgid "set parsing options" msgstr "" @@ -16050,32 +15991,32 @@ msgid "do not treat --- specially" msgstr "" -#: builtin/interpret-trailers.c:112 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "" -#: builtin/interpret-trailers.c:123 +#: builtin/interpret-trailers.c:117 msgid "--trailer with --only-input does not make sense" msgstr "" -#: builtin/interpret-trailers.c:133 +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:59 +#: builtin/log.c:48 msgid "git log [] [] [[--] ...]" msgstr "" -#: builtin/log.c:60 +#: builtin/log.c:49 msgid "git show [] ..." msgstr "" -#: builtin/log.c:113 +#: builtin/log.c:93 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:180 +#: builtin/log.c:154 msgid "show source" msgstr "" @@ -16083,15 +16024,15 @@ msgid "use mail map file" msgstr "" -#: builtin/log.c:184 +#: builtin/log.c:157 msgid "only decorate refs that match " msgstr "" -#: builtin/log.c:186 +#: builtin/log.c:159 msgid "do not decorate refs that match " msgstr "" -#: builtin/log.c:187 +#: builtin/log.c:160 msgid "decorate options" msgstr "" @@ -16105,379 +16046,379 @@ msgid "-L: cannot be used with pathspec" msgstr "" -#: builtin/log.c:306 +#: builtin/log.c:259 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:571 +#: builtin/log.c:510 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:586 builtin/log.c:676 +#: builtin/log.c:583 builtin/log.c:673 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:701 +#: builtin/log.c:698 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:846 +#: builtin/log.c:843 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:853 +#: builtin/log.c:764 msgid "format.headers without value" msgstr "" -#: builtin/log.c:982 +#: builtin/log.c:979 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:999 +#: builtin/log.c:996 msgid "need exactly one range" msgstr "" -#: builtin/log.c:1009 +#: builtin/log.c:1006 msgid "not a range" msgstr "" -#: builtin/log.c:1173 +#: builtin/log.c:1170 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1179 +#: builtin/log.c:1176 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1266 +#: builtin/log.c:1095 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1293 +#: builtin/log.c:1122 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1351 +#: builtin/log.c:1348 msgid "two output directories?" msgstr "" -#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 +#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1510 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1522 +#: builtin/log.c:1519 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1532 +#: builtin/log.c:1529 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base= manually" msgstr "" -#: builtin/log.c:1555 +#: builtin/log.c:1552 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1329 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1582 +#: builtin/log.c:1333 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1640 +#: builtin/log.c:1382 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1703 +#: builtin/log.c:1700 msgid "failed to infer range-diff origin of current series" msgstr "" -#: builtin/log.c:1705 +#: builtin/log.c:1702 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1749 +#: builtin/log.c:1441 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1752 +#: builtin/log.c:1444 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1756 +#: builtin/log.c:1448 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1758 +#: builtin/log.c:1450 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1760 +#: builtin/log.c:1452 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1761 +#: builtin/log.c:1453 msgid "sfx" msgstr "" -#: builtin/log.c:1762 +#: builtin/log.c:1454 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1764 +#: builtin/log.c:1456 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1765 +#: builtin/log.c:1762 msgid "reroll-count" msgstr "" -#: builtin/log.c:1766 +#: builtin/log.c:1458 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1768 +#: builtin/log.c:1765 msgid "max length of output filename" msgstr "" -#: builtin/log.c:1770 +#: builtin/log.c:1767 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1773 +#: builtin/log.c:1770 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1774 +#: builtin/log.c:1771 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1776 +#: builtin/log.c:1773 msgid "use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1779 +#: builtin/log.c:1466 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1782 +#: builtin/log.c:1469 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1785 +#: builtin/log.c:1472 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1787 +#: builtin/log.c:1474 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1789 +#: builtin/log.c:1476 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1791 +#: builtin/log.c:1478 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1793 +#: builtin/log.c:1480 msgid "Messaging" msgstr "" -#: builtin/log.c:1794 +#: builtin/log.c:1481 msgid "header" msgstr "" -#: builtin/log.c:1795 +#: builtin/log.c:1482 msgid "add email header" msgstr "" -#: builtin/log.c:1796 builtin/log.c:1797 +#: builtin/log.c:1483 builtin/log.c:1485 msgid "email" msgstr "" -#: builtin/log.c:1796 +#: builtin/log.c:1483 msgid "add To: header" msgstr "" -#: builtin/log.c:1797 +#: builtin/log.c:1485 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1798 +#: builtin/log.c:1487 msgid "ident" msgstr "" -#: builtin/log.c:1799 +#: builtin/log.c:1488 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1801 +#: builtin/log.c:1490 msgid "message-id" msgstr "" -#: builtin/log.c:1802 +#: builtin/log.c:1491 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1803 builtin/log.c:1806 +#: builtin/log.c:1492 builtin/log.c:1495 msgid "boundary" msgstr "" -#: builtin/log.c:1804 +#: builtin/log.c:1493 msgid "attach the patch" msgstr "" -#: builtin/log.c:1807 +#: builtin/log.c:1496 msgid "inline the patch" msgstr "" -#: builtin/log.c:1811 +#: builtin/log.c:1500 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1813 +#: builtin/log.c:1502 msgid "signature" msgstr "" -#: builtin/log.c:1814 +#: builtin/log.c:1503 msgid "add a signature" msgstr "" -#: builtin/log.c:1815 +#: builtin/log.c:1504 msgid "base-commit" msgstr "" -#: builtin/log.c:1816 +#: builtin/log.c:1505 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1819 +#: builtin/log.c:1507 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1820 +#: builtin/log.c:1508 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1822 +#: builtin/log.c:1510 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1824 +#: builtin/log.c:1821 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1827 +#: builtin/log.c:1824 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1829 builtin/range-diff.c:28 +#: builtin/log.c:1826 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1916 +#: builtin/log.c:1585 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1931 +#: builtin/log.c:1928 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1933 +#: builtin/log.c:1930 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1941 +#: builtin/log.c:1610 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1943 +#: builtin/log.c:1612 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1945 +#: builtin/log.c:1614 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1967 +#: builtin/log.c:1964 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "" -#: builtin/log.c:2089 +#: builtin/log.c:2087 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2093 +#: builtin/log.c:2091 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2094 +#: builtin/log.c:2092 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2100 +#: builtin/log.c:2098 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2104 +#: builtin/log.c:2102 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2112 +#: builtin/log.c:2110 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2113 +#: builtin/log.c:2111 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2124 +#: builtin/log.c:1741 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2160 +#: builtin/log.c:1773 msgid "Generating patches" msgstr "" -#: builtin/log.c:2204 +#: builtin/log.c:2202 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2263 +#: builtin/log.c:1867 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:2317 +#: builtin/log.c:1921 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:468 msgid "git ls-files [] [...]" msgstr "" @@ -16485,67 +16426,67 @@ msgid "separate paths with the NUL character" msgstr "" -#: builtin/ls-files.c:617 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:521 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:645 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "" @@ -16553,39 +16494,39 @@ msgid "read exclude patterns from " msgstr "" -#: builtin/ls-files.c:655 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:661 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:664 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:565 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:667 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:674 msgid "suppress duplicate entries" msgstr "" @@ -16596,75 +16537,75 @@ " [--symref] [ [...]]" msgstr "" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:52 msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103 +#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 msgid "exec" msgstr "" -#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 +#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 msgid "path of git-upload-pack on the remote host" msgstr "" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:58 msgid "limit to tags" msgstr "" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:59 msgid "limit to heads" msgstr "" -#: builtin/ls-remote.c:68 +#: builtin/ls-remote.c:60 msgid "do not show peeled tags" msgstr "" -#: builtin/ls-remote.c:70 +#: builtin/ls-remote.c:62 msgid "take url..insteadOf into account" msgstr "" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:64 msgid "exit with exit code 2 if no matching refs are found" msgstr "" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:67 msgid "show underlying ref in addition to the object pointed by it" msgstr "" -#: builtin/ls-tree.c:30 +#: builtin/ls-tree.c:29 msgid "git ls-tree [] [...]" msgstr "" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:127 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:135 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:142 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -16717,48 +16658,48 @@ msgid "use headers in message's body" msgstr "" -#: builtin/mailsplit.c:239 +#: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] ..." msgstr "" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus ..." msgstr "" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:32 msgid "git merge-base --independent ..." msgstr "" -#: builtin/merge-base.c:35 +#: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor " msgstr "" -#: builtin/merge-base.c:36 +#: builtin/merge-base.c:34 msgid "git merge-base --fork-point []" msgstr "" -#: builtin/merge-base.c:143 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:145 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:147 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:149 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:151 +#: builtin/merge-base.c:228 msgid "find where forked from reflog of " msgstr "" @@ -16768,220 +16709,220 @@ " " msgstr "" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c:45 msgid "set labels for file1/orig-file/file2" msgstr "" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:45 #, c-format msgid "unknown option %s" msgstr "" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:51 #, c-format msgid "could not parse object '%s'" msgstr "" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:55 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "" msgstr[1] "" -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:63 msgid "not handling anything other than two heads merge." msgstr "" -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 #, c-format msgid "could not resolve ref '%s'" msgstr "" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:77 #, c-format msgid "Merging %s with %s\n" msgstr "" -#: builtin/merge.c:59 +#: builtin/merge.c:49 msgid "git merge [] [...]" msgstr "" -#: builtin/merge.c:124 +#: builtin/merge.c:108 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:147 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:145 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:201 +#: builtin/merge.c:146 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:206 +#: builtin/merge.c:151 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:134 +#: builtin/merge.c:201 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:260 builtin/pull.c:137 +#: builtin/merge.c:204 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:140 +#: builtin/merge.c:205 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:263 builtin/pull.c:143 +#: builtin/merge.c:207 builtin/pull.c:146 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:266 builtin/pull.c:149 +#: builtin/merge.c:210 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:152 +#: builtin/merge.c:212 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:270 builtin/pull.c:155 +#: builtin/merge.c:214 builtin/pull.c:158 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:272 +#: builtin/merge.c:215 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:274 builtin/pull.c:162 +#: builtin/merge.c:217 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:278 builtin/pull.c:168 +#: builtin/merge.c:221 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 -#: builtin/rebase.c:1117 builtin/revert.c:114 +#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 +#: builtin/revert.c:109 msgid "strategy" msgstr "" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:223 builtin/pull.c:172 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:281 builtin/pull.c:176 +#: builtin/merge.c:224 builtin/pull.c:175 msgid "option=value" msgstr "" -#: builtin/merge.c:282 builtin/pull.c:177 +#: builtin/merge.c:225 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:284 +#: builtin/merge.c:227 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:291 +#: builtin/merge.c:231 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:293 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:295 +#: builtin/merge.c:233 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:297 builtin/pull.c:184 +#: builtin/merge.c:235 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:304 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:321 +#: builtin/merge.c:266 msgid "could not run stash." msgstr "" -#: builtin/merge.c:326 +#: builtin/merge.c:271 msgid "stash failed" msgstr "" -#: builtin/merge.c:331 +#: builtin/merge.c:276 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:353 builtin/merge.c:370 +#: builtin/merge.c:298 builtin/merge.c:315 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:401 +#: builtin/merge.c:400 msgid "Already up to date. (nothing to squash)" msgstr "" -#: builtin/merge.c:415 +#: builtin/merge.c:356 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:465 +#: builtin/merge.c:406 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:515 +#: builtin/merge.c:456 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:603 +#: builtin/merge.c:546 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:730 +#: builtin/merge.c:668 msgid "Not handling anything other than two heads merge." msgstr "" @@ -16990,184 +16931,184 @@ msgid "unknown strategy option: -X%s" msgstr "" -#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:697 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:814 +#: builtin/merge.c:749 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:823 +#: builtin/merge.c:758 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:829 +#: builtin/merge.c:827 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -#: builtin/merge.c:834 +#: builtin/merge.c:832 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:837 +#: builtin/merge.c:835 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:892 +#: builtin/merge.c:800 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:907 +#: builtin/merge.c:820 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:968 +#: builtin/merge.c:873 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1007 +#: builtin/merge.c:912 msgid "No current branch." msgstr "" -#: builtin/merge.c:1009 +#: builtin/merge.c:914 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1011 +#: builtin/merge.c:916 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1016 +#: builtin/merge.c:921 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1073 +#: builtin/merge.c:974 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1174 +#: builtin/merge.c:1076 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1110 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1321 +#: builtin/merge.c:1212 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1325 +#: builtin/merge.c:1216 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1343 +#: builtin/merge.c:1338 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1356 +#: builtin/merge.c:1228 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1360 +#: builtin/merge.c:1232 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1376 +#: builtin/merge.c:1248 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1383 +#: builtin/merge.c:1255 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1386 +#: builtin/merge.c:1258 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1400 +#: builtin/merge.c:1267 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1402 +#: builtin/merge.c:1397 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1418 +#: builtin/merge.c:1275 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1435 +#: builtin/merge.c:1292 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1437 +#: builtin/merge.c:1294 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1442 +#: builtin/merge.c:1299 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1444 +#: builtin/merge.c:1301 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1531 +#: builtin/merge.c:1403 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1550 +#: builtin/merge.c:1422 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1598 +#: builtin/merge.c:1463 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1470 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1664 builtin/merge.c:1730 +#: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1668 +#: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1720 +#: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1722 +#: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" @@ -17177,7 +17118,7 @@ msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1746 +#: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17211,31 +17152,31 @@ msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "" -#: builtin/mktag.c:98 +#: builtin/mktag.c:97 msgid "tag on stdin did not pass our strict fsck check" msgstr "" -#: builtin/mktag.c:101 +#: builtin/mktag.c:100 msgid "tag on stdin did not refer to a valid object" msgstr "" -#: builtin/mktag.c:104 builtin/tag.c:243 +#: builtin/tag.c:191 msgid "unable to write tag file" msgstr "" -#: builtin/mktree.c:66 +#: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" -#: builtin/mktree.c:154 +#: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:155 builtin/write-tree.c:26 +#: builtin/mktree.c:154 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:156 +#: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "" @@ -17245,27 +17186,27 @@ "snapshot=]" msgstr "" -#: builtin/multi-pack-index.c:14 +#: builtin/multi-pack-index.c:13 msgid "git multi-pack-index [] verify" msgstr "" -#: builtin/multi-pack-index.c:17 +#: builtin/multi-pack-index.c:16 msgid "git multi-pack-index [] expire" msgstr "" -#: builtin/multi-pack-index.c:20 +#: builtin/multi-pack-index.c:19 msgid "git multi-pack-index [] repack [--batch-size=]" msgstr "" -#: builtin/multi-pack-index.c:57 +#: builtin/multi-pack-index.c:54 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:98 +#: builtin/multi-pack-index.c:69 msgid "preferred-pack" msgstr "" -#: builtin/multi-pack-index.c:99 +#: builtin/multi-pack-index.c:70 msgid "pack for reuse when computing a multi-pack bitmap" msgstr "" @@ -17281,13 +17222,13 @@ msgid "refs snapshot for selecting bitmap commits" msgstr "" -#: builtin/multi-pack-index.c:202 +#: builtin/multi-pack-index.c:128 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/mv.c:18 +#: builtin/mv.c:17 msgid "git mv [] ... " msgstr "" @@ -17296,7 +17237,7 @@ msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:85 +#: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" @@ -17313,85 +17254,85 @@ msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:172 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:184 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:190 +#: builtin/mv.c:183 msgid "bad source" msgstr "" -#: builtin/mv.c:193 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:196 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:205 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:231 +#: builtin/mv.c:223 msgid "not under version control" msgstr "" -#: builtin/mv.c:233 +#: builtin/mv.c:227 msgid "conflicted" msgstr "" -#: builtin/mv.c:236 +#: builtin/mv.c:226 msgid "destination exists" msgstr "" -#: builtin/mv.c:244 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:247 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:250 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:252 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:280 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:308 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 +#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:338 msgid "git name-rev [] ..." msgstr "" -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:339 msgid "git name-rev [] --all" msgstr "" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:340 msgid "git name-rev [] --stdin" msgstr "" @@ -17399,153 +17340,153 @@ msgid "print only ref-based names (no object names)" msgstr "" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:398 msgid "only use refs matching " msgstr "" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:400 msgid "ignore refs matching " msgstr "" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:403 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:26 msgid "git notes [--ref ] [list []]" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:27 msgid "" "git notes [--ref ] add [-f] [--allow-empty] [-m | -F " "| (-c | -C) ] []" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:28 msgid "git notes [--ref ] copy [-f] " msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:29 msgid "" "git notes [--ref ] append [--allow-empty] [-m | -F | " "(-c | -C) ] []" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:30 msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:31 msgid "git notes [--ref ] show []" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:32 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:36 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:37 +#: builtin/notes.c:35 msgid "git notes [--ref ] remove [...]" msgstr "" -#: builtin/notes.c:38 +#: builtin/notes.c:36 msgid "git notes [--ref ] prune [-n] [-v]" msgstr "" -#: builtin/notes.c:39 +#: builtin/notes.c:37 msgid "git notes [--ref ] get-ref" msgstr "" -#: builtin/notes.c:44 +#: builtin/notes.c:42 msgid "git notes [list []]" msgstr "" -#: builtin/notes.c:49 +#: builtin/notes.c:47 msgid "git notes add [] []" msgstr "" -#: builtin/notes.c:54 +#: builtin/notes.c:52 msgid "git notes copy [] " msgstr "" -#: builtin/notes.c:55 +#: builtin/notes.c:53 msgid "git notes copy --stdin [ ]..." msgstr "" -#: builtin/notes.c:60 +#: builtin/notes.c:58 msgid "git notes append [] []" msgstr "" -#: builtin/notes.c:65 +#: builtin/notes.c:63 msgid "git notes edit []" msgstr "" -#: builtin/notes.c:70 +#: builtin/notes.c:68 msgid "git notes show []" msgstr "" -#: builtin/notes.c:75 +#: builtin/notes.c:73 msgid "git notes merge [] " msgstr "" -#: builtin/notes.c:76 +#: builtin/notes.c:74 msgid "git notes merge --commit []" msgstr "" -#: builtin/notes.c:77 +#: builtin/notes.c:75 msgid "git notes merge --abort []" msgstr "" -#: builtin/notes.c:82 +#: builtin/notes.c:80 msgid "git notes remove []" msgstr "" -#: builtin/notes.c:87 +#: builtin/notes.c:85 msgid "git notes prune []" msgstr "" -#: builtin/notes.c:92 +#: builtin/notes.c:90 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:97 +#: builtin/notes.c:95 msgid "Write/edit the notes for the following object:" msgstr "" -#: builtin/notes.c:150 +#: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:154 +#: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:162 +#: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" @@ -17563,34 +17504,34 @@ msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:240 builtin/tag.c:577 +#: builtin/notes.c:236 builtin/tag.c:509 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313 -#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524 -#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:263 +#: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:266 +#: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:307 +#: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:322 +#: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "" @@ -17598,186 +17539,186 @@ #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:354 +#: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 -#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 -#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 -#: builtin/prune-packed.c:25 builtin/tag.c:587 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 +#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 +#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/prune-packed.c:25 builtin/tag.c:586 msgid "too many arguments" msgstr "" -#: builtin/notes.c:387 builtin/notes.c:676 +#: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:408 builtin/notes.c:574 +#: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:411 builtin/notes.c:577 +#: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:414 builtin/notes.c:580 +#: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:417 builtin/notes.c:583 +#: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:420 builtin/notes.c:586 +#: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:421 builtin/notes.c:494 +#: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:446 +#: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:461 builtin/notes.c:542 +#: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 +#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:495 +#: builtin/notes.c:488 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:497 +#: builtin/notes.c:490 msgid "load rewriting config for (implies --stdin)" msgstr "" -#: builtin/notes.c:515 +#: builtin/notes.c:517 msgid "too few arguments" msgstr "" -#: builtin/notes.c:536 +#: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:548 +#: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:601 +#: builtin/notes.c:593 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:696 +#: builtin/notes.c:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:698 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:700 +#: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:720 +#: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:722 +#: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:724 +#: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:737 +#: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:740 +#: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:766 +#: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:782 +#: builtin/notes.c:774 msgid "General options" msgstr "" -#: builtin/notes.c:784 +#: builtin/notes.c:776 msgid "Merge options" msgstr "" -#: builtin/notes.c:786 +#: builtin/notes.c:778 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "" -#: builtin/notes.c:788 +#: builtin/notes.c:780 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:790 +#: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:792 +#: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:794 +#: builtin/notes.c:786 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:805 +#: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:810 +#: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:834 +#: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:874 +#: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:876 +#: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -17785,96 +17726,96 @@ "abort'.\n" msgstr "" -#: builtin/notes.c:895 builtin/tag.c:590 +#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:898 +#: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:910 +#: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:913 +#: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 +#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:953 +#: builtin/notes.c:944 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:996 +#: builtin/notes.c:986 msgid "notes-ref" msgstr "" -#: builtin/notes.c:997 +#: builtin/notes.c:987 msgid "use notes from " msgstr "" -#: builtin/notes.c:1032 builtin/stash.c:1752 +#: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:182 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:183 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:440 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " "pack %s" msgstr "" -#: builtin/pack-objects.c:580 +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:591 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:722 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:941 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %" msgstr "" -#: builtin/pack-objects.c:1036 +#: builtin/pack-objects.c:896 #, c-format msgid "expected object at offset % in pack %s" msgstr "" -#: builtin/pack-objects.c:1160 +#: builtin/pack-objects.c:791 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:1173 +#: builtin/pack-objects.c:804 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1235 builtin/update-index.c:90 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "" @@ -17883,345 +17824,344 @@ msgid "failed to write bitmap index" msgstr "" -#: builtin/pack-objects.c:1294 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote % objects while expecting %" msgstr "" -#: builtin/pack-objects.c:1536 +#: builtin/pack-objects.c:1084 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1984 +#: builtin/pack-objects.c:1831 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1993 +#: builtin/pack-objects.c:1840 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2274 +#: builtin/pack-objects.c:3178 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2439 +#: builtin/pack-objects.c:2266 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525 -#: builtin/pack-objects.c:2535 +#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352 +#: builtin/pack-objects.c:2362 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539 +#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "" -#: builtin/pack-objects.c:2549 +#: builtin/pack-objects.c:2376 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2864 +#: builtin/pack-objects.c:2691 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:3003 +#: builtin/pack-objects.c:2830 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:3089 +#: builtin/pack-objects.c:2454 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:3095 +#: builtin/pack-objects.c:2922 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:3174 +#: builtin/pack-objects.c:3001 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' (got '%s')" msgstr "" -#: builtin/pack-objects.c:3177 +#: builtin/pack-objects.c:3004 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3039 #, c-format msgid "could not get type of object %s in pack %s" msgstr "" -#: builtin/pack-objects.c:3340 builtin/pack-objects.c:3351 -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175 #, c-format msgid "could not find pack '%s'" msgstr "" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3218 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3224 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:2625 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619 +#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3412 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3498 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3757 +#: builtin/pack-objects.c:3628 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061 +#: builtin/pack-objects.c:3631 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3788 +#: builtin/pack-objects.c:3659 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3841 +#: builtin/pack-objects.c:2928 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3845 +#: builtin/pack-objects.c:2932 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3884 +#: builtin/pack-objects.c:3755 msgid "[,]" msgstr "" -#: builtin/pack-objects.c:3885 +#: builtin/pack-objects.c:2971 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3888 +#: builtin/pack-objects.c:2974 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3890 +#: builtin/pack-objects.c:2976 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3892 +#: builtin/pack-objects.c:2978 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3894 +#: builtin/pack-objects.c:2980 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3896 +#: builtin/pack-objects.c:2982 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3898 +#: builtin/pack-objects.c:2984 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3900 +#: builtin/pack-objects.c:2986 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3902 +#: builtin/pack-objects.c:2988 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3904 +#: builtin/pack-objects.c:2990 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3906 +#: builtin/pack-objects.c:2992 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3908 +#: builtin/pack-objects.c:2994 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3910 +#: builtin/pack-objects.c:2996 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3912 +#: builtin/pack-objects.c:2998 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3915 +#: builtin/pack-objects.c:3001 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3918 +#: builtin/pack-objects.c:3004 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3921 +#: builtin/pack-objects.c:3007 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3924 +#: builtin/pack-objects.c:3795 msgid "read packs from stdin" msgstr "" -#: builtin/pack-objects.c:3926 +#: builtin/pack-objects.c:3010 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3928 +#: builtin/pack-objects.c:3012 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3930 +#: builtin/pack-objects.c:3014 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3932 +#: builtin/pack-objects.c:3016 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3934 +#: builtin/pack-objects.c:3018 msgid "unpack unreachable objects newer than