diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/apparmor-parser.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/apparmor-parser.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/apparmor-parser.po 2019-02-21 10:34:46.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/apparmor-parser.po 2019-02-28 10:34:46.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: 2019-02-20 11:23+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 11:20+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: ../parser_include.c:113 ../parser_include.c:111 msgid "Error: Out of memory.\n" diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/apport.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/apport.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/apport.po 2019-02-21 10:34:47.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/apport.po 2019-02-28 10:34:47.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: 2019-02-20 11:15+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 11:13+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:145 #: ../data/general-hooks/ubuntu.py:145 @@ -24,8 +24,8 @@ "Ubuntu package" msgstr "" -#: ../data/general-hooks/ubuntu.py:203 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:203 +#: ../data/general-hooks/ubuntu.py:210 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:210 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 " @@ -45,17 +45,17 @@ msgid "Report a malfunction to the developers" msgstr "Rapporteer foutiewe werking an die ontwikkelaars" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:355 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:363 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:490 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:358 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:366 #: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:493 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:693 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1205 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1371 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1375 -#: ../apport/ui.py:355 ../apport/ui.py:363 ../apport/ui.py:490 -#: ../apport/ui.py:493 ../apport/ui.py:693 ../apport/ui.py:1205 -#: ../apport/ui.py:1371 ../apport/ui.py:1375 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:496 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:696 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1208 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1374 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1378 +#: ../apport/ui.py:358 ../apport/ui.py:366 ../apport/ui.py:493 +#: ../apport/ui.py:496 ../apport/ui.py:696 ../apport/ui.py:1208 +#: ../apport/ui.py:1374 ../apport/ui.py:1378 msgid "Invalid problem report" msgstr "Ongeldige foutverslag" @@ -111,8 +111,8 @@ "detection" msgstr "" -#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-valgrind.py:66 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65 +#: ../debian/tmp/usr/bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66 msgid "" "Install an extra package into the sandbox (can be specified multiple times)" msgstr "" @@ -146,8 +146,8 @@ "Hierdie het voorgekom gedurende 'n vorige hibernasie sessie en het verhoed " "dat dit behoorlik kon voortgaan." -#: ../data/apportcheckresume.py:74 #: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../data/apportcheckresume.py:74 msgid "" "The resume processing hung very near the end and will have appeared to have " "completed normally." @@ -173,18 +173,18 @@ msgid "(%i bytes)" msgstr "(%i grepe)" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 ../bin/apport-cli.py:166 -#: ../debian/tmp/usr/bin/apport-cli.py:166 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 ../gtk/apport-gtk.py:146 -#: ../kde/apport-kde.py:363 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/share/apport/apport-kde.py:363 ../kde/apport-kde.py:363 +#: ../bin/apport-cli.py:166 ../debian/tmp/usr/bin/apport-cli.py:166 +#: ../gtk/apport-gtk.py:146 msgid "(binary data)" msgstr "(binêre data)" -#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/share/apport/apport-kde.py:186 ../kde/apport-kde.py:186 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../bin/apport-cli.py:194 -#: ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 ../gtk/apport-gtk.py:181 -#: ../kde/apport-kde.py:186 +#: ../gtk/apport-gtk.ui.h:6 ../debian/tmp/usr/bin/apport-cli.py:194 +#: ../gtk/apport-gtk.py:181 msgid "Send problem report to the developers?" msgstr "Stuur die probleemverslag aan die ontwikkelaars?" @@ -243,8 +243,8 @@ msgid "Error: %s" msgstr "Fout: %s" -#: ../bin/apport-cli.py:254 ../debian/tmp/usr/bin/apport-cli.py:254 #: ../debian/tmp/usr/share/apport/apport-kde.py:407 ../kde/apport-kde.py:407 +#: ../bin/apport-cli.py:254 ../debian/tmp/usr/bin/apport-cli.py:254 msgid "Collecting problem information" msgstr "Versamel probleeminformasie" @@ -257,9 +257,9 @@ "die \n" "toepassing te verbeter. Dit mag 'n paar minute duur." -#: ../gtk/apport-gtk.ui.h:17 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 -#: ../bin/apport-cli.py:267 ../debian/tmp/usr/bin/apport-cli.py:267 #: ../debian/tmp/usr/share/apport/apport-kde.py:435 ../kde/apport-kde.py:435 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../bin/apport-cli.py:267 +#: ../gtk/apport-gtk.ui.h:17 ../debian/tmp/usr/bin/apport-cli.py:267 msgid "Uploading problem information" msgstr "Laai probleeminformasie op" @@ -325,53 +325,53 @@ msgid "Apport crash file" msgstr "Apport ineenstortingslêer" -#: ../gtk/apport-gtk.ui.h:14 ../debian/tmp/usr/share/apport/apport-gtk.py:188 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 -#: ../debian/tmp/usr/share/apport/apport-kde.py:194 ../gtk/apport-gtk.py:188 -#: ../kde/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 +#: ../debian/tmp/usr/share/apport/apport-kde.py:194 ../kde/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.py:188 msgid "Send" msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:169 #: ../debian/tmp/usr/share/apport/apport-kde.py:200 -#: ../debian/tmp/usr/share/apport/apport-kde.py:238 ../gtk/apport-gtk.py:169 -#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 +#: ../debian/tmp/usr/share/apport/apport-kde.py:238 ../kde/apport-kde.py:200 +#: ../kde/apport-kde.py:238 ../gtk/apport-gtk.py:169 #, python-format msgid "Sorry, %s has experienced an internal error." msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:259 -#: ../debian/tmp/usr/share/apport/apport-kde.py:208 ../gtk/apport-gtk.py:259 -#: ../kde/apport-kde.py:208 +#: ../debian/tmp/usr/share/apport/apport-kde.py:208 ../kde/apport-kde.py:208 +#: ../gtk/apport-gtk.py:259 #, python-format msgid "Package: %s" msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:265 -#: ../debian/tmp/usr/share/apport/apport-kde.py:214 ../gtk/apport-gtk.py:265 -#: ../kde/apport-kde.py:214 +#: ../debian/tmp/usr/share/apport/apport-kde.py:214 ../kde/apport-kde.py:214 +#: ../gtk/apport-gtk.py:265 msgid "Sorry, a problem occurred while installing software." msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:274 #: ../debian/tmp/usr/share/apport/apport-gtk.py:289 -#: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../gtk/apport-gtk.py:274 -#: ../gtk/apport-gtk.py:289 ../kde/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 ../kde/apport-kde.py:220 +#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289 #, python-format msgid "The application %s has experienced an internal error." msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:277 -#: ../debian/tmp/usr/share/apport/apport-kde.py:223 ../gtk/apport-gtk.py:277 -#: ../kde/apport-kde.py:223 +#: ../debian/tmp/usr/share/apport/apport-kde.py:223 ../kde/apport-kde.py:223 +#: ../gtk/apport-gtk.py:277 #, python-format msgid "The application %s has closed unexpectedly." msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:216 #: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-kde.py:244 ../gtk/apport-gtk.py:216 -#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 ../kde/apport-kde.py:231 +#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:216 msgid "Continue" msgstr "" @@ -385,30 +385,30 @@ msgid "Relaunch" msgstr "" -#: ../gtk/apport-gtk.ui.h:7 ../debian/tmp/usr/share/apport/apport-gtk.py:297 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 -#: ../debian/tmp/usr/share/apport/apport-kde.py:241 ../gtk/apport-gtk.py:297 -#: ../kde/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 +#: ../debian/tmp/usr/share/apport/apport-kde.py:241 ../kde/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.py:297 msgid "If you notice further problems, try restarting the computer." msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:299 -#: ../debian/tmp/usr/share/apport/apport-kde.py:245 ../gtk/apport-gtk.py:299 -#: ../kde/apport-kde.py:245 +#: ../debian/tmp/usr/share/apport/apport-kde.py:245 ../kde/apport-kde.py:245 +#: ../gtk/apport-gtk.py:299 msgid "Ignore future problems of this type" msgstr "" #: ../debian/tmp/usr/share/apport/apport-gtk.py:579 -#: ../debian/tmp/usr/share/apport/apport-kde.py:289 ../gtk/apport-gtk.py:579 -#: ../kde/apport-kde.py:289 +#: ../debian/tmp/usr/share/apport/apport-kde.py:289 ../kde/apport-kde.py:289 +#: ../gtk/apport-gtk.py:579 msgid "Hide Details" msgstr "" -#: ../gtk/apport-gtk.ui.h:11 ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 #: ../debian/tmp/usr/share/apport/apport-gtk.py:575 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 -#: ../debian/tmp/usr/share/apport/apport-kde.py:292 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:575 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-kde.py:292 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575 msgid "Show Details" msgstr "" @@ -434,8 +434,8 @@ msgid "Uploading Problem Information" msgstr "" -#: ../gtk/apport-gtk.ui.h:19 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 #: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../kde/apport-kde.py:436 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." @@ -443,19 +443,19 @@ "Die versamelde inligting word tans gestuur aan die foutsporingstelsel. Dit " "mag 'n paar minute duur." -#: ../gtk/apport-gtk.ui.h:1 ../debian/tmp/usr/share/apport/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 ../kde/apport-kde.py:469 #: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 msgid "Apport" msgstr "" -#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 msgid "Crash report" msgstr "" -#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 msgid "Sorry, an internal error happened." msgstr "" @@ -463,19 +463,19 @@ msgid "Send an error report to help fix this problem" msgstr "" -#: ../gtk/apport-gtk.ui.h:9 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 +#: ../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 "" -#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 msgid "_Examine locally" msgstr "" -#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 msgid "Collecting problem information" msgstr "Besig met versameling van probleeminformasie" -#: ../gtk/apport-gtk.ui.h:16 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 +#: ../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." @@ -483,7 +483,7 @@ "Informasie word tans versamel wat die ontwikkelaars mag help om die probleem " "deur jou gerapporteer te herstel." -#: ../gtk/apport-gtk.ui.h:18 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 msgid "Uploading problem information" msgstr "Besig met die aanstuur van die probleeminformasie" @@ -538,26 +538,26 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:296 -#: ../apport/ui.py:296 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:299 +#: ../apport/ui.py:299 msgid "unknown program" msgstr "onbekende program" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:297 -#: ../apport/ui.py:297 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:300 +#: ../apport/ui.py:300 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "Jammer, maar die program \"%s\" het onverwags afgesluit" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:299 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1399 -#: ../apport/ui.py:299 ../apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:302 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1402 +#: ../apport/ui.py:302 ../apport/ui.py:1402 #, python-format msgid "Problem in %s" msgstr "Probleem in %s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:300 -#: ../apport/ui.py:300 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:303 +#: ../apport/ui.py:303 msgid "" "Your computer does not have enough free memory to automatically analyze the " "problem and send a report to the developers." @@ -565,42 +565,42 @@ "Jou rekenaar beskik nie oor genoegsame ongebruikte geheue om die probleem " "outomaties te analiseer en te raporteer aan die ontwikkelaars nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:356 -#: ../apport/ui.py:356 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:359 +#: ../apport/ui.py:359 msgid "You are not allowed to access this problem report." msgstr "Jy is toegang geweier tot hierdie probleemverslag." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:359 -#: ../apport/ui.py:359 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:362 +#: ../apport/ui.py:362 msgid "Error" msgstr "Fout" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:360 -#: ../apport/ui.py:360 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:363 +#: ../apport/ui.py:363 msgid "There is not enough disk space available to process this report." msgstr "" "Daar is nie genoeg beskikbare skyfspasie vir die verwerking van die verslag " "nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:444 -#: ../apport/ui.py:444 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:447 +#: ../apport/ui.py:447 msgid "No package specified" msgstr "Geen pakket gespesifiseer nie" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:445 -#: ../apport/ui.py:445 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:448 +#: ../apport/ui.py:448 msgid "" "You need to specify a package or a PID. See --help for more information." msgstr "" "Jy moet ', pakket of PID spesifiseer. Beskou --help vir meer inligting." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:468 -#: ../apport/ui.py:468 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:471 +#: ../apport/ui.py:471 msgid "Permission denied" msgstr "Toestemming geweier" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:469 -#: ../apport/ui.py:469 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:472 +#: ../apport/ui.py:472 msgid "" "The specified process does not belong to you. Please run this program as the " "process owner or as root." @@ -608,44 +608,44 @@ "Die spesifieke proses behoort nie aan jou nie. Laat die program loop as " "proseseienaar of as root." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:471 -#: ../apport/ui.py:471 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:474 +#: ../apport/ui.py:474 msgid "Invalid PID" msgstr "Ongeldige PID" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:472 -#: ../apport/ui.py:472 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:475 +#: ../apport/ui.py:475 msgid "The specified process ID does not belong to a program." msgstr "Die gespesifiseerde proses-ID behoort nie aan 'n program nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:491 -#: ../apport/ui.py:491 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:494 +#: ../apport/ui.py:494 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "Simptometeks %s kon geen geaffekteerde pakket bepaal nie" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:494 -#: ../apport/ui.py:494 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:497 +#: ../apport/ui.py:497 #, python-format msgid "Package %s does not exist" msgstr "Pakket %s bestaan nie" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:518 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:705 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:710 -#: ../apport/ui.py:518 ../apport/ui.py:705 ../apport/ui.py:710 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:521 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:708 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:713 +#: ../apport/ui.py:521 ../apport/ui.py:708 ../apport/ui.py:713 msgid "Cannot create report" msgstr "Kan nie verslag skep nie" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:533 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:579 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:595 -#: ../apport/ui.py:533 ../apport/ui.py:579 ../apport/ui.py:595 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:536 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:582 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:598 +#: ../apport/ui.py:536 ../apport/ui.py:582 ../apport/ui.py:598 msgid "Updating problem report" msgstr "Opdateer probleemverslag" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:534 -#: ../apport/ui.py:534 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:537 +#: ../apport/ui.py:537 msgid "" "You are not the reporter or subscriber of this problem report, or the report " "is a duplicate or already closed.\n" @@ -657,8 +657,8 @@ "\n" "Skep asseblief 'n nuwe verslag met behulp van \"apport-bug\"." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:543 -#: ../apport/ui.py:543 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:546 +#: ../apport/ui.py:546 msgid "" "You are not the reporter of this problem report. It is much easier to mark a " "bug as a duplicate of another than to move your comments and attachments to " @@ -673,66 +673,66 @@ "makliker om 'n fout as duplikaat van 'n ander te merk as om jou kommentaar " "en bylae te skuif na 'n nuwe fout." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:580 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:596 -#: ../apport/ui.py:580 ../apport/ui.py:596 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:583 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:599 +#: ../apport/ui.py:583 ../apport/ui.py:599 msgid "No additional information collected." msgstr "Geen ekstra informasie versamel nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:647 -#: ../apport/ui.py:647 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:650 +#: ../apport/ui.py:650 msgid "What kind of problem do you want to report?" msgstr "Watter tipe probleem probeer jy rapporteer?" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:664 -#: ../apport/ui.py:664 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:667 +#: ../apport/ui.py:667 msgid "Unknown symptom" msgstr "Onbekende simptoom" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:665 -#: ../apport/ui.py:665 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:668 +#: ../apport/ui.py:668 #, python-format msgid "The symptom \"%s\" is not known." msgstr "Die simptoom \"%s\" is onbekend" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:696 -#: ../apport/ui.py:696 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:699 +#: ../apport/ui.py:699 msgid "" "After closing this message please click on an application window to report a " "problem about it." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:706 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:711 -#: ../apport/ui.py:706 ../apport/ui.py:711 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:709 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:714 +#: ../apport/ui.py:709 ../apport/ui.py:714 msgid "xprop failed to determine process ID of the window" msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:725 -#: ../apport/ui.py:725 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:728 +#: ../apport/ui.py:728 msgid "%prog " msgstr "%prog " -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:727 -#: ../apport/ui.py:727 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:730 +#: ../apport/ui.py:730 msgid "Specify package name." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:729 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:780 -#: ../apport/ui.py:729 ../apport/ui.py:780 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:732 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:783 +#: ../apport/ui.py:732 ../apport/ui.py:783 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:759 -#: ../apport/ui.py:759 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:762 +#: ../apport/ui.py:762 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "" "%prog [opsies] [simptoom|pid|pakket|programroete|.apport/.crash lêer]" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:762 -#: ../apport/ui.py:762 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:765 +#: ../apport/ui.py:765 msgid "" "Start in bug filing mode. Requires --package and an optional --pid, or just " "a --pid. If neither is given, display a list of known symptoms. (Implied if " @@ -742,18 +742,18 @@ "net 'n --pid. Indien geeneen verskaf word nie, vertoon 'n lys van bekende " "simptome. (By implkasie dat 'n enkele argument gegewe is." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:764 -#: ../apport/ui.py:764 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:767 +#: ../apport/ui.py:767 msgid "Click a window as a target for filing a problem report." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:766 -#: ../apport/ui.py:766 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:769 +#: ../apport/ui.py:769 msgid "Start in bug updating mode. Can take an optional --package." msgstr "Begin in foutopdatering modus. Kan 'n opsionele --pakket vat." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:768 -#: ../apport/ui.py:768 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:771 +#: ../apport/ui.py:771 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " "argument.)" @@ -761,8 +761,8 @@ "Handig 'n foutrapport in oor 'n simptoom. (By implikasie dat 'n stelselnaam " "gegee word as die enigste argument.)" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:770 -#: ../apport/ui.py:770 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:773 +#: ../apport/ui.py:773 msgid "" "Specify package name in --file-bug mode. This is optional if a --pid is " "specified. (Implied if package name is given as only argument.)" @@ -771,21 +771,21 @@ "pid gespesifiseer is. (By implikasie dat 'n pakketnaam as die enogste " "argument gegee word.)" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:772 -#: ../apport/ui.py:772 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:775 +#: ../apport/ui.py:775 msgid "" "Specify a running program in --file-bug mode. If this is specified, the bug " "report will contain more information. (Implied if pid is given as only " "argument.)" msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:774 -#: ../apport/ui.py:774 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:777 +#: ../apport/ui.py:777 msgid "The provided pid is a hanging application." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:776 -#: ../apport/ui.py:776 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:779 +#: ../apport/ui.py:779 #, python-format msgid "" "Report the crash from given .apport or .crash file instead of the pending " @@ -795,63 +795,63 @@ "van die afwagtende verlsae in %s. (By implikasie dat die lêer as enigste " "agrument gegee word.)" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:778 -#: ../apport/ui.py:778 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:781 +#: ../apport/ui.py:781 msgid "" "In bug filing mode, save the collected information into a file instead of " "reporting it. This file can then be reported later on from a different " "machine." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:782 -#: ../apport/ui.py:782 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:785 +#: ../apport/ui.py:785 msgid "Print the Apport version number." msgstr "Druk die Apport weergawe nommer." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:933 -#: ../apport/ui.py:933 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:936 +#: ../apport/ui.py:936 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:934 -#: ../apport/ui.py:934 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:937 +#: ../apport/ui.py:937 msgid "Run gdb session" msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:935 -#: ../apport/ui.py:935 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:938 +#: ../apport/ui.py:938 msgid "Run gdb session without downloading debug symbols" msgstr "" #. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:937 -#: ../apport/ui.py:937 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:940 +#: ../apport/ui.py:940 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1033 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1043 -#: ../apport/ui.py:1033 ../apport/ui.py:1043 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1036 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1046 +#: ../apport/ui.py:1036 ../apport/ui.py:1046 msgid "" "This problem report applies to a program which is not installed any more." msgstr "" "Hierdie probleemverslag is van toepassing op 'n program wat ongeïnstalleer " "is." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1058 -#: ../apport/ui.py:1058 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1061 +#: ../apport/ui.py:1061 #, python-format msgid "" "The problem happened with the program %s which changed since the crash " "occurred." msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1105 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1162 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1377 -#: ../apport/ui.py:1105 ../apport/ui.py:1162 ../apport/ui.py:1377 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1108 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1165 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1380 +#: ../apport/ui.py:1108 ../apport/ui.py:1165 ../apport/ui.py:1380 msgid "This problem report is damaged and cannot be processed." msgstr "Hierdie probleemverslag is beskadig en kan nie verwerk word nie." @@ -861,60 +861,60 @@ msgid "The report belongs to a package that is not installed." msgstr "Die verslag behoort aan 'n ongeïnstalleerde pakket." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1124 -#: ../apport/ui.py:1124 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1127 +#: ../apport/ui.py:1127 msgid "An error occurred while attempting to process this problem report:" msgstr "" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1206 -#: ../apport/ui.py:1206 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1209 +#: ../apport/ui.py:1209 msgid "Could not determine the package or source package name." msgstr "Kon nie die pakket of bronpakket naam bepaal nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1224 -#: ../apport/ui.py:1224 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1227 +#: ../apport/ui.py:1227 msgid "Unable to start web browser" msgstr "Kon nie die webblaaier aan die gang kry nie" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1225 -#: ../apport/ui.py:1225 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1228 +#: ../apport/ui.py:1228 #, python-format msgid "Unable to start web browser to open %s." msgstr "Kon nie die webblaaier aan die gang kry om %s oop te maak nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1325 -#: ../apport/ui.py:1325 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1328 +#: ../apport/ui.py:1328 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "Voer asseblief jou rekeninginformasie in vir die%s foutspoorstelsel" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1337 -#: ../apport/ui.py:1337 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1340 +#: ../apport/ui.py:1340 msgid "Network problem" msgstr "Netwerkprobleem" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1339 -#: ../apport/ui.py:1339 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1342 +#: ../apport/ui.py:1342 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "" "Kon nie verbind met die crash-databasis nie, gaan asseblief jou " "internetkonneksie na." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1366 -#: ../apport/ui.py:1366 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1369 +#: ../apport/ui.py:1369 msgid "Memory exhaustion" msgstr "Geheue opgebruik" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1367 -#: ../apport/ui.py:1367 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1370 +#: ../apport/ui.py:1370 msgid "Your system does not have enough memory to process this crash report." msgstr "" "Jou stelsel het nie genoeg geheue beskikbaar om die ineenstortingsverslag te " "prosseseer nie." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1402 -#: ../apport/ui.py:1402 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1405 +#: ../apport/ui.py:1405 #, python-format msgid "" "The problem cannot be reported:\n" @@ -925,14 +925,14 @@ "\n" "%s" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1458 -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1465 -#: ../apport/ui.py:1458 ../apport/ui.py:1465 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1461 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1468 +#: ../apport/ui.py:1461 ../apport/ui.py:1468 msgid "Problem already known" msgstr "Probleem reeds bekend" -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1459 -#: ../apport/ui.py:1459 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1462 +#: ../apport/ui.py:1462 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 " @@ -942,8 +942,8 @@ "webblaaier. Gaan na of enige verdere informasie bygevoeg kan word wat tot " "hulp van die ontwikkelaars kan wees." -#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1466 -#: ../apport/ui.py:1466 +#: ../debian/tmp/usr/lib/python2.7/dist-packages/apport/ui.py:1469 +#: ../apport/ui.py:1469 msgid "This problem was already reported to developers. Thank you!" msgstr "" diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/apturl.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/apturl.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/apturl.po 2019-02-21 10:34:47.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/apturl.po 2019-02-28 10:34:47.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: 2019-02-20 11:28+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 11:25+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/avahi.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/avahi.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/avahi.po 2019-02-21 10:34:47.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/avahi.po 2019-02-28 10:34:47.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: 2019-02-20 11:10+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 11:07+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: ../avahi-common/error.c:30 msgid "OK" diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/click.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/click.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/click.po 2019-02-21 10:34:46.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/click.po 2019-02-28 10:34:45.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: 2019-02-20 11:43+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 11:38+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: ../pk-plugin/com.ubuntu.click.policy.in.h:1 msgid "Install package" diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/dpkg.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/dpkg.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/dpkg.po 2019-02-21 10:34:48.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/dpkg.po 2019-02-28 10:34:48.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: 2019-02-20 10:37+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 10:37+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: lib/dpkg/ar.c #, c-format @@ -143,8 +143,8 @@ msgid "failed to seek" msgstr "" -#: lib/dpkg/command.c lib/dpkg/path-remove.c src/unpack.c dpkg-deb/build.c -#: dpkg-split/split.c utils/update-alternatives.c +#: lib/dpkg/command.c lib/dpkg/path-remove.c src/unpack.c dpkg-split/split.c +#: utils/update-alternatives.c #, c-format msgid "unable to execute %s (%s)" msgstr "" @@ -420,8 +420,7 @@ msgid "unable to open directory '%s'" msgstr "" -#: lib/dpkg/dir.c src/divertcmd.c dpkg-split/split.c -#: utils/update-alternatives.c +#: lib/dpkg/dir.c src/divertcmd.c utils/update-alternatives.c #, c-format msgid "unable to open file '%s'" msgstr "" @@ -432,7 +431,7 @@ msgid "unable to sync file '%s'" msgstr "" -#: lib/dpkg/dir.c src/divertcmd.c dpkg-deb/build.c dpkg-split/join.c +#: lib/dpkg/ar.c lib/dpkg/dir.c src/divertcmd.c dpkg-split/join.c #: dpkg-split/queue.c utils/update-alternatives.c #, c-format msgid "unable to close file '%s'" @@ -1101,7 +1100,7 @@ msgid "invalid character in revision number" msgstr "" -#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c +#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c #, c-format msgid "ambiguous package name '%s' with more than one installed instance" msgstr "" @@ -1167,7 +1166,7 @@ msgid "fork failed" msgstr "" -#: lib/dpkg/subproc.c +#: src/unpack.c #, c-format msgid "subprocess %s returned error exit status %d" msgstr "" @@ -1191,7 +1190,7 @@ msgid "subprocess %s failed with wait status code %d" msgstr "" -#: lib/dpkg/subproc.c utils/update-alternatives.c +#: utils/update-alternatives.c #, c-format msgid "wait for subprocess %s failed" msgstr "" @@ -1216,7 +1215,7 @@ msgid "unable to open/create triggers lockfile `%.250s'" msgstr "" -#: lib/dpkg/trigdeferred.l +#: lib/dpkg/trigdeferred.c msgid "triggers area" msgstr "" @@ -1521,7 +1520,7 @@ msgid "archive contained object `%.255s' of unknown type 0x%x" msgstr "" -#: src/archives.c src/divertcmd.c utils/update-alternatives.c +#: src/divertcmd.c utils/update-alternatives.c #, c-format msgid "cannot stat file '%s'" msgstr "" @@ -1730,9 +1729,9 @@ msgstr "" #: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c -#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c dpkg-deb/build.c -#: dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c dpkg-split/info.c -#: dpkg-split/main.c dpkg-split/queue.c +#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c +#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c +#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c msgid "" msgstr "" @@ -2399,11 +2398,11 @@ msgid "divert-to may not contain newlines" msgstr "" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to open diversions file" msgstr "" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to fstat diversions file" msgstr "" @@ -2624,7 +2623,7 @@ msgid "unable to open files list file for package `%.250s'" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "" "files list file for package '%.250s' missing; assuming package has no files " @@ -2646,7 +2645,7 @@ msgid "reading files list for package '%.250s'" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' is missing final newline" msgstr "" @@ -2661,18 +2660,18 @@ msgid "error closing files list file for package `%.250s'" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c msgid "(Reading database ... " msgstr "(Lees databasis ... " -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "%d file or directory currently installed.)\n" msgid_plural "%d files and directories currently installed.)\n" msgstr[0] "" msgstr[1] "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing final newline" msgstr "" @@ -2687,7 +2686,7 @@ msgid "control file '%s' missing value separator" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' contains empty filename" msgstr "" @@ -2788,32 +2787,32 @@ msgid "unable to check existence of `%.250s'" msgstr "" -#: src/infodb-access.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c msgid "cannot read info directory" msgstr "" -#: src/infodb-format.c src/unpack.c +#: lib/dpkg/db-ctrl-format.c src/unpack.c #, c-format msgid "error trying to open %.250s" msgstr "" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "corrupt info database format file '%s'" msgstr "" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "" "info database format (%d) is bogus or too new; try getting a newer dpkg" msgstr "" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "info file %s/%s not associated to any package" msgstr "" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "error while writing '%s'" msgstr "" @@ -3413,7 +3412,7 @@ msgid "package '%s' is not available" msgstr "" -#: src/enquiry.c src/querycmd.c +#: src/enquiry.c src/querycmd.c src/verify.c #, c-format msgid "package '%s' is not installed" msgstr "" @@ -3597,7 +3596,8 @@ msgid "while removing %.250s, directory '%.250s' not empty so not removed" msgstr "" -#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c +#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c +#: src/remove.c #, c-format msgid "cannot remove '%.250s'" msgstr "" @@ -3832,36 +3832,36 @@ msgid "syntax error: invalid mode in statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to open statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to fstat statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "reading statoverride file '%.250s'" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file is missing final newline" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file contains empty line" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "syntax error in statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "unexpected end of line in statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "multiple statoverrides present for file '%.250s'" msgstr "" @@ -4404,12 +4404,12 @@ msgid "shell command to move files" msgstr "" -#: dpkg-deb/extract.c +#: dpkg-deb/extract.c dpkg-split/main.c #, c-format msgid "unexpected end of file in %s in %.255s" msgstr "" -#: dpkg-deb/extract.c +#: dpkg-deb/extract.c dpkg-split/main.c #, c-format msgid "error reading %s from file %.255s" msgstr "" @@ -4419,7 +4419,7 @@ msgid "failed to read archive `%.255s'" msgstr "" -#: dpkg-deb/extract.c +#: lib/dpkg/ar.c msgid "failed to fstat archive" msgstr "" @@ -4779,7 +4779,7 @@ msgid "file `%.250s' is corrupt - missing newline after %.250s" msgstr "" -#: dpkg-split/info.c dpkg-split/main.c +#: dpkg-split/info.c #, c-format msgid "error reading %.250s" msgstr "" @@ -5253,7 +5253,7 @@ " --version show the version.\n" msgstr "" -#: utils/update-alternatives.c +#: lib/dpkg/ehandle.c utils/update-alternatives.c msgid "error" msgstr "" @@ -5262,7 +5262,7 @@ msgid "Use '%s --help' for program usage information." msgstr "" -#: utils/update-alternatives.c +#: lib/dpkg/report.c utils/update-alternatives.c msgid "warning" msgstr "" diff -Nru language-pack-af-14.04+20190220/data/af/LC_MESSAGES/git.po language-pack-af-14.04+20190227/data/af/LC_MESSAGES/git.po --- language-pack-af-14.04+20190220/data/af/LC_MESSAGES/git.po 2019-02-21 10:34:48.000000000 +0000 +++ language-pack-af-14.04+20190227/data/af/LC_MESSAGES/git.po 2019-02-28 10:34:47.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: 2019-02-20 11:06+0000\n" -"X-Generator: Launchpad (build 18878)\n" +"X-Launchpad-Export-Date: 2019-02-27 11:03+0000\n" +"X-Generator: Launchpad (build 18888)\n" #: advice.c:62 #, c-format @@ -39,7 +39,7 @@ msgid "git archive [options] [...]" msgstr "" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "" @@ -48,91 +48,92 @@ "git archive --remote [--exec ] [options] [...]" msgstr "" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:436 +#: archive.c:453 msgid "fmt" msgstr "" -#: archive.c:436 +#: archive.c:453 msgid "archive format" msgstr "" -#: archive.c:437 builtin/log.c:1462 +#: archive.c:454 builtin/log.c:1536 msgid "prefix" msgstr "" -#: archive.c:438 +#: archive.c:455 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: 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 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122 +#: parse-options.h:162 msgid "file" msgstr "" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:457 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:442 +#: archive.c:459 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:443 +#: archive.c:460 msgid "report archived files on stderr" msgstr "" -#: archive.c:444 +#: archive.c:461 msgid "store only" msgstr "" -#: archive.c:445 +#: archive.c:462 msgid "compress faster" msgstr "" -#: archive.c:453 +#: archive.c:470 msgid "compress better" msgstr "" -#: archive.c:456 +#: archive.c:473 msgid "list supported archive formats" msgstr "" -#: 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 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855 msgid "repo" msgstr "" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:476 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:496 msgid "command" msgstr "" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:478 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: attr.c:415 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: branch.c:67 +#: branch.c:66 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" @@ -182,37 +183,37 @@ msgid "Tracking not set up: name too long: %s" msgstr "" -#: branch.c:156 +#: branch.c:155 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:189 +#: branch.c:188 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:208 +#: branch.c:207 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:213 +#: branch.c:212 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:233 +#: branch.c:232 #, c-format msgid "" "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:235 +#: branch.c:234 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:237 +#: branch.c:236 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -224,17 +225,17 @@ "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:280 +#: branch.c:279 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:300 +#: branch.c:299 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:305 +#: branch.c:304 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" @@ -247,77 +248,79 @@ msgid "Failed to write ref" msgstr "" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722 +#: builtin/commit.c:774 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:139 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: 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 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406 +#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: bundle.c:190 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:197 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:199 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:311 +#: bundle.c:327 msgid "rev-list died" msgstr "" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:360 +#: bundle.c:376 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:458 +#: bundle.c:464 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:258 +#: bundle.c:274 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:269 +#: bundle.c:285 msgid "pack-objects died" msgstr "" -#: bundle.c:470 +#: bundle.c:474 #, c-format msgid "cannot create '%s'" msgstr "" @@ -326,13 +329,14 @@ msgid "index-pack died" msgstr "" -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:43 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "" @@ -341,7 +345,7 @@ msgid "memory exhausted" msgstr "" -#: connected.c:78 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "" @@ -428,36 +432,36 @@ msgid "failed to read orderfile '%s'" msgstr "" -#: diff.c:152 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:341 +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:401 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:4403 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4417 +#: diff.c:4743 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" @@ -470,7 +474,7 @@ msgid "gpg did not accept the data" msgstr "" -#: gpg-interface.c:181 +#: gpg-interface.c:318 msgid "gpg failed to sign the data" msgstr "" @@ -484,7 +488,7 @@ msgid "failed writing detached signature to '%s': %s" msgstr "" -#: grep.c:2022 +#: grep.c:2113 #, c-format msgid "'%s': unable to read %s" msgstr "" @@ -499,12 +503,12 @@ msgid "'%s': short read %s" msgstr "" -#: help.c:179 +#: help.c:296 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:186 +#: help.c:303 msgid "git commands available from elsewhere on your $PATH" msgstr "" @@ -512,14 +516,14 @@ msgid "The most commonly used git commands are:" msgstr "" -#: help.c:281 +#: help.c:594 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:336 +#: help.c:653 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" @@ -535,12 +539,12 @@ msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:376 +#: help.c:693 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:466 +#: help.c:784 msgid "" "\n" "Did you mean this?" @@ -550,21 +554,21 @@ msgstr[0] "" msgstr[1] "" -#: help.c:462 +#: help.c:780 #, c-format msgid "%s: %s - %s" msgstr "" -#: merge.c:74 +#: merge.c:41 msgid "failed to read the cache" msgstr "" -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:599 builtin/clone.c:759 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:235 +#: merge-recursive.c:323 msgid "(bad commit)\n" msgstr "" @@ -573,40 +577,40 @@ msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:329 +#: merge-recursive.c:435 msgid "error building trees" msgstr "" -#: merge-recursive.c:771 +#: merge-recursive.c:906 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:782 +#: merge-recursive.c:917 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:796 merge-recursive.c:815 +#: merge-recursive.c:931 merge-recursive.c:950 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:805 +#: merge-recursive.c:940 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:847 builtin/cat-file.c:37 +#: merge-recursive.c:982 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:849 +#: merge-recursive.c:984 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: builtin/clone.c:401 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "" @@ -616,16 +620,16 @@ msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:889 +#: merge-recursive.c:1024 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1029 +#: merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1034 +#: merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "" @@ -634,134 +638,134 @@ msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1146 +#: merge-recursive.c:1483 #, 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:1158 +#: merge-recursive.c:1495 #, 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:1197 +#: merge-recursive.c:1534 msgid "rename" msgstr "" -#: merge-recursive.c:1197 +#: merge-recursive.c:1534 msgid "renamed" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1602 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1279 +#: merge-recursive.c:1633 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1284 +#: merge-recursive.c:1638 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1346 +#: merge-recursive.c:1699 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1379 +#: merge-recursive.c:1734 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1582 +#: merge-recursive.c:2737 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1597 +#: merge-recursive.c:2763 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1604 merge-recursive.c:1834 +#: merge-recursive.c:2770 merge-recursive.c:3127 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1661 +#: merge-recursive.c:2934 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1664 +#: merge-recursive.c:2937 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1733 +#: merge-recursive.c:3006 msgid "modify" msgstr "" -#: merge-recursive.c:1733 +#: merge-recursive.c:3006 msgid "modified" msgstr "" -#: merge-recursive.c:1743 +#: merge-recursive.c:3017 msgid "content" msgstr "" -#: merge-recursive.c:1750 +#: merge-recursive.c:3024 msgid "add/add" msgstr "" -#: merge-recursive.c:1786 +#: merge-recursive.c:3071 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1800 +#: merge-recursive.c:1395 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1804 git-submodule.sh:879 +#: merge-recursive.c:3093 git-submodule.sh:858 msgid "submodule" msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:3094 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1899 +#: merge-recursive.c:3216 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1925 +#: merge-recursive.c:3242 msgid "file/directory" msgstr "" -#: merge-recursive.c:1931 +#: merge-recursive.c:3248 msgid "directory/file" msgstr "" -#: merge-recursive.c:1938 +#: merge-recursive.c:3255 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1947 +#: merge-recursive.c:3264 #, c-format msgid "Adding %s" msgstr "" @@ -774,7 +778,7 @@ msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:2000 +#: merge-recursive.c:3320 #, c-format msgid "merging of trees %s and %s failed" msgstr "" @@ -784,40 +788,40 @@ msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:2097 +#: merge-recursive.c:3419 msgid "Merging:" msgstr "" -#: merge-recursive.c:2110 +#: merge-recursive.c:3432 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2149 +#: merge-recursive.c:3471 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2212 +#: merge-recursive.c:3537 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849 msgid "Unable to write index." msgstr "" -#: notes-utils.c:43 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:102 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:112 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -826,21 +830,21 @@ #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:142 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object.c:239 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:619 +#: parse-options.c:672 msgid "..." msgstr "" -#: parse-options.c:638 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "" @@ -848,17 +852,17 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:644 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:647 +#: parse-options.c:700 #, c-format msgid " %s" msgstr "" -#: parse-options.c:686 +#: parse-options.c:739 msgid "-NUM" msgstr "" @@ -901,7 +905,7 @@ msgid "%s: '%s' is outside repository" msgstr "" -#: submodule.c:343 +#: submodule.c:360 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" @@ -922,31 +926,31 @@ "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: remote.c:795 +#: remote.c:607 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:799 +#: remote.c:611 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:803 +#: remote.c:615 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:811 +#: remote.c:623 msgid "Internal error" msgstr "" -#: remote.c:2132 +#: remote.c:1935 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2136 +#: remote.c:1939 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" @@ -955,18 +959,18 @@ msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2150 +#: remote.c:1953 #, 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:2156 +#: remote.c:1959 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2159 +#: remote.c:1962 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -974,11 +978,11 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2167 +#: remote.c:1970 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2170 +#: remote.c:1973 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -989,11 +993,11 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2180 +#: remote.c:1983 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: run-command.c:731 +#: run-command.c:740 msgid "open /dev/null failed" msgstr "" @@ -1013,13 +1017,13 @@ msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:330 +#: sequencer.c:376 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:333 +#: sequencer.c:379 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -1051,7 +1055,7 @@ #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:526 +#: sequencer.c:575 #, c-format msgid "%s: Unable to write new index file" msgstr "" @@ -1095,7 +1099,7 @@ #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1535 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" @@ -1105,26 +1109,26 @@ msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:1654 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1655 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1702 +#: sequencer.c:2479 sequencer.c:4005 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1712 +#: sequencer.c:1974 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1718 +#: sequencer.c:1981 #, c-format msgid "git %s: failed to refresh the index" msgstr "" @@ -1163,7 +1167,7 @@ msgid "Invalid key: %s" msgstr "" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:60 builtin/pull.c:62 #, c-format msgid "Invalid value for %s: %s" msgstr "" @@ -1173,11 +1177,11 @@ msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:2100 +#: sequencer.c:2487 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:2101 +#: sequencer.c:2488 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" @@ -1191,15 +1195,15 @@ msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:2173 sequencer.c:2761 +#: sequencer.c:2560 sequencer.c:3761 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2175 +#: sequencer.c:2562 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2177 sequencer.c:2212 +#: sequencer.c:2564 sequencer.c:2599 msgid "cannot abort from a branch yet to be born" msgstr "" @@ -1213,11 +1217,11 @@ msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:2201 +#: sequencer.c:2588 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2207 +#: sequencer.c:2594 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" @@ -1227,12 +1231,12 @@ msgid "Could not format %s." msgstr "" -#: sequencer.c:2881 +#: sequencer.c:3982 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2885 +#: sequencer.c:3986 #, c-format msgid "%s: bad revision" msgstr "" @@ -1245,7 +1249,7 @@ msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:693 +#: sha1-name.c:770 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" @@ -1258,7 +1262,7 @@ "running \"git config advice.objectNameWarning false\"" msgstr "" -#: remote.c:1726 remote.c:1828 +#: remote.c:1569 remote.c:1670 msgid "HEAD does not point to a branch" msgstr "" @@ -1277,21 +1281,21 @@ msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: submodule.c:96 submodule.c:130 +#: submodule.c:116 submodule.c:145 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:100 submodule.c:134 +#: submodule.c:120 submodule.c:149 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:108 +#: submodule-config.c:754 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:141 +#: submodule.c:156 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" @@ -1316,7 +1320,7 @@ msgid "adding updated .gitmodules failed" msgstr "" -#: submodule.c:152 +#: submodule.c:167 msgid "staging updated .gitmodules failed" msgstr "" @@ -1378,57 +1382,57 @@ msgid "no such user" msgstr "" -#: wt-status.c:151 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:184 +#: wt-status.c:187 msgid " (use \"git add ...\" to mark resolution)" msgstr "" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:191 msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:199 wt-status.c:1007 +#: wt-status.c:202 wt-status.c:1042 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:217 wt-status.c:1016 +#: wt-status.c:220 wt-status.c:1051 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:221 +#: wt-status.c:224 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:223 +#: wt-status.c:226 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:226 +#: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:238 +#: wt-status.c:241 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" @@ -1437,31 +1441,31 @@ msgid "bug" msgstr "" -#: wt-status.c:253 +#: wt-status.c:256 msgid "both deleted:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:258 msgid "added by us:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:260 msgid "deleted by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:262 msgid "added by them:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:264 msgid "deleted by us:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:266 msgid "both added:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:268 msgid "both modified:" msgstr "" @@ -1489,15 +1493,15 @@ msgid "unmerged" msgstr "" -#: wt-status.c:369 +#: wt-status.c:372 msgid "new commits, " msgstr "" -#: wt-status.c:371 +#: wt-status.c:374 msgid "modified content, " msgstr "" -#: wt-status.c:373 +#: wt-status.c:376 msgid "untracked content, " msgstr "" @@ -1506,11 +1510,11 @@ msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:879 +#: wt-status.c:912 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:881 +#: wt-status.c:914 msgid "Submodule changes to be committed:" msgstr "" @@ -1520,182 +1524,182 @@ "Everything below will be removed." msgstr "" -#: wt-status.c:1076 +#: wt-status.c:1097 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1079 +#: wt-status.c:1100 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1086 +#: wt-status.c:1106 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1089 +#: wt-status.c:1109 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1099 +#: wt-status.c:1118 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1102 +#: wt-status.c:1121 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1106 +#: wt-status.c:1125 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1108 +#: wt-status.c:1127 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1129 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1287 +#: wt-status.c:1304 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1292 +#: wt-status.c:1309 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1306 +#: wt-status.c:1322 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1308 +#: wt-status.c:1324 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1326 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1316 +#: wt-status.c:1333 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1320 +#: wt-status.c:1337 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1325 +#: wt-status.c:1342 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1345 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1332 +#: wt-status.c:1349 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1337 +#: wt-status.c:1354 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1340 +#: wt-status.c:1357 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1342 +#: wt-status.c:1359 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1352 +#: wt-status.c:1368 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1357 +#: wt-status.c:1373 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1360 +#: wt-status.c:1376 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1362 +#: wt-status.c:1378 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1386 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1376 +#: wt-status.c:1391 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1379 +#: wt-status.c:1394 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1396 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1392 +#: wt-status.c:1406 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1410 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1399 +#: wt-status.c:1413 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1596 +#: wt-status.c:1611 msgid "On branch " msgstr "" -#: wt-status.c:1604 +#: wt-status.c:1620 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1609 +#: wt-status.c:1625 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1611 +#: wt-status.c:1627 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1614 +#: wt-status.c:1630 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1634 +#: wt-status.c:1647 msgid "Initial commit" msgstr "" -#: wt-status.c:1649 +#: wt-status.c:1662 msgid "Untracked files" msgstr "" -#: wt-status.c:1651 +#: wt-status.c:1664 msgid "Ignored files" msgstr "" -#: wt-status.c:1655 +#: wt-status.c:1668 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -1703,53 +1707,53 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1661 +#: wt-status.c:1674 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1663 +#: wt-status.c:1676 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1669 +#: wt-status.c:1682 msgid "No changes" msgstr "" -#: wt-status.c:1674 +#: wt-status.c:1687 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1677 +#: wt-status.c:1690 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1680 +#: wt-status.c:1693 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1683 +#: wt-status.c:1696 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1686 +#: wt-status.c:1699 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1689 wt-status.c:1694 +#: wt-status.c:1702 wt-status.c:1707 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1692 +#: wt-status.c:1705 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" @@ -1759,7 +1763,7 @@ msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1813 +#: wt-status.c:1826 msgid "HEAD (no branch)" msgstr "" @@ -1767,15 +1771,15 @@ msgid "Initial commit on " msgstr "" -#: ref-filter.c:35 wt-status.c:1842 +#: ref-filter.c:39 wt-status.c:1855 msgid "gone" msgstr "" -#: wt-status.c:1846 wt-status.c:1854 +#: wt-status.c:1859 wt-status.c:1867 msgid "behind " msgstr "" -#: wt-status.c:1849 wt-status.c:1852 +#: wt-status.c:1862 wt-status.c:1865 msgid "ahead " msgstr "" @@ -1783,7 +1787,7 @@ msgid ", behind " msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:440 +#: builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1843,7 +1847,7 @@ msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:88 builtin/commit.c:257 +#: builtin/add.c:88 builtin/commit.c:284 msgid "updating files failed" msgstr "" @@ -1856,7 +1860,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:233 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:895 msgid "Could not read the index" msgstr "" @@ -1883,67 +1887,68 @@ msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:271 +#: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: 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 +#: builtin/add.c:289 builtin/clean.c:907 builtin/fetch.c:137 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:213 builtin/push.c:557 +#: builtin/remote.c:1345 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: 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 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127 +#: builtin/rebase--interactive.c:157 msgid "be verbose" msgstr "" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "" -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1258 builtin/reset.c:305 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:304 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:308 +#: builtin/add.c:306 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:372 +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" @@ -1952,7 +1957,7 @@ msgid "no files added" msgstr "" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "" @@ -1974,14 +1979,15 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: 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 +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "" -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "" @@ -1989,62 +1995,62 @@ msgid "git apply [options] [...]" msgstr "" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:1473 +#: apply.c:1479 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1542 +#: apply.c:1548 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1562 +#: apply.c:1568 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2055,104 +2061,104 @@ msgstr[0] "" msgstr[1] "" -#: apply.c:1763 +#: apply.c:1769 msgid "new file depends on old contents" msgstr "" -#: apply.c:1765 +#: apply.c:1771 msgid "deleted file still has contents" msgstr "" -#: apply.c:1799 +#: apply.c:1805 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1836 +#: apply.c:1842 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1838 +#: apply.c:1844 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1841 +#: apply.c:1847 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1988 +#: apply.c:1994 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2025 +#: apply.c:2031 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2185 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2271 +#: apply.c:2279 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2275 +#: apply.c:2283 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2934 +#: apply.c:2942 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3055 +#: apply.c:3063 #, 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:3067 +#: apply.c:3075 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3073 +#: apply.c:3081 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3095 +#: apply.c:3103 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3198 +#: apply.c:3207 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3204 +#: apply.c:3213 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3225 +#: apply.c:3234 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3347 +#: apply.c:3356 #, c-format msgid "cannot checkout %s" msgstr "" @@ -2162,12 +2168,12 @@ msgid "read of %s failed" msgstr "" -#: apply.c:3433 apply.c:3673 +#: apply.c:3445 apply.c:3688 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3516 apply.c:3687 +#: apply.c:3531 apply.c:3703 #, c-format msgid "%s: does not exist in index" msgstr "" @@ -2177,262 +2183,262 @@ msgid "%s: %s" msgstr "" -#: apply.c:3525 apply.c:3695 +#: apply.c:3540 apply.c:3711 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3640 +#: apply.c:3655 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3712 +#: apply.c:3728 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3714 +#: apply.c:3730 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3922 +#: apply.c:3939 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3925 +#: apply.c:3942 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3945 +#: apply.c:3962 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3950 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3974 +#: apply.c:3991 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3989 +#: apply.c:4006 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4247 +#: apply.c:4265 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4282 +#: apply.c:4299 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4288 +#: apply.c:4305 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4296 +#: apply.c:4313 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4302 apply.c:4446 +#: apply.c:4319 apply.c:4464 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4347 +#: apply.c:4366 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4417 +#: apply.c:4436 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4515 +#: apply.c:4534 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4523 +#: apply.c:4542 msgid "internal error" msgstr "" -#: apply.c:4526 +#: apply.c:4545 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4537 +#: apply.c:4556 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4559 +#: apply.c:4578 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4563 +#: apply.c:4582 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4681 +#: apply.c:4700 msgid "unrecognized input" msgstr "" -#: apply.c:4700 +#: apply.c:4719 msgid "unable to read index file" msgstr "" -#: 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 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262 +#: builtin/pull.c:199 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4922 +#: apply.c:4959 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4925 +#: apply.c:4962 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4964 builtin/am.c:2218 msgid "num" msgstr "" -#: apply.c:4928 +#: apply.c:4965 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4931 +#: apply.c:4968 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4933 +#: apply.c:4970 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4937 +#: apply.c:4974 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4939 +#: apply.c:4976 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4941 +#: apply.c:4978 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4943 +#: apply.c:4980 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4945 +#: apply.c:4984 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4950 +#: apply.c:4989 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4952 +#: apply.c:4991 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4954 +#: apply.c:4993 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4959 +#: apply.c:4998 msgid "ensure at least lines of context match" msgstr "" -#: 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 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 +#: builtin/pack-objects.c:3312 builtin/rebase.c:857 msgid "action" msgstr "" -#: apply.c:4961 +#: apply.c:5000 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4964 apply.c:4967 +#: apply.c:5003 apply.c:5006 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4970 +#: apply.c:5009 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4972 +#: apply.c:5011 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4974 +#: apply.c:5013 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:4976 +#: apply.c:5015 msgid "allow overlapping hunks" msgstr "" -#: apply.c:4979 +#: apply.c:5018 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:4982 +#: apply.c:5021 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:5023 builtin/am.c:2206 msgid "root" msgstr "" -#: apply.c:4985 +#: apply.c:5024 msgid "prepend to all filenames" msgstr "" -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "" -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "" -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "" @@ -2441,14 +2447,14 @@ msgid "can't open patch '%s'" msgstr "" -#: apply.c:4864 +#: apply.c:4901 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4870 apply.c:4885 +#: apply.c:4907 apply.c:4922 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2477,7 +2483,7 @@ msgid "git archive: NACK %s" msgstr "" -#: fetch-pack.c:284 builtin/archive.c:63 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" @@ -2510,95 +2516,95 @@ msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:677 +#: builtin/blame.c:793 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:678 +#: builtin/blame.c:794 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:679 +#: builtin/blame.c:795 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:680 +#: builtin/blame.c:796 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:682 +#: builtin/blame.c:798 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:683 +#: builtin/blame.c:799 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:684 +#: builtin/blame.c:800 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:685 +#: builtin/blame.c:801 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:686 +#: builtin/blame.c:802 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:687 +#: builtin/blame.c:803 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:688 +#: builtin/blame.c:804 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:689 +#: builtin/blame.c:805 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:690 +#: builtin/blame.c:806 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:691 +#: builtin/blame.c:807 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:692 +#: builtin/blame.c:808 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:701 +#: builtin/blame.c:819 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:702 +#: builtin/blame.c:820 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:703 +#: builtin/blame.c:821 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:704 builtin/blame.c:705 +#: builtin/blame.c:822 builtin/blame.c:823 msgid "score" msgstr "" -#: builtin/blame.c:704 +#: builtin/blame.c:822 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:705 +#: builtin/blame.c:823 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:706 +#: builtin/blame.c:824 msgid "n,m" msgstr "" -#: builtin/blame.c:706 +#: builtin/blame.c:824 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2618,41 +2624,41 @@ msgid "git branch [options] (-m | -M) [] " msgstr "" -#: builtin/branch.c:146 +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:150 +#: builtin/branch.c:155 #, 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:164 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:168 +#: builtin/branch.c:173 #, 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:181 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:218 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "" @@ -2666,7 +2672,7 @@ msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:248 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "" @@ -2676,7 +2682,7 @@ msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "" @@ -2686,7 +2692,7 @@ msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:272 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" @@ -2740,12 +2746,12 @@ msgid " **** invalid ref ****" msgstr "" -#: ref-filter.c:1313 +#: ref-filter.c:1424 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1316 +#: ref-filter.c:1430 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2755,7 +2761,7 @@ msgid "(detached from %s)" msgstr "" -#: ref-filter.c:1335 +#: ref-filter.c:1449 msgid "(no branch)" msgstr "" @@ -2768,34 +2774,34 @@ msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:473 +#: builtin/branch.c:481 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:484 +#: builtin/branch.c:492 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:511 +#: builtin/branch.c:519 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:520 +#: builtin/branch.c:528 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:526 +#: builtin/branch.c:534 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:535 +#: builtin/branch.c:543 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: ref-filter.c:2246 +#: ref-filter.c:2338 #, c-format msgid "malformed object name %s" msgstr "" @@ -2805,19 +2811,19 @@ msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:586 +#: builtin/branch.c:594 msgid "Generic options" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:596 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:597 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:598 msgid "set up tracking mode (see git-pull(1))" msgstr "" @@ -2825,56 +2831,56 @@ msgid "change upstream info" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:604 msgid "use colored output" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:605 msgid "act on remote-tracking branches" msgstr "" -#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 -#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 +#: builtin/commit.c:1473 builtin/commit.c:1474 builtin/commit.c:1475 +#: builtin/commit.c:1476 ref-filter.h:92 parse-options.h:280 msgid "commit" msgstr "" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:607 builtin/branch.c:609 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:605 +#: builtin/branch.c:613 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:606 +#: builtin/branch.c:614 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:608 +#: builtin/branch.c:616 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:609 +#: builtin/branch.c:617 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:618 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:619 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:614 +#: builtin/branch.c:622 msgid "list branch names" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:623 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:617 +#: builtin/branch.c:625 msgid "edit the description for the branch" msgstr "" @@ -2890,40 +2896,40 @@ msgid "print only merged branches" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:629 msgid "list branches in columns" msgstr "" -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 +#: submodule.c:1097 builtin/branch.c:656 builtin/submodule--helper.c:1985 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:652 builtin/clone.c:735 +#: builtin/branch.c:660 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:675 +#: builtin/branch.c:683 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 msgid "branch name required" msgstr "" -#: builtin/branch.c:718 +#: builtin/branch.c:725 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:723 +#: builtin/branch.c:730 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:730 +#: builtin/branch.c:737 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:733 +#: builtin/branch.c:740 #, c-format msgid "No branch named '%s'." msgstr "" @@ -2936,18 +2942,18 @@ msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:766 +#: builtin/branch.c:773 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:776 builtin/branch.c:798 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:773 +#: builtin/branch.c:780 #, c-format msgid "branch '%s' does not exist" msgstr "" @@ -2956,12 +2962,12 @@ msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:789 +#: builtin/branch.c:796 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:795 +#: builtin/branch.c:802 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" @@ -2970,7 +2976,7 @@ msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:812 msgid "" "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" @@ -3021,35 +3027,35 @@ msgid "git cat-file (--batch|--batch-check) < " msgstr "" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:627 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:628 msgid "show object type" msgstr "" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:629 msgid "show object size" msgstr "" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:631 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:632 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:634 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:643 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:580 +#: builtin/cat-file.c:647 msgid "show info about objects fed from the standard input" msgstr "" @@ -3069,7 +3075,7 @@ msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "" @@ -3077,7 +3083,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1234 builtin/gc.c:517 +#: builtin/worktree.c:495 msgid "suppress progress reporting" msgstr "" @@ -3134,46 +3141,46 @@ msgid "git checkout-index [options] [--] [...]" msgstr "" -#: builtin/checkout-index.c:159 +#: builtin/checkout-index.c:161 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:162 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:164 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:166 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:168 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:170 +#: builtin/checkout-index.c:172 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:174 msgid "write the content to temporary files" msgstr "" -#: 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 +#: builtin/checkout-index.c:175 builtin/column.c:31 +#: builtin/submodule--helper.c:1368 builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1853 +#: builtin/worktree.c:668 msgid "string" msgstr "" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:176 msgid "when creating files, prepend " msgstr "" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:178 msgid "copy out the files from named stage" msgstr "" @@ -3185,48 +3192,48 @@ msgid "git checkout [options] [] -- ..." msgstr "" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:144 builtin/checkout.c:177 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:146 builtin/checkout.c:179 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:154 +#: builtin/checkout.c:162 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:198 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:215 +#: builtin/checkout.c:224 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:231 +#: builtin/checkout.c:240 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:262 builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:271 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:274 builtin/checkout.c:277 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:271 +#: builtin/checkout.c:280 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" @@ -3235,12 +3242,12 @@ msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:349 builtin/checkout.c:356 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:505 +#: builtin/checkout.c:608 msgid "you need to resolve your current index first" msgstr "" @@ -3249,41 +3256,41 @@ msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:677 +#: builtin/checkout.c:786 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:685 +#: builtin/checkout.c:794 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:688 +#: builtin/checkout.c:797 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:692 +#: builtin/checkout.c:801 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:694 builtin/checkout.c:1039 +#: builtin/checkout.c:803 builtin/checkout.c:1166 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:696 +#: builtin/checkout.c:805 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:747 +#: builtin/checkout.c:856 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:753 +#: builtin/checkout.c:862 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3308,68 +3315,68 @@ "\n" msgstr "" -#: builtin/checkout.c:804 +#: builtin/checkout.c:913 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:808 +#: builtin/checkout.c:917 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:836 builtin/checkout.c:1034 +#: builtin/checkout.c:945 builtin/checkout.c:1161 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:940 +#: builtin/checkout.c:1066 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:980 builtin/worktree.c:249 +#: builtin/checkout.c:1107 builtin/worktree.c:289 builtin/worktree.c:444 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1136 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1175 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1051 builtin/checkout.c:1055 +#: builtin/checkout.c:1178 builtin/checkout.c:1182 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1186 builtin/checkout.c:1189 builtin/checkout.c:1194 +#: builtin/checkout.c:1197 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1202 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: 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 +#: builtin/checkout.c:1235 builtin/checkout.c:1237 builtin/clone.c:119 +#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:488 +#: builtin/worktree.c:490 msgid "branch" msgstr "" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1236 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1238 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1239 msgid "create reflog for new branch" msgstr "" @@ -3377,7 +3384,7 @@ msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1241 msgid "set upstream info for new branch" msgstr "" @@ -3385,39 +3392,39 @@ msgid "new branch" msgstr "" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1243 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1245 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1248 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1250 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1252 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1124 builtin/merge.c:239 +#: builtin/checkout.c:1254 builtin/merge.c:275 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 +#: builtin/checkout.c:1256 builtin/log.c:1573 parse-options.h:274 msgid "style" msgstr "" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1257 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1260 msgid "do not limit pathspecs to sparse entries only" msgstr "" @@ -3425,11 +3432,11 @@ msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1298 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1185 +#: builtin/checkout.c:1315 msgid "--track needs a branch name" msgstr "" @@ -3437,7 +3444,7 @@ msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1226 +#: builtin/checkout.c:1357 msgid "invalid path specification" msgstr "" @@ -3448,43 +3455,43 @@ "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1237 +#: builtin/checkout.c:1368 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1372 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:26 +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "" @@ -3514,17 +3521,17 @@ msgid "Huh (%s)?" msgstr "" -#: builtin/clean.c:664 +#: builtin/clean.c:660 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:701 +#: builtin/clean.c:697 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:722 +#: builtin/clean.c:718 msgid "Select items to delete" msgstr "" @@ -3537,7 +3544,7 @@ msgid "Bye." msgstr "" -#: builtin/clean.c:796 +#: builtin/clean.c:792 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -3548,60 +3555,60 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1786 +#: builtin/clean.c:819 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:824 git-add--interactive.perl:1783 +#: builtin/clean.c:820 git-add--interactive.perl:1790 msgid "What now" msgstr "" -#: builtin/clean.c:832 +#: builtin/clean.c:828 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:848 +#: builtin/clean.c:844 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:906 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:908 msgid "force" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:909 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:915 +#: builtin/clean.c:911 msgid "remove whole directories" msgstr "" -#: 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 +#: builtin/clean.c:912 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:886 builtin/log.c:166 builtin/log.c:168 +#: builtin/ls-files.c:556 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:178 msgid "pattern" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:913 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:918 +#: builtin/clean.c:914 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:920 +#: builtin/clean.c:916 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:938 +#: builtin/clean.c:934 msgid "-x and -X cannot be used together" msgstr "" @@ -3621,157 +3628,158 @@ msgid "git clone [options] [--] []" msgstr "" -#: 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 +#: builtin/checkout.c:1268 builtin/clone.c:86 builtin/fetch.c:141 +#: builtin/merge.c:272 builtin/pull.c:129 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:481 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:90 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:96 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:106 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:478 msgid "template-directory" msgstr "" -#: builtin/clone.c:107 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:479 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1577 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1375 +#: builtin/submodule--helper.c:1856 msgid "reference repository" msgstr "" -#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3301 builtin/repack.c:329 msgid "name" msgstr "" -#: builtin/clone.c:115 +#: builtin/clone.c:118 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:117 +#: builtin/clone.c:120 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 -#: builtin/pull.c:211 +#: builtin/clone.c:123 builtin/fetch.c:142 builtin/grep.c:825 +#: builtin/pull.c:217 msgid "depth" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:132 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:487 msgid "gitdir" msgstr "" -#: builtin/clone.c:133 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:488 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:134 +#: builtin/clone.c:137 msgid "key=value" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "" -#: sha1_file.c:624 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:630 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:638 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/am.c:1013 builtin/clone.c:405 +#: builtin/am.c:962 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:409 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:423 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:445 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:449 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:475 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:489 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:566 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" @@ -3781,69 +3789,69 @@ msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:661 +#: fetch-pack.c:1660 builtin/clone.c:664 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:726 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:756 +#: builtin/clone.c:761 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:906 builtin/receive-pack.c:1946 +#: builtin/clone.c:911 builtin/receive-pack.c:1941 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:910 +#: builtin/clone.c:915 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:923 +#: builtin/clone.c:928 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:926 +#: builtin/clone.c:931 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:939 +#: builtin/clone.c:944 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1093 +#: builtin/clone.c:1097 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1102 +#: builtin/clone.c:1106 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1107 +#: builtin/clone.c:1111 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:945 builtin/fetch.c:1455 +#: builtin/clone.c:950 builtin/fetch.c:1606 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:955 +#: builtin/clone.c:960 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:965 +#: builtin/clone.c:970 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 -#: builtin/worktree.c:255 builtin/worktree.c:285 +#: builtin/clone.c:985 builtin/clone.c:1006 builtin/difftool.c:271 +#: builtin/worktree.c:295 builtin/worktree.c:325 #, c-format msgid "could not create leading directories of '%s'" msgstr "" @@ -3853,12 +3861,12 @@ msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:1005 +#: builtin/clone.c:1010 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1007 +#: builtin/clone.c:1012 #, c-format msgid "Cloning into '%s'...\n" msgstr "" @@ -3868,12 +3876,12 @@ msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1169 builtin/clone.c:1177 +#: builtin/clone.c:1181 builtin/clone.c:1189 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1180 +#: builtin/clone.c:1192 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3905,7 +3913,7 @@ msgid "Padding space between columns" msgstr "" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "" @@ -3917,7 +3925,7 @@ msgid "git status [options] [--] ..." msgstr "" -#: sequencer.c:935 +#: sequencer.c:1162 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3931,14 +3939,14 @@ " git commit --amend --reset-author\n" msgstr "" -#: builtin/commit.c:47 +#: builtin/commit.c:50 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:52 +#: builtin/commit.c:55 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3947,11 +3955,11 @@ "\n" msgstr "" -#: builtin/commit.c:59 +#: builtin/commit.c:62 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:62 +#: builtin/commit.c:65 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -3961,35 +3969,35 @@ "the remaining commits.\n" msgstr "" -#: builtin/commit.c:284 +#: builtin/commit.c:311 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:325 +#: builtin/commit.c:352 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:331 +#: builtin/commit.c:358 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 +#: builtin/commit.c:398 builtin/commit.c:421 builtin/commit.c:467 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:427 +#: builtin/commit.c:450 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:429 +#: builtin/commit.c:452 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:437 +#: builtin/commit.c:460 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:456 +#: builtin/commit.c:479 msgid "unable to write temporary index file" msgstr "" @@ -3998,7 +4006,7 @@ msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:574 +#: builtin/commit.c:598 msgid "malformed --author parameter" msgstr "" @@ -4007,21 +4015,21 @@ msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 +#: builtin/commit.c:687 builtin/commit.c:720 builtin/commit.c:1049 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:675 builtin/shortlog.c:309 +#: builtin/commit.c:699 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:677 +#: builtin/commit.c:701 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:681 +#: builtin/commit.c:705 #, c-format msgid "could not read log file '%s'" msgstr "" @@ -4030,25 +4038,26 @@ msgid "commit has empty message" msgstr "" -#: builtin/commit.c:715 +#: builtin/commit.c:739 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:710 builtin/commit.c:718 +#: builtin/commit.c:734 builtin/commit.c:742 msgid "could not read SQUASH_MSG" msgstr "" -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 -#: builtin/commit.c:722 builtin/merge.c:1047 +#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535 +#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746 +#: builtin/merge.c:1084 builtin/rebase.c:152 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:769 +#: builtin/commit.c:793 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:787 +#: builtin/commit.c:811 #, c-format msgid "" "\n" @@ -4058,7 +4067,7 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:792 +#: builtin/commit.c:816 #, c-format msgid "" "\n" @@ -4068,14 +4077,14 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:805 +#: builtin/commit.c:829 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:813 +#: builtin/commit.c:837 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4093,15 +4102,15 @@ msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:862 +#: builtin/commit.c:887 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:928 +#: builtin/commit.c:953 msgid "Error building trees" msgstr "" -#: builtin/commit.c:942 builtin/tag.c:256 +#: builtin/commit.c:967 builtin/tag.c:258 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -4111,36 +4120,36 @@ msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:1014 builtin/commit.c:1264 +#: builtin/commit.c:1039 builtin/commit.c:1276 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1052 +#: builtin/commit.c:1077 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1085 +#: builtin/commit.c:1110 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1094 +#: builtin/commit.c:1119 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1097 +#: builtin/commit.c:1122 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1099 +#: builtin/commit.c:1124 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1112 +#: builtin/commit.c:1137 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" @@ -4148,15 +4157,15 @@ msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1122 +#: builtin/commit.c:1147 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1139 +#: builtin/commit.c:1164 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1166 msgid "No paths with --include/--only does not make sense." msgstr "" @@ -4168,42 +4177,43 @@ msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1155 builtin/tag.c:542 +#: builtin/commit.c:1180 builtin/tag.c:546 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1278 builtin/commit.c:1443 +#: builtin/commit.c:1311 builtin/commit.c:1495 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1280 builtin/commit.c:1445 +#: builtin/commit.c:1313 builtin/commit.c:1497 msgid "show branch information" msgstr "" -#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 -#: builtin/worktree.c:541 +#: builtin/commit.c:1319 builtin/commit.c:1501 builtin/push.c:558 +#: builtin/worktree.c:639 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1289 builtin/commit.c:1451 +#: builtin/commit.c:1322 builtin/commit.c:1503 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1292 builtin/commit.c:1454 +#: builtin/commit.c:1325 builtin/commit.c:1506 msgid "terminate entries with NUL" msgstr "" -#: 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 +#: builtin/commit.c:1327 builtin/commit.c:1331 builtin/commit.c:1509 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/rebase.c:910 +#: builtin/tag.c:400 msgid "mode" msgstr "" -#: builtin/commit.c:1295 builtin/commit.c:1457 +#: builtin/commit.c:1328 builtin/commit.c:1509 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" @@ -4211,119 +4221,119 @@ msgid "show ignored files" msgstr "" -#: builtin/commit.c:1301 parse-options.h:167 +#: builtin/commit.c:1334 parse-options.h:164 msgid "when" msgstr "" -#: builtin/commit.c:1302 +#: builtin/commit.c:1335 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1304 +#: builtin/commit.c:1337 msgid "list untracked files in columns" msgstr "" -#: sequencer.c:975 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:977 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1025 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "" -#: sequencer.c:1029 +#: sequencer.c:1256 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1413 +#: builtin/commit.c:1465 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1414 +#: builtin/commit.c:1466 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1416 +#: builtin/commit.c:1468 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1417 builtin/tag.c:393 +#: builtin/commit.c:1469 builtin/merge.c:263 builtin/tag.c:397 msgid "read message from file" msgstr "" -#: builtin/commit.c:1418 +#: builtin/commit.c:1470 msgid "author" msgstr "" -#: builtin/commit.c:1418 +#: builtin/commit.c:1470 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1419 builtin/gc.c:359 +#: builtin/commit.c:1471 builtin/gc.c:518 msgid "date" msgstr "" -#: builtin/commit.c:1419 +#: builtin/commit.c:1471 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:391 +#: builtin/commit.c:1472 builtin/merge.c:259 builtin/notes.c:409 +#: builtin/notes.c:572 builtin/tag.c:395 msgid "message" msgstr "" -#: builtin/commit.c:1420 +#: builtin/commit.c:1472 msgid "commit message" msgstr "" -#: builtin/commit.c:1421 +#: builtin/commit.c:1473 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1422 +#: builtin/commit.c:1474 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1423 +#: builtin/commit.c:1475 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1424 +#: builtin/commit.c:1476 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1425 +#: builtin/commit.c:1477 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 -#: builtin/pull.c:149 builtin/revert.c:105 +#: builtin/commit.c:1478 builtin/log.c:1520 builtin/merge.c:276 +#: builtin/pull.c:155 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1427 +#: builtin/commit.c:1479 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1428 +#: builtin/commit.c:1480 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1429 +#: builtin/commit.c:1481 msgid "default" msgstr "" -#: builtin/commit.c:1429 builtin/tag.c:397 +#: builtin/commit.c:1481 builtin/tag.c:401 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1430 +#: builtin/commit.c:1482 msgid "include status in commit message template" msgstr "" @@ -4331,32 +4341,32 @@ msgid "key id" msgstr "" -#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 -#: builtin/revert.c:113 +#: builtin/commit.c:1484 builtin/merge.c:274 builtin/pull.c:185 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1435 +#: builtin/commit.c:1487 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1436 +#: builtin/commit.c:1488 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1489 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1438 +#: builtin/commit.c:1490 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1439 +#: builtin/commit.c:1491 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1440 +#: builtin/commit.c:1492 msgid "commit only specified files" msgstr "" @@ -4364,62 +4374,62 @@ msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1442 +#: builtin/commit.c:1494 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1455 +#: builtin/commit.c:1507 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1456 +#: builtin/commit.c:1508 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1461 +#: builtin/commit.c:1513 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1463 +#: builtin/commit.c:1515 msgid "ok to record a change with an empty message" msgstr "" -#: sequencer.c:1056 builtin/commit.c:1491 +#: sequencer.c:1283 builtin/commit.c:1543 msgid "could not parse HEAD commit" msgstr "" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1044 +#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719 +#: builtin/am.c:811 builtin/merge.c:1081 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1588 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1543 +#: builtin/commit.c:1595 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1562 +#: builtin/commit.c:1614 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1630 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1573 +#: builtin/commit.c:1625 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 -#: builtin/merge.c:851 +#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858 +#: builtin/merge.c:883 msgid "failed to write commit object" msgstr "" @@ -4442,83 +4452,83 @@ msgid "git config [options]" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:124 msgid "Config file location" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:125 msgid "use global config file" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:126 msgid "use system config file" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:127 msgid "use repository config file" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:129 msgid "use given config file" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:130 msgid "blob-id" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:131 msgid "Action" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:142 msgid "list all" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:143 msgid "open an editor" msgstr "" @@ -4534,43 +4544,43 @@ msgid "find the color setting: [stdout-is-tty]" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:146 msgid "Type" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:83 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:85 +#: builtin/config.c:153 msgid "Other" msgstr "" -#: builtin/config.c:86 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:88 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "" -#: builtin/count-objects.c:88 +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "" @@ -4582,32 +4592,32 @@ msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:267 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:271 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:273 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:500 builtin/log.c:502 +#: builtin/describe.c:512 builtin/log.c:513 #, c-format msgid "Not a valid object name %s" msgstr "" -#: sha1-file.c:2021 +#: sha1-file.c:2029 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:317 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "" @@ -4617,94 +4627,94 @@ msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:366 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:392 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:396 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:426 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:429 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:522 +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:523 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:524 +#: builtin/describe.c:536 msgid "use any ref" msgstr "" -#: builtin/describe.c:525 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:526 +#: builtin/describe.c:538 msgid "always use long format" msgstr "" -#: builtin/describe.c:527 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:530 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:532 +#: builtin/describe.c:544 msgid "consider most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:534 +#: builtin/describe.c:546 msgid "only consider tags matching " msgstr "" -#: builtin/describe.c:538 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:539 builtin/describe.c:542 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:552 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:561 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:590 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:640 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "" @@ -4718,142 +4728,144 @@ msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:356 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:399 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:408 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:413 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1006 msgid "show progress after objects" msgstr "" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "" -#: builtin/fetch.c:25 +#: builtin/fetch.c:28 msgid "git fetch [] [ [...]]" msgstr "" -#: builtin/fetch.c:26 +#: builtin/fetch.c:29 msgid "git fetch [] " msgstr "" -#: builtin/fetch.c:27 +#: builtin/fetch.c:30 msgid "git fetch --multiple [] [( | )...]" msgstr "" -#: builtin/fetch.c:28 +#: builtin/fetch.c:31 msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:124 builtin/pull.c:188 +#: builtin/fetch.c:115 builtin/pull.c:194 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:126 builtin/pull.c:191 +#: builtin/fetch.c:117 builtin/pull.c:197 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:128 builtin/pull.c:194 +#: builtin/fetch.c:119 builtin/pull.c:200 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:196 +#: builtin/pull.c:202 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:131 +#: builtin/fetch.c:122 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:133 builtin/pull.c:198 +#: builtin/fetch.c:124 builtin/pull.c:204 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:135 +#: builtin/fetch.c:126 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:139 builtin/pull.c:201 +#: builtin/fetch.c:130 builtin/pull.c:207 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 +#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:132 msgid "on-demand" msgstr "" -#: builtin/fetch.c:143 +#: builtin/fetch.c:134 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:147 builtin/pull.c:209 +#: builtin/fetch.c:138 builtin/pull.c:215 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:149 +#: builtin/fetch.c:140 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 +#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:160 builtin/pull.c:215 +#: builtin/fetch.c:151 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:162 builtin/log.c:1466 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 +#: builtin/log.c:1540 msgid "dir" msgstr "" -#: builtin/fetch.c:163 +#: builtin/fetch.c:154 msgid "prepend this to submodule path output" msgstr "" @@ -4861,20 +4873,20 @@ msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:170 builtin/pull.c:218 +#: builtin/fetch.c:161 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:431 +#: builtin/fetch.c:470 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:642 +#: builtin/fetch.c:702 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:646 +#: builtin/fetch.c:706 msgid "[up to date]" msgstr "" @@ -4883,11 +4895,11 @@ msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:659 builtin/fetch.c:739 +#: builtin/fetch.c:719 builtin/fetch.c:735 builtin/fetch.c:807 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:669 +#: builtin/fetch.c:730 msgid "[tag update]" msgstr "" @@ -4895,24 +4907,24 @@ msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:689 +#: builtin/fetch.c:757 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:692 +#: builtin/fetch.c:760 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:695 +#: builtin/fetch.c:763 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 -#: builtin/fetch.c:734 +#: builtin/fetch.c:731 builtin/fetch.c:771 builtin/fetch.c:787 +#: builtin/fetch.c:802 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:734 +#: builtin/fetch.c:802 msgid "forced update" msgstr "" @@ -4925,57 +4937,57 @@ msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:784 +#: builtin/fetch.c:853 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:804 +#: builtin/fetch.c:874 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:892 builtin/fetch.c:988 +#: builtin/fetch.c:963 builtin/fetch.c:1085 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:903 +#: builtin/fetch.c:974 #, 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:958 +#: builtin/fetch.c:1055 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:959 +#: builtin/fetch.c:1056 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1088 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:992 builtin/remote.c:1024 +#: builtin/fetch.c:1089 builtin/remote.c:1036 msgid "(none)" msgstr "" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1112 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1034 +#: builtin/fetch.c:1131 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1134 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" @@ -4985,48 +4997,48 @@ msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1433 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1279 builtin/remote.c:97 +#: builtin/fetch.c:1435 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1504 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:1394 +#: builtin/fetch.c:1541 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1597 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1599 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1464 +#: builtin/fetch.c:1615 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1466 +#: builtin/fetch.c:1617 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1475 +#: builtin/fetch.c:1626 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1633 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -5035,31 +5047,32 @@ "git fmt-merge-msg [-m ] [--log[=]|--no-log] [--file ]" msgstr "" -#: 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 +#: builtin/am.c:2215 builtin/commit.c:1340 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:868 builtin/merge.c:239 +#: builtin/pull.c:151 builtin/pull.c:209 builtin/rebase.c:854 +#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 +#: builtin/show-branch.c:651 builtin/show-ref.c:171 builtin/tag.c:386 +#: parse-options.h:144 parse-options.h:146 parse-options.h:268 msgid "n" msgstr "" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:679 msgid "use as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "" @@ -5087,21 +5100,23 @@ msgid "show only matched refs" msgstr "" -#: 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 +#: builtin/am.c:2221 builtin/branch.c:637 builtin/for-each-ref.c:38 +#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 +#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:415 msgid "key" msgstr "" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 +#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:416 msgid "field name to sort on" msgstr "" @@ -5109,43 +5124,43 @@ msgid "git fsck [options] [...]" msgstr "" -#: builtin/fsck.c:666 +#: builtin/fsck.c:699 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:700 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:668 +#: builtin/fsck.c:701 msgid "report tags" msgstr "" -#: builtin/fsck.c:669 +#: builtin/fsck.c:702 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:670 +#: builtin/fsck.c:703 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:671 +#: builtin/fsck.c:704 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:672 +#: builtin/fsck.c:705 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:674 +#: builtin/fsck.c:707 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:676 +#: builtin/fsck.c:709 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:677 builtin/prune.c:108 +#: builtin/fsck.c:710 builtin/prune.c:110 msgid "show progress" msgstr "" @@ -5153,7 +5168,7 @@ msgid "git gc [options]" msgstr "" -#: config.c:2101 +#: config.c:2207 #, c-format msgid "Invalid %s: '%s'" msgstr "" @@ -5163,19 +5178,19 @@ msgid "insanely long object directory %.*s" msgstr "" -#: builtin/gc.c:360 +#: builtin/gc.c:519 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:362 +#: builtin/gc.c:521 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:363 +#: builtin/gc.c:522 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:366 +#: builtin/gc.c:525 msgid "force running gc even if there may be another gc running" msgstr "" @@ -5186,13 +5201,13 @@ "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" -#: builtin/gc.c:440 +#: builtin/gc.c:619 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" -#: builtin/gc.c:487 +#: builtin/gc.c:670 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5201,7 +5216,7 @@ msgid "git grep [options] [-e] [...] [[--] ...]" msgstr "" -#: builtin/grep.c:225 +#: builtin/grep.c:224 #, c-format msgid "grep: failed to create thread: %s" msgstr "" @@ -5211,35 +5226,35 @@ msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 +#: builtin/grep.c:458 builtin/grep.c:579 builtin/grep.c:620 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:637 +#: builtin/grep.c:635 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:701 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: sequencer.c:2198 builtin/grep.c:720 +#: sequencer.c:2585 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:790 +#: builtin/grep.c:800 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:792 +#: builtin/grep.c:802 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:804 msgid "search in both tracked and untracked files" msgstr "" @@ -5247,155 +5262,155 @@ msgid "search also in ignored files" msgstr "" -#: builtin/grep.c:801 +#: builtin/grep.c:811 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:822 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:814 +#: builtin/grep.c:826 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:830 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:833 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:836 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:839 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:842 msgid "show line numbers" msgstr "" -#: builtin/grep.c:831 +#: builtin/grep.c:844 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:845 msgid "show filenames" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:847 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:849 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:838 +#: builtin/grep.c:851 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:854 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:856 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:861 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:862 msgid "highlight matches" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:864 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:866 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:869 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:872 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:874 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:877 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:865 +#: builtin/grep.c:880 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:882 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:870 +#: builtin/grep.c:885 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:887 msgid "match " msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:889 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:886 +#: builtin/grep.c:901 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:903 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:905 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:909 msgid "pager" msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:909 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:913 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" @@ -5407,7 +5422,7 @@ msgid "no pattern given." msgstr "" -#: builtin/grep.c:1065 +#: builtin/grep.c:1080 msgid "--open-files-in-pager only works on the worktree" msgstr "" @@ -5437,47 +5452,47 @@ msgid "git hash-object --stdin-paths < " msgstr "" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "type" msgstr "" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "object type" msgstr "" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:46 msgid "print all available commands" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:51 msgid "show man page" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:54 msgid "show info page" msgstr "" @@ -5485,20 +5500,20 @@ msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "" -#: builtin/help.c:67 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:94 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:107 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:115 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" @@ -5508,34 +5523,34 @@ msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:340 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:357 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:365 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:407 +#: command-list.h:193 msgid "Defining attributes per path" msgstr "" @@ -5543,15 +5558,15 @@ msgid "A Git glossary" msgstr "" -#: builtin/help.c:410 +#: command-list.h:201 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: builtin/help.c:411 +#: command-list.h:202 msgid "Defining submodule properties" msgstr "" -#: builtin/help.c:412 +#: command-list.h:205 msgid "Specifying revisions and ranges for Git" msgstr "" @@ -5559,7 +5574,7 @@ msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: builtin/help.c:414 +#: command-list.h:208 msgid "An overview of recommended workflows with Git" msgstr "" @@ -5567,7 +5582,7 @@ msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:466 builtin/help.c:483 +#: builtin/help.c:473 builtin/help.c:503 #, c-format msgid "usage: %s%s" msgstr "" @@ -5577,7 +5592,7 @@ msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" msgstr "" @@ -5586,44 +5601,44 @@ msgid "object of unexpected type" msgstr "" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:249 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:259 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:260 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:272 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:279 builtin/pack-objects.c:598 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:320 +#: builtin/index-pack.c:297 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:303 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:317 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:319 #, c-format msgid "pack version % unsupported" msgstr "" @@ -5633,25 +5648,25 @@ msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:481 +#: builtin/index-pack.c:457 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:506 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:514 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:522 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:553 msgid "cannot pread pack file" msgstr "" @@ -5662,33 +5677,33 @@ msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:605 +#: builtin/index-pack.c:581 msgid "serious inflate inconsistency" msgstr "" -#: 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 +#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 +#: builtin/index-pack.c:794 builtin/index-pack.c:803 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:753 builtin/pack-objects.c:182 -#: builtin/pack-objects.c:276 +#: builtin/index-pack.c:729 builtin/pack-objects.c:151 +#: builtin/pack-objects.c:211 builtin/pack-objects.c:305 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:800 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:814 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:833 #, c-format msgid "invalid %s" msgstr "" @@ -5697,49 +5712,49 @@ msgid "Error in object" msgstr "" -#: builtin/index-pack.c:858 +#: builtin/index-pack.c:838 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:930 builtin/index-pack.c:961 +#: builtin/index-pack.c:910 builtin/index-pack.c:941 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1109 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1109 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1143 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1148 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1151 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1163 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1186 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1196 builtin/pack-objects.c:2492 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1237 msgid "confusion beyond insanity" msgstr "" @@ -5748,29 +5763,29 @@ msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1255 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1259 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1283 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1360 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1431 msgid "error while closing pack file" msgstr "" @@ -5784,20 +5799,20 @@ msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1445 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1453 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1513 +#: builtin/index-pack.c:1497 builtin/pack-objects.c:2727 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/grep.c:1036 builtin/index-pack.c:1519 +#: builtin/grep.c:1057 builtin/index-pack.c:1503 builtin/pack-objects.c:2716 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" @@ -5806,59 +5821,60 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 +#: builtin/grep.c:286 builtin/index-pack.c:1506 builtin/index-pack.c:1697 +#: builtin/pack-objects.c:2719 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1565 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1583 +#: builtin/index-pack.c:1567 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1615 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1638 +#: builtin/index-pack.c:1622 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1675 +#: builtin/index-pack.c:1659 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 -#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 +#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 +#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1747 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1374 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1771 +#: builtin/index-pack.c:1755 msgid "--verify with no packfile name given" msgstr "" -#: path.c:891 +#: path.c:894 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -5868,7 +5884,7 @@ msgid "insanely long template name %s" msgstr "" -#: builtin/init-db.c:55 +#: builtin/gc.c:461 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" @@ -5883,7 +5899,7 @@ msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "" @@ -5893,17 +5909,17 @@ msgid "insanely long symlink %s" msgstr "" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "" @@ -5928,17 +5944,17 @@ msgid "insane git directory %s" msgstr "" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -5973,30 +5989,30 @@ "shared[=]] [directory]" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:483 msgid "permissions" msgstr "" -#: builtin/init-db.c:482 +#: builtin/init-db.c:484 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:182 +#: builtin/am.c:2177 builtin/init-db.c:486 builtin/prune-packed.c:58 +#: builtin/repack.c:306 msgid "be quiet" msgstr "" -#: builtin/init-db.c:516 builtin/init-db.c:521 +#: builtin/init-db.c:518 builtin/init-db.c:523 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:525 +#: builtin/init-db.c:527 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:546 +#: builtin/init-db.c:548 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -6007,7 +6023,7 @@ msgid "Cannot access current working directory" msgstr "" -#: builtin/init-db.c:574 +#: builtin/init-db.c:576 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6020,63 +6036,63 @@ msgid " or: git show [options] ..." msgstr "" -#: builtin/log.c:153 +#: builtin/log.c:162 msgid "suppress diff output" msgstr "" -#: builtin/log.c:154 +#: builtin/log.c:163 msgid "show source" msgstr "" -#: builtin/log.c:155 +#: builtin/log.c:164 msgid "Use mail map file" msgstr "" -#: builtin/log.c:160 +#: builtin/log.c:169 msgid "decorate options" msgstr "" -#: builtin/log.c:259 +#: builtin/log.c:270 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:537 builtin/log.c:631 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:643 +#: builtin/log.c:655 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:764 +#: builtin/log.c:776 msgid "format.headers without value" msgstr "" -#: builtin/log.c:865 +#: builtin/log.c:877 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:881 +#: builtin/log.c:893 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:898 +#: builtin/log.c:910 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:920 msgid "Not a range." msgstr "" -#: builtin/log.c:1014 +#: builtin/log.c:1043 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1095 +#: builtin/log.c:1119 #, c-format msgid "insane in-reply-to: %s" msgstr "" @@ -6085,139 +6101,139 @@ msgid "git format-patch [options] [ | ]" msgstr "" -#: builtin/log.c:1172 +#: builtin/log.c:1204 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1441 +#: builtin/log.c:1515 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1444 +#: builtin/log.c:1518 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1522 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1524 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1452 +#: builtin/log.c:1526 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1527 msgid "sfx" msgstr "" -#: builtin/log.c:1454 +#: builtin/log.c:1528 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1530 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1458 +#: builtin/log.c:1532 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1537 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1466 +#: builtin/log.c:1540 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1469 +#: builtin/log.c:1543 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1546 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1476 +#: builtin/log.c:1550 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1552 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1480 +#: builtin/log.c:1554 msgid "Messaging" msgstr "" -#: builtin/log.c:1481 +#: builtin/log.c:1555 msgid "header" msgstr "" -#: builtin/log.c:1482 +#: builtin/log.c:1556 msgid "add email header" msgstr "" -#: builtin/log.c:1483 builtin/log.c:1485 +#: builtin/log.c:1557 builtin/log.c:1559 msgid "email" msgstr "" -#: builtin/log.c:1483 +#: builtin/log.c:1557 msgid "add To: header" msgstr "" -#: builtin/log.c:1485 +#: builtin/log.c:1559 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1487 +#: builtin/log.c:1561 msgid "ident" msgstr "" -#: builtin/log.c:1488 +#: builtin/log.c:1562 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1490 +#: builtin/log.c:1564 msgid "message-id" msgstr "" -#: builtin/log.c:1491 +#: builtin/log.c:1565 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1492 builtin/log.c:1495 +#: builtin/log.c:1566 builtin/log.c:1569 msgid "boundary" msgstr "" -#: builtin/log.c:1493 +#: builtin/log.c:1567 msgid "attach the patch" msgstr "" -#: builtin/log.c:1496 +#: builtin/log.c:1570 msgid "inline the patch" msgstr "" -#: builtin/log.c:1500 +#: builtin/log.c:1574 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1502 +#: builtin/log.c:1576 msgid "signature" msgstr "" -#: builtin/log.c:1503 +#: builtin/log.c:1577 msgid "add a signature" msgstr "" -#: builtin/log.c:1508 +#: builtin/log.c:1582 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1585 +#: builtin/log.c:1666 #, c-format msgid "invalid ident line: %s" msgstr "" @@ -6230,42 +6246,42 @@ msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1610 +#: builtin/log.c:1691 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1612 +#: builtin/log.c:1693 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1614 +#: builtin/log.c:1695 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1646 +#: builtin/log.c:1727 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1648 +#: builtin/log.c:1729 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1931 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1867 +#: builtin/log.c:1989 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:1921 +#: builtin/log.c:2043 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 #, c-format msgid "Unknown commit %s" msgstr "" @@ -6274,39 +6290,39 @@ msgid "git ls-files [options] [...]" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:525 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:527 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:531 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:533 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:535 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:537 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:539 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:542 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:544 msgid "show files on the filesystem that need to be removed" msgstr "" @@ -6314,87 +6330,87 @@ msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:550 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:553 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:555 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:557 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:560 msgid "exclude patterns are read from " msgstr "" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:563 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:565 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:569 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:574 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:575 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:576 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:578 msgid "show debugging data" msgstr "" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [] [...]" msgstr "" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -6406,62 +6422,62 @@ msgid "git merge [options] HEAD " msgstr "" -#: builtin/merge.c:50 +#: builtin/merge.c:53 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:108 +#: builtin/merge.c:111 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:145 +#: builtin/merge.c:177 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:146 +#: builtin/merge.c:178 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:151 +#: builtin/merge.c:183 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:201 builtin/pull.c:137 +#: builtin/merge.c:234 builtin/pull.c:143 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:237 builtin/pull.c:146 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:205 builtin/pull.c:143 +#: builtin/merge.c:238 builtin/pull.c:149 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:207 builtin/pull.c:146 +#: builtin/merge.c:240 builtin/pull.c:152 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:243 builtin/pull.c:158 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:212 builtin/pull.c:155 +#: builtin/merge.c:245 builtin/pull.c:161 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:214 builtin/pull.c:158 +#: builtin/merge.c:247 builtin/pull.c:164 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:215 +#: builtin/merge.c:248 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:164 +#: builtin/merge.c:250 builtin/pull.c:170 msgid "abort if fast-forward is not possible" msgstr "" @@ -6469,53 +6485,53 @@ msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 -#: builtin/revert.c:109 +#: builtin/merge.c:255 builtin/notes.c:784 builtin/pull.c:177 +#: builtin/rebase.c:916 builtin/rebase--interactive.c:186 builtin/revert.c:110 msgid "strategy" msgstr "" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:256 builtin/pull.c:178 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:224 builtin/pull.c:175 +#: builtin/merge.c:257 builtin/pull.c:181 msgid "option=value" msgstr "" -#: builtin/merge.c:225 builtin/pull.c:176 +#: builtin/merge.c:258 builtin/pull.c:182 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:227 +#: builtin/merge.c:260 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:231 +#: builtin/merge.c:267 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:266 +#: builtin/merge.c:302 msgid "could not run stash." msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:307 msgid "stash failed" msgstr "" -#: builtin/merge.c:276 +#: builtin/merge.c:312 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:298 builtin/merge.c:315 +#: builtin/merge.c:334 builtin/merge.c:351 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:345 +#: builtin/merge.c:381 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:356 +#: builtin/merge.c:392 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" @@ -6528,50 +6544,50 @@ msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:406 +#: builtin/merge.c:442 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:456 +#: builtin/merge.c:493 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:546 +#: builtin/merge.c:580 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:668 +#: builtin/merge.c:701 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:682 +#: builtin/merge.c:715 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:697 +#: builtin/merge.c:730 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:749 +#: builtin/merge.c:782 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:758 +#: builtin/merge.c:791 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:764 +#: builtin/merge.c:797 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -6581,16 +6597,16 @@ "the commit.\n" msgstr "" -#: builtin/merge.c:800 +#: builtin/merge.c:833 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:820 +#: builtin/merge.c:852 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:873 +#: builtin/merge.c:905 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" @@ -6600,24 +6616,24 @@ msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:912 +#: builtin/merge.c:944 msgid "No current branch." msgstr "" -#: builtin/merge.c:914 +#: builtin/merge.c:946 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:916 +#: builtin/merge.c:948 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:921 +#: builtin/merge.c:953 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1216 +#: builtin/merge.c:1254 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" @@ -6627,7 +6643,7 @@ "Please, commit your changes before you can merge." msgstr "" -#: advice.c:121 builtin/merge.c:1251 +#: advice.c:183 builtin/merge.c:1289 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -6637,100 +6653,100 @@ "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1258 +#: builtin/merge.c:1296 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1305 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1275 +#: builtin/merge.c:1313 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1301 +#: builtin/merge.c:1339 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1292 +#: builtin/merge.c:1330 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1294 +#: builtin/merge.c:1332 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1299 +#: builtin/merge.c:1337 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1335 +#: commit.c:1115 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1338 +#: commit.c:1118 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1341 +#: commit.c:1121 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1344 +#: commit.c:1124 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1422 +#: builtin/merge.c:1440 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1463 +#: builtin/merge.c:1482 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1470 +#: builtin/merge.c:1489 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1501 +#: builtin/merge.c:1520 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1543 builtin/merge.c:1622 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1528 +#: builtin/merge.c:1547 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1594 +#: builtin/merge.c:1613 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1596 +#: builtin/merge.c:1615 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1624 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1617 +#: builtin/merge.c:1636 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6743,35 +6759,35 @@ msgid "git merge-base [-a|--all] --octopus ..." msgstr "" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:34 msgid "git merge-base --independent ..." msgstr "" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:35 msgid "git merge-base --is-ancestor " msgstr "" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:36 msgid "git merge-base --fork-point []" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:153 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:155 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:157 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:159 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:161 msgid "find where forked from reflog of " msgstr "" @@ -6781,31 +6797,31 @@ "file2" msgstr "" -#: builtin/merge-file.c:33 +#: builtin/merge-file.c:35 msgid "send results to standard output" msgstr "" -#: builtin/merge-file.c:34 +#: builtin/merge-file.c:36 msgid "use a diff3 based merge" msgstr "" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c:37 msgid "for conflicts, use our version" msgstr "" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c:39 msgid "for conflicts, use their version" msgstr "" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:41 msgid "for conflicts, use a union version" msgstr "" -#: builtin/merge-file.c:42 +#: builtin/merge-file.c:44 msgid "for conflicts, use this marker size" msgstr "" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c:45 msgid "do not warn about conflicts" msgstr "" @@ -6813,19 +6829,19 @@ msgid "set labels for file1/orig_file/file2" msgstr "" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "" @@ -6833,11 +6849,11 @@ msgid "git mv [options] ... " msgstr "" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:127 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "" @@ -6911,7 +6927,7 @@ msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 +#: builtin/mv.c:276 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -6928,31 +6944,31 @@ msgid "git name-rev [options] --stdin" msgstr "" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching " msgstr "" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "" @@ -6989,11 +7005,11 @@ "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "" @@ -7009,31 +7025,31 @@ msgid "git notes [--ref ] get-ref" msgstr "" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list []]" msgstr "" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [] []" msgstr "" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [] " msgstr "" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [ ]..." msgstr "" -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [] []" msgstr "" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit []" msgstr "" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show []" msgstr "" @@ -7041,41 +7057,41 @@ msgid "git notes merge [] " msgstr "" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit []" msgstr "" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort []" msgstr "" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove []" msgstr "" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune []" msgstr "" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "" @@ -7084,12 +7100,12 @@ msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:474 builtin/notes.c:634 builtin/notes.c:899 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "" @@ -7098,17 +7114,17 @@ msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:506 +#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:236 builtin/tag.c:509 +#: builtin/notes.c:242 builtin/tag.c:513 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 +#: builtin/log.c:1321 builtin/notes.c:894 builtin/tag.c:526 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -7118,19 +7134,19 @@ msgid "Failed to read object '%s'." msgstr "" -#: builtin/am.c:539 +#: builtin/am.c:488 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:576 +#: builtin/am.c:525 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:507 +#: builtin/notes.c:519 builtin/notes.c:595 builtin/notes.c:662 +#: builtin/notes.c:812 builtin/notes.c:959 builtin/notes.c:980 msgid "too many parameters" msgstr "" @@ -7139,57 +7155,57 @@ msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:410 builtin/notes.c:573 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:413 builtin/notes.c:576 msgid "note contents in a file" msgstr "" -#: 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 +#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 +#: builtin/notes.c:418 builtin/notes.c:578 builtin/notes.c:581 +#: builtin/tag.c:418 msgid "object" msgstr "" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:416 builtin/notes.c:579 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:419 builtin/notes.c:582 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:423 builtin/notes.c:494 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:441 +#: builtin/notes.c:448 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:463 builtin/notes.c:542 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:488 +#: builtin/notes.c:495 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:490 +#: builtin/notes.c:497 msgid "load rewriting config for (implies --stdin)" msgstr "" -#: builtin/notes.c:508 +#: builtin/notes.c:515 msgid "too few parameters" msgstr "" -#: builtin/notes.c:529 +#: builtin/notes.c:536 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7201,53 +7217,53 @@ msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:593 +#: builtin/notes.c:600 #, 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:774 +#: builtin/notes.c:781 msgid "General options" msgstr "" -#: builtin/notes.c:776 +#: builtin/notes.c:783 msgid "Merge options" msgstr "" -#: builtin/notes.c:778 +#: builtin/notes.c:785 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "" -#: builtin/notes.c:780 +#: builtin/notes.c:787 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:782 +#: builtin/notes.c:789 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:784 +#: builtin/notes.c:791 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:786 +#: builtin/notes.c:793 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:890 +#: builtin/notes.c:897 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:902 +#: builtin/notes.c:909 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:905 +#: builtin/notes.c:912 msgid "read object names from the standard input" msgstr "" @@ -7259,7 +7275,7 @@ msgid "use notes from " msgstr "" -#: builtin/remote.c:1629 +#: builtin/remote.c:1641 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -7272,17 +7288,17 @@ msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "" -#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:3203 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3207 #, c-format msgid "bad index version '%s'" msgstr "" @@ -7297,19 +7313,19 @@ msgid "unable to parse value '%s' for option %s" msgstr "" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3237 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3239 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3241 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2969 +#: builtin/pack-objects.c:3244 msgid "similar to --all-progress when progress meter is shown" msgstr "" @@ -7317,104 +7333,103 @@ msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2971 +#: builtin/pack-objects.c:3246 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2974 +#: builtin/pack-objects.c:3249 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3251 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3253 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2980 +#: builtin/pack-objects.c:3255 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2982 +#: builtin/pack-objects.c:3257 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3259 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3261 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3263 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3265 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3267 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2994 +#: builtin/pack-objects.c:3269 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2996 +#: builtin/pack-objects.c:3271 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2998 +#: builtin/pack-objects.c:3273 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3276 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3279 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3285 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3012 +#: builtin/pack-objects.c:3287 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3289 msgid "keep unreachable objects" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 -#: parse-options.h:154 +#: builtin/clone.c:125 builtin/fetch.c:144 builtin/pack-objects.c:3292 msgid "time" msgstr "" -#: builtin/pack-objects.c:3018 +#: builtin/pack-objects.c:3293 msgid "unpack unreachable objects newer than