Binary files /tmp/tmpg7emgqcv/KR646jSZye/language-pack-hr-base-20.04+20210802/data/extra.tar and /tmp/tmpg7emgqcv/tsc5mtvY54/language-pack-hr-base-20.04+20220211/data/extra.tar differ diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/aa-enabled.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/aa-enabled.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/aa-enabled.po 2021-08-03 09:03:57.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/aa-enabled.po 2022-02-11 23:13:51.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: 2021-08-02 18:52+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../aa_enabled.c:26 #, c-format @@ -27,7 +27,7 @@ msgstr "" "%s: [mogućnosti]\n" " options:\n" -" -q | --quiet Ne prikazuje bilo kakve poruke\n" +" -q | --quiet Ne prikazuj poruke\n" " -h | --help Prikaži pomoć\n" #: ../aa_enabled.c:45 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/adduser.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/adduser.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/adduser.po 2021-08-03 09:03:50.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/adduser.po 2022-02-11 23:13:44.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: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:48+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #. everyone can issue "--help" and "--version", but only root can go on #: ../adduser:154 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/alsa-utils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/alsa-utils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/alsa-utils.po 2021-08-03 09:03:54.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/alsa-utils.po 2022-02-11 23:13:48.000000000 +0000 @@ -14,26 +14,26 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:48+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: alsamixer/card_select.c:126 alsamixer/device_name.c:126 +#: alsamixer/card_select.c:77 alsamixer/device_name.c:127 msgid "Sound Card" msgstr "Zvučna kartica" -#: alsamixer/card_select.c:181 +#: alsamixer/card_select.c:115 msgid "(default)" msgstr "(zadano)" -#: alsamixer/card_select.c:191 +#: alsamixer/card_select.c:125 msgid "cannot enumerate sound cards" msgstr "nemguće izbrajanje zvučnih kartica" -#: alsamixer/card_select.c:215 +#: alsamixer/card_select.c:151 msgid "enter device name..." msgstr "upišite naziv uređaja..." -#: alsamixer/cli.c:40 +#: alsamixer/cli.c:43 msgid "Usage: alsamixer [options]" msgstr "Upotreba: alsamixer [mogućnosti]" @@ -52,7 +52,7 @@ " -V, --view=NAČIN način prikaza pokretanja: " "reprodukcija/snimanje/sve" -#: alsamixer/cli.c:46 +#: alsamixer/cli.c:53 msgid "" "Debugging options:\n" " -g, --no-color toggle using of colors\n" @@ -62,22 +62,22 @@ " -g, --no-color mogućnost korištenja boja\n" " -a, --abstraction=NAZIV apstraktna razina miksera: nijedna/osnovna" -#: alsamixer/cli.c:77 +#: alsamixer/cli.c:88 #, c-format msgid "invalid card index: %s\n" msgstr "neispravni sadržaj kartice: %s\n" -#: alsamixer/cli.c:103 +#: alsamixer/cli.c:130 #, c-format msgid "unknown abstraction level: %s\n" msgstr "nepoznata apstraktna razina: %s\n" -#: alsamixer/cli.c:108 +#: alsamixer/cli.c:135 #, c-format msgid "unknown option: %c\n" msgstr "nepoznata mogućnost: %c\n" -#: alsamixer/cli.c:110 +#: alsamixer/cli.c:137 msgid "try `alsamixer --help' for more information\n" msgstr "pokušajte `alsamixer --help' za više informacija\n" @@ -90,138 +90,138 @@ msgid "%s: %s\n" msgstr "%s: %s\n" -#: alsamixer/mixer_display.c:98 +#: alsamixer/mixer_display.c:99 msgid "Card:" msgstr "Kartica:" -#: alsamixer/mixer_display.c:99 +#: alsamixer/mixer_display.c:100 msgid "Chip:" msgstr "Čip:" -#: alsamixer/mixer_display.c:100 +#: alsamixer/mixer_display.c:101 msgid "View:" msgstr "Pogled:" -#: alsamixer/mixer_display.c:101 +#: alsamixer/mixer_display.c:102 msgid "Item:" msgstr "Stavka:" -#: alsamixer/mixer_display.c:104 +#: alsamixer/mixer_display.c:105 msgid "F1: Help" msgstr "F1: Pomoć" -#: alsamixer/mixer_display.c:105 +#: alsamixer/mixer_display.c:106 msgid "F2: System information" msgstr "F2: Informacije sustava" -#: alsamixer/mixer_display.c:106 +#: alsamixer/mixer_display.c:107 msgid "F6: Select sound card" msgstr "F6: Odaberi zvučnu karticu" -#: alsamixer/mixer_display.c:107 +#: alsamixer/mixer_display.c:108 msgid "Esc: Exit" msgstr "Esc: Izlaz" -#: alsamixer/mixer_display.c:174 +#: alsamixer/mixer_display.c:179 msgid "(unplugged)" msgstr "(iskopčano)" -#: alsamixer/mixer_display.c:192 +#: alsamixer/mixer_display.c:197 msgid "Playback" msgstr "Reprodukcija" -#: alsamixer/mixer_display.c:193 +#: alsamixer/mixer_display.c:198 msgid "Capture" msgstr "Snimi" -#: alsamixer/mixer_display.c:194 +#: alsamixer/mixer_display.c:199 msgid "All" msgstr "Sve" -#: alsamixer/mixer_display.c:234 +#: alsamixer/mixer_display.c:240 msgid "mute" msgstr "utišaj" -#: alsamixer/mixer_display.c:275 alsamixer/mixer_display.c:285 +#: alsamixer/mixer_display.c:281 alsamixer/mixer_display.c:291 msgid "dB gain:" msgstr "dB pojačanja:" -#: alsamixer/mixer_display.c:285 +#: alsamixer/mixer_display.c:291 #, c-format msgid " [%s %s, %s]" msgstr " [%s %s, %s]" -#: alsamixer/mixer_display.c:294 alsamixer/mixer_display.c:300 -#: alsamixer/mixer_display.c:306 alsamixer/mixer_display.c:312 +#: alsamixer/mixer_display.c:300 alsamixer/mixer_display.c:306 +#: alsamixer/mixer_display.c:312 alsamixer/mixer_display.c:318 msgid "Off" msgstr "Isključeno" -#: alsamixer/mixer_display.c:300 alsamixer/mixer_display.c:312 +#: alsamixer/mixer_display.c:306 alsamixer/mixer_display.c:318 msgid "On" msgstr "Uključeno" -#: alsamixer/mixer_display.c:363 +#: alsamixer/mixer_display.c:370 msgid "The sound device was unplugged." msgstr "Zvučni uređaj je odspojen." -#: alsamixer/mixer_display.c:364 +#: alsamixer/mixer_display.c:371 msgid "Press F6 to select another sound card." msgstr "Pritisnite F6 za odabir drugog zvučnog uređaja." -#: alsamixer/mixer_display.c:379 +#: alsamixer/mixer_display.c:386 msgid "This sound device does not have any playback controls." msgstr "Zvučni uređaj nema nikakvih kontrola reprodukcije." -#: alsamixer/mixer_display.c:381 +#: alsamixer/mixer_display.c:388 msgid "This sound device does not have any capture controls." msgstr "Zvučni uređaj nema nikakvih kontrola snimanja." -#: alsamixer/mixer_display.c:383 +#: alsamixer/mixer_display.c:390 msgid "This sound device does not have any controls." msgstr "Zvučni uređaj nema nikakvih kontrola." #. TRANSLATORS: playback on; one character -#: alsamixer/mixer_display.c:516 alsamixer/mixer_display.c:521 +#: alsamixer/mixer_display.c:523 alsamixer/mixer_display.c:528 msgid "O" msgstr "U" #. TRANSLATORS: playback muted; one character -#: alsamixer/mixer_display.c:518 alsamixer/mixer_display.c:522 +#: alsamixer/mixer_display.c:525 alsamixer/mixer_display.c:529 msgid "M" msgstr "U" #. TRANSLATORS: "left"; no more than two characters -#: alsamixer/mixer_display.c:536 +#: alsamixer/mixer_display.c:545 msgid "L" msgstr "L" #. TRANSLATORS: "right"; no more than two characters -#: alsamixer/mixer_display.c:540 +#: alsamixer/mixer_display.c:551 msgid "R" msgstr "D" #. TRANSLATORS: no more than eight characters -#: alsamixer/mixer_display.c:542 +#: alsamixer/mixer_display.c:555 msgid "CAPTURE" msgstr "SNIMAJ" -#: alsamixer/mixer_display.c:592 +#: alsamixer/mixer_display.c:611 msgid "Front" msgstr "Sprijeda" -#: alsamixer/mixer_display.c:595 +#: alsamixer/mixer_display.c:614 msgid "Rear" msgstr "Straga" -#: alsamixer/mixer_display.c:598 speaker-test/speaker-test.c:124 +#: alsamixer/mixer_display.c:617 speaker-test/speaker-test.c:124 msgid "Center" msgstr "Sredina" -#: alsamixer/mixer_display.c:601 +#: alsamixer/mixer_display.c:620 msgid "Woofer" msgstr "Dubokotonac" -#: alsamixer/mixer_display.c:604 +#: alsamixer/mixer_display.c:623 msgid "Side" msgstr "Bočni" @@ -353,11 +353,11 @@ msgid "Help" msgstr "Pomoć" -#: alsamixer/proc_files.c:103 +#: alsamixer/proc_files.c:56 msgid "Select File" msgstr "Odaberi datoteku" -#: alsamixer/textbox.c:52 alsamixer/textbox.c:66 +#: alsamixer/textbox.c:51 alsamixer/textbox.c:65 msgid "Error" msgstr "Greška" @@ -484,7 +484,7 @@ " --dump-hw-params ispiši hardverske parametre uređaja\n" " --fatal-errors tretiraj sve datoteke kao kobne\n" -#: aplay/aplay.c:250 speaker-test/speaker-test.c:945 +#: aplay/aplay.c:250 speaker-test/speaker-test.c:961 #, c-format msgid "Recognized sample formats are:" msgstr "Prepoznati uzorci formata su:" @@ -566,131 +566,131 @@ msgid "value %i for channels is invalid" msgstr "vrijednost %i za kanal je neispravna" -#: aplay/aplay.c:629 +#: aplay/aplay.c:630 #, c-format msgid "wrong extended format '%s'" msgstr "neispravan prošireni format '%s'" -#: aplay/aplay.c:637 +#: aplay/aplay.c:638 #, c-format msgid "invalid rate argument '%s'" msgstr "neispravan argument frekvencije '%s'" -#: aplay/aplay.c:644 +#: aplay/aplay.c:645 #, c-format msgid "bad speed value %i" msgstr "loša vrijednost brzine %i" -#: aplay/aplay.c:650 +#: aplay/aplay.c:651 msgid "duration and samples arguments cannot be used together" msgstr "trajanje i argumenti uzorka ne mogu se koristiti zajedno" -#: aplay/aplay.c:655 +#: aplay/aplay.c:656 #, c-format msgid "invalid duration argument '%s'" msgstr "neispravan argument trajanja '%s'" -#: aplay/aplay.c:662 +#: aplay/aplay.c:663 msgid "samples and duration arguments cannot be used together" msgstr "uzorak i argumenti trajanja ne mogu se koristiti zajedno" -#: aplay/aplay.c:667 +#: aplay/aplay.c:668 #, c-format msgid "invalid samples argument '%s'" msgstr "neispravni argumenti uzorka '%s'" -#: aplay/aplay.c:679 +#: aplay/aplay.c:680 #, c-format msgid "invalid period time argument '%s'" msgstr "neispravan argument vremenskog razdoblja '%s'" -#: aplay/aplay.c:686 +#: aplay/aplay.c:687 #, c-format msgid "invalid buffer time argument '%s'" msgstr "neispravan argument vremena međuspremnika '%s'" -#: aplay/aplay.c:693 +#: aplay/aplay.c:694 #, c-format msgid "invalid period size argument '%s'" msgstr "neispravan argument razdoblja '%s'" -#: aplay/aplay.c:700 +#: aplay/aplay.c:701 #, c-format msgid "invalid buffer size argument '%s'" msgstr "neispravan argument veličine međuspremnika '%s'" -#: aplay/aplay.c:707 +#: aplay/aplay.c:708 #, c-format msgid "invalid min available space argument '%s'" msgstr "neispravan argument najmanje dostupnog prostora '%s'" -#: aplay/aplay.c:714 +#: aplay/aplay.c:715 #, c-format msgid "invalid start delay argument '%s'" msgstr "neispravan argument odgode pokretanja '%s'" -#: aplay/aplay.c:721 +#: aplay/aplay.c:722 #, c-format msgid "invalid stop delay argument '%s'" msgstr "neispravan argument odgode zaustavljanja '%s'" -#: aplay/aplay.c:776 +#: aplay/aplay.c:777 #, c-format msgid "invalid test coef argument '%s'" msgstr "neispravan argument koeficjenta testa '%s'" -#: aplay/aplay.c:788 +#: aplay/aplay.c:789 #, c-format msgid "invalid max file time argument '%s'" msgstr "neispravan argument najvećeg vremena datoteke '%s'" -#: aplay/aplay.c:808 speaker-test/speaker-test.c:571 +#: aplay/aplay.c:809 speaker-test/speaker-test.c:587 #, c-format msgid "Unable to parse channel map string: %s\n" msgstr "Nemoguća obrada niza mape kanala: %s\n" -#: aplay/aplay.c:814 +#: aplay/aplay.c:815 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pokušajte `%s --help' za više informacija.\n" -#: aplay/aplay.c:830 +#: aplay/aplay.c:831 #, c-format msgid "audio open error: %s" msgstr "greška otvaranja zvuka: %s" -#: aplay/aplay.c:835 +#: aplay/aplay.c:836 #, c-format msgid "info error: %s" msgstr "Informacija greške: %s" -#: aplay/aplay.c:842 +#: aplay/aplay.c:843 #, c-format msgid "nonblock setting error: %s" msgstr "greška neblokirajuće postavke: %s" -#: aplay/aplay.c:852 aplay/aplay.c:976 aplay/aplay.c:1266 aplay/aplay.c:1466 -#: aplay/aplay.c:1989 aplay/aplay.c:2019 +#: aplay/aplay.c:861 aplay/aplay.c:985 aplay/aplay.c:1275 aplay/aplay.c:1475 +#: aplay/aplay.c:2055 aplay/aplay.c:2085 msgid "not enough memory" msgstr "nema dovoljno memorije" -#: aplay/aplay.c:876 +#: aplay/aplay.c:885 #, c-format msgid "Cannot create process ID file %s: %s" msgstr "Nemoguće stvaranje datoteke ID-a procesa %s: %s" -#: aplay/aplay.c:966 +#: aplay/aplay.c:975 #, c-format msgid "read error (called from line %i)" msgstr "greška čitanja (pozvana iz redka %i)" -#: aplay/aplay.c:1033 +#: aplay/aplay.c:1042 #, c-format msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)" msgstr "" "nepoznata duljina dijela 'fmt ' (pročitano %u, trebalo bi biti najmanje %u)" -#: aplay/aplay.c:1044 +#: aplay/aplay.c:1053 #, c-format msgid "" "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)" @@ -698,33 +698,33 @@ "nepoznata duljina proširivog 'fmt ' dijela (pročitano %u, trebalo bi biti " "najmanje %u)" -#: aplay/aplay.c:1049 +#: aplay/aplay.c:1058 msgid "wrong format tag in extensible 'fmt ' chunk" msgstr "pogrešan format oznake u proširivom 'fmt ' dijelu" -#: aplay/aplay.c:1056 +#: aplay/aplay.c:1065 #, c-format msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded" msgstr "" "nemoguća reprodukcija formata WAVE datoteke 0x%04x koja nije PCM ili FLOAT " "enkôdirana" -#: aplay/aplay.c:1061 +#: aplay/aplay.c:1070 #, c-format msgid "can't play WAVE-files with %d tracks" msgstr "nemoguća reprodukcija WAVE datoteka s %d zapisa" -#: aplay/aplay.c:1069 aplay/aplay.c:1195 +#: aplay/aplay.c:1078 aplay/aplay.c:1204 #, c-format msgid "Warning: format is changed to U8\n" msgstr "Upozorenje: format je promijenjen u U8\n" -#: aplay/aplay.c:1079 aplay/aplay.c:1092 aplay/aplay.c:1103 +#: aplay/aplay.c:1088 aplay/aplay.c:1101 aplay/aplay.c:1112 #, c-format msgid "Warning: format is changed to %s\n" msgstr "Upozorenje: format je promijenjen u %s\n" -#: aplay/aplay.c:1108 +#: aplay/aplay.c:1117 #, c-format msgid "" " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)" @@ -732,30 +732,30 @@ " nemoguća reprodukcija WAVE datoteka s uzorkom od %d bitova pri širini od %d " "bajtova (%d kanala)" -#: aplay/aplay.c:1131 +#: aplay/aplay.c:1140 #, c-format msgid " can't play WAVE-files with sample %d bits wide" msgstr " nemoguća reprodukcija WAVE datoteka s uzorkom širine %d bitova" -#: aplay/aplay.c:1189 +#: aplay/aplay.c:1198 #, c-format msgid "Warning: format is changed to MU_LAW\n" msgstr "Upozorenje: format je promijenjen u MU_LAW\n" -#: aplay/aplay.c:1201 +#: aplay/aplay.c:1210 #, c-format msgid "Warning: format is changed to S16_BE\n" msgstr "Upozorenje: format je promijenjen u S16_BE\n" -#: aplay/aplay.c:1214 aplay/aplay.c:2304 aplay/aplay.c:2311 aplay/aplay.c:2836 +#: aplay/aplay.c:1223 aplay/aplay.c:2376 aplay/aplay.c:2383 aplay/aplay.c:2912 msgid "read error" msgstr "greška čitanja" -#: aplay/aplay.c:1244 +#: aplay/aplay.c:1253 msgid "Channel numbers don't match between hw_params and channel map" msgstr "Brojevi kanala se ne podudaraju između hw_params i mape kanala" -#: aplay/aplay.c:1253 +#: aplay/aplay.c:1262 #, c-format msgid "Warning: unable to get channel map\n" msgstr "Upozorenje: nemoguće dobivanje mape kanala\n" @@ -765,183 +765,183 @@ msgid "Channel %d doesn't match with hw_parmas" msgstr "Kanal %d se ne podudara s hw_parmas" -#: aplay/aplay.c:1314 +#: aplay/aplay.c:1323 msgid "Broken configuration for this PCM: no configurations available" msgstr "Slomljeno podešavanje za ovaj PCM: nema dostupnog podešavanja" -#: aplay/aplay.c:1318 +#: aplay/aplay.c:1327 #, c-format msgid "HW Params of device \"%s\":\n" msgstr "Hardverski parametri uređaja \"%s\":\n" -#: aplay/aplay.c:1338 +#: aplay/aplay.c:1347 msgid "Access type not available" msgstr "Vrsta pristupa nije dostupna" -#: aplay/aplay.c:1343 +#: aplay/aplay.c:1352 msgid "Sample format non available" msgstr "Format uzorka nije dostupan" -#: aplay/aplay.c:1349 +#: aplay/aplay.c:1358 msgid "Channels count non available" msgstr "Broj kanala nije dostupan" -#: aplay/aplay.c:1364 +#: aplay/aplay.c:1373 #, c-format msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n" msgstr "" "Upozorenje: frekvencija nije točna (zatraženo = %iHz, dobiveno = %iHz)\n" -#: aplay/aplay.c:1370 +#: aplay/aplay.c:1379 #, c-format msgid " please, try the plug plugin %s\n" msgstr " molim, pokušajte priključiti priključak %s\n" -#: aplay/aplay.c:1407 +#: aplay/aplay.c:1416 msgid "Unable to install hw params:" msgstr "Nemoguća instalacija hardverskih parametra:" -#: aplay/aplay.c:1414 +#: aplay/aplay.c:1423 #, c-format msgid "Can't use period equal to buffer size (%lu == %lu)" msgstr "" "Nemoguće korištenje razdoblja jednakog veličini međuspremnika (%lu == %lu)" -#: aplay/aplay.c:1420 +#: aplay/aplay.c:1429 msgid "Unable to get current sw params." msgstr "Nemoguće dobivanje softverskog parametra:" -#: aplay/aplay.c:1449 +#: aplay/aplay.c:1458 msgid "unable to install sw params:" msgstr "Nemoguća instalacija softverskog parametra:" -#: aplay/aplay.c:1484 +#: aplay/aplay.c:1493 #, c-format msgid "snd_pcm_mmap_begin problem: %s" msgstr "snd_pcm_mmap_begin problem: %s" -#: aplay/aplay.c:1513 +#: aplay/aplay.c:1522 #, c-format msgid "stdin O_NONBLOCK flag setup failed\n" msgstr "stdin O_NONBLOCK postavljanje oznake neuspjelo\n" -#: aplay/aplay.c:1537 +#: aplay/aplay.c:1559 #, c-format msgid "\rPAUSE command ignored (no hw support)\n" msgstr "\rNaredba PAUZA zanemarena (nema hardverske podrške)\n" -#: aplay/aplay.c:1545 +#: aplay/aplay.c:1567 #, c-format msgid "pause push error: %s" msgstr "pauza uzrokovala grešku: %s" -#: aplay/aplay.c:1556 +#: aplay/aplay.c:1578 #, c-format msgid "pause release error: %s" msgstr "pauza oslobodila grešku: %s" -#: aplay/aplay.c:1572 +#: aplay/aplay.c:1594 #, c-format msgid "" "\r=== PAUSE === " msgstr "" "\r=== PAUZA === " -#: aplay/aplay.c:1614 +#: aplay/aplay.c:1636 #, c-format msgid "status error: %s" msgstr "greška stanja: %s" -#: aplay/aplay.c:1619 +#: aplay/aplay.c:1641 #, c-format msgid "fatal %s: %s" msgstr "kobno %s: %s" -#: aplay/aplay.c:1620 aplay/aplay.c:1631 aplay/aplay.c:1634 aplay/aplay.c:1642 +#: aplay/aplay.c:1642 aplay/aplay.c:1653 aplay/aplay.c:1656 aplay/aplay.c:1664 msgid "underrun" msgstr "neupotrebljeno" -#: aplay/aplay.c:1620 aplay/aplay.c:1631 aplay/aplay.c:1642 +#: aplay/aplay.c:1642 aplay/aplay.c:1653 aplay/aplay.c:1664 msgid "overrun" msgstr "preopterećeno" -#: aplay/aplay.c:1630 aplay/aplay.c:1641 +#: aplay/aplay.c:1652 aplay/aplay.c:1663 #, c-format msgid "%s!!! (at least %.3f ms long)\n" msgstr "%s!!! (najmanja duljina %.3f ms)\n" -#: aplay/aplay.c:1646 +#: aplay/aplay.c:1668 #, c-format msgid "Status:\n" msgstr "Stanje:\n" -#: aplay/aplay.c:1650 +#: aplay/aplay.c:1672 #, c-format msgid "xrun: prepare error: %s" msgstr "xrun: greška pripremanja: %s" -#: aplay/aplay.c:1656 +#: aplay/aplay.c:1679 #, c-format msgid "Status(DRAINING):\n" msgstr "Stanje(PRAŽNJENJE):\n" -#: aplay/aplay.c:1660 +#: aplay/aplay.c:1683 #, c-format msgid "capture stream format change? attempting recover...\n" msgstr "" "promijenjen format strujanja snimanja? Pokušaj oporavka u tijeku...\n" -#: aplay/aplay.c:1662 +#: aplay/aplay.c:1685 #, c-format msgid "xrun(DRAINING): prepare error: %s" msgstr "xrun(PRAŽNJENJE): pripremanje greške: %s" -#: aplay/aplay.c:1669 +#: aplay/aplay.c:1692 #, c-format msgid "Status(R/W):\n" msgstr "Stanje(Č/P):\n" -#: aplay/aplay.c:1672 +#: aplay/aplay.c:1695 #, c-format msgid "read/write error, state = %s" msgstr "greška čitanja/pisanja, stanje = %s" -#: aplay/aplay.c:1682 +#: aplay/aplay.c:1705 #, c-format msgid "Suspended. Trying resume. " msgstr "Suspendirano. Pokušaj nastavka. " -#: aplay/aplay.c:1688 +#: aplay/aplay.c:1711 #, c-format msgid "Failed. Restarting stream. " msgstr "Neuspješno. Ponovno pokretanje strujanja " -#: aplay/aplay.c:1691 +#: aplay/aplay.c:1714 #, c-format msgid "suspend: prepare error: %s" msgstr "suspendirano: greška pripremanja: %s" -#: aplay/aplay.c:1696 +#: aplay/aplay.c:1719 #, c-format msgid "Done.\n" msgstr "Završeno.\n" -#: aplay/aplay.c:1718 +#: aplay/aplay.c:1741 #, c-format msgid " !clip " msgstr " !isječak " -#: aplay/aplay.c:1865 +#: aplay/aplay.c:1893 #, c-format msgid "Unsupported bit size %d.\n" msgstr "Veličina bita %d nepodržana.\n" -#: aplay/aplay.c:1899 +#: aplay/aplay.c:1929 #, c-format msgid "Max peak (%li samples): 0x%08x " msgstr "Najveći zvučni pritisak (%li uzorka): 0x%08x " -#: aplay/aplay.c:1933 +#: aplay/aplay.c:1970 #, c-format msgid "" "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = " @@ -950,112 +950,112 @@ "Sumnjiv položaj međuspremnika (%li ukupno): dostupno = %li, odgoda = %li, " "međuspremnik = %li\n" -#: aplay/aplay.c:2061 +#: aplay/aplay.c:2127 #, c-format msgid "write error: %s" msgstr "greška pisanja: %s" -#: aplay/aplay.c:2109 +#: aplay/aplay.c:2175 #, c-format msgid "writev error: %s" msgstr "greška zapisivanja događaja: %s" -#: aplay/aplay.c:2153 +#: aplay/aplay.c:2221 #, c-format msgid "read error: %s" msgstr "greška čitanja: %s" -#: aplay/aplay.c:2197 +#: aplay/aplay.c:2268 #, c-format msgid "readv error: %s" msgstr "greška čitanja događaja: %s" -#: aplay/aplay.c:2245 +#: aplay/aplay.c:2317 msgid "can't allocate buffer for silence" msgstr "nemoguće dodijeliti međuspremnik tišine" -#: aplay/aplay.c:2254 aplay/aplay.c:2482 aplay/aplay.c:2487 aplay/aplay.c:2537 -#: aplay/aplay.c:2546 aplay/aplay.c:2553 aplay/aplay.c:2563 aplay/aplay.c:2569 -#: aplay/aplay.c:2641 aplay/aplay.c:2671 aplay/aplay.c:2685 +#: aplay/aplay.c:2326 aplay/aplay.c:2554 aplay/aplay.c:2559 aplay/aplay.c:2611 +#: aplay/aplay.c:2620 aplay/aplay.c:2627 aplay/aplay.c:2637 aplay/aplay.c:2643 +#: aplay/aplay.c:2715 aplay/aplay.c:2745 aplay/aplay.c:2759 msgid "write error" msgstr "greška pisanja" -#: aplay/aplay.c:2267 +#: aplay/aplay.c:2339 #, c-format msgid "voc_pcm_flush - silence error" msgstr "voc_pcm_flush - greška tišine" -#: aplay/aplay.c:2270 +#: aplay/aplay.c:2342 msgid "voc_pcm_flush error" msgstr "voc_pcm_flush greška" -#: aplay/aplay.c:2295 +#: aplay/aplay.c:2367 msgid "malloc error" msgstr "malloc greška" -#: aplay/aplay.c:2299 +#: aplay/aplay.c:2371 #, c-format msgid "Playing Creative Labs Channel file '%s'...\n" msgstr "Reprodukcija Creative Labs Channel datoteke '%s'...\n" -#: aplay/aplay.c:2367 aplay/aplay.c:2462 +#: aplay/aplay.c:2439 aplay/aplay.c:2534 msgid "can't play packed .voc files" msgstr "nemoguća reprodukcija .voc pakirane datoteke" -#: aplay/aplay.c:2422 +#: aplay/aplay.c:2494 #, c-format msgid "can't play loops; %s isn't seekable\n" msgstr "nemoguća reprodukcija ponavljanja: %s nije pretraživ\n" -#: aplay/aplay.c:2471 +#: aplay/aplay.c:2543 #, c-format msgid "unknown blocktype %d. terminate." msgstr "nepoznat vrsta bloka %d. završavam." -#: aplay/aplay.c:2605 +#: aplay/aplay.c:2679 #, c-format msgid "Wave doesn't support %s format..." msgstr "Wave ne podržava %s format..." -#: aplay/aplay.c:2665 +#: aplay/aplay.c:2739 #, c-format msgid "Sparc Audio doesn't support %s format..." msgstr "Sparc zvuk ne podržava %s format..." -#: aplay/aplay.c:2740 +#: aplay/aplay.c:2814 msgid "Playing" msgstr "Reprodukcija" -#: aplay/aplay.c:2740 +#: aplay/aplay.c:2814 msgid "Recording" msgstr "Snimanje" -#: aplay/aplay.c:2744 +#: aplay/aplay.c:2818 #, c-format msgid "Rate %d Hz, " msgstr "Frekvecija %d Hz, " -#: aplay/aplay.c:2746 +#: aplay/aplay.c:2820 #, c-format msgid "Mono" msgstr "Mono" -#: aplay/aplay.c:2748 +#: aplay/aplay.c:2822 #, c-format msgid "Stereo" msgstr "Stereo" -#: aplay/aplay.c:2750 +#: aplay/aplay.c:2824 #, c-format msgid "Channels %i" msgstr "Kanala %i" -#: aplay/aplay.c:3351 +#: aplay/aplay.c:3431 #, c-format msgid "You need to specify %u files" msgstr "Morate odrediti %u datoteke" -#: aplay/aplay.c:3404 +#: aplay/aplay.c:3484 #, c-format msgid "You need to specify %d files" msgstr "Morate odrediti %d datoteka" @@ -1189,7 +1189,7 @@ msgid "invalid sender address %s\n" msgstr "nevaljana adresa pošiljatelja %s\n" -#: seq/aconnect/aconnect.c:370 seq/aseqnet/aseqnet.c:290 +#: seq/aconnect/aconnect.c:370 seq/aseqnet/aseqnet.c:303 #, c-format msgid "invalid destination address %s\n" msgstr "nevaljana adresa odredišta %s\n" @@ -1214,127 +1214,127 @@ msgid "Connection failed (%s)\n" msgstr "Neuspjelo povezivanje (%s)\n" -#: seq/aseqnet/aseqnet.c:164 +#: seq/aseqnet/aseqnet.c:171 #, c-format msgid "aseqnet - network client/server on ALSA sequencer\n" msgstr "aseqnet - mrežni klijent/poslužitelj na ALSA usklađivaču\n" -#: seq/aseqnet/aseqnet.c:165 +#: seq/aseqnet/aseqnet.c:172 #, c-format msgid " Copyright (C) 1999 Takashi Iwai\n" msgstr " Autorsko pravo (C) 1999 Takashi Iwai\n" -#: seq/aseqnet/aseqnet.c:166 +#: seq/aseqnet/aseqnet.c:173 #, c-format msgid "usage:\n" msgstr "upotreba:\n" -#: seq/aseqnet/aseqnet.c:167 +#: seq/aseqnet/aseqnet.c:174 #, c-format msgid " server mode: aseqnet [-options]\n" msgstr " način poslužitelja: aseqnet [-mogućnosti]\n" -#: seq/aseqnet/aseqnet.c:168 +#: seq/aseqnet/aseqnet.c:175 #, c-format msgid " client mode: aseqnet [-options] server_host\n" msgstr " način klijenta: aseqnet [-mogućnosti] server_host\n" -#: seq/aseqnet/aseqnet.c:169 +#: seq/aseqnet/aseqnet.c:176 #, c-format msgid "options:\n" msgstr "mogućnosti:\n" -#: seq/aseqnet/aseqnet.c:170 +#: seq/aseqnet/aseqnet.c:178 #, c-format msgid " -p,--port # : specify TCP port (digit or service name)\n" msgstr " -p,--port # : odredi TCP ulaz (brojka ili naziv usluge)\n" -#: seq/aseqnet/aseqnet.c:171 +#: seq/aseqnet/aseqnet.c:179 #, c-format msgid " -s,--source addr : read from given addr (client:port)\n" msgstr " -s,--source addr : čitaj iz zadane adrese (klijent:ulaz)\n" -#: seq/aseqnet/aseqnet.c:172 +#: seq/aseqnet/aseqnet.c:180 #, c-format msgid " -d,--dest addr : write to given addr (client:port)\n" msgstr " -d,--dest addr : zapiši u zadanu adresu (klijent:ulaz)\n" -#: seq/aseqnet/aseqnet.c:173 +#: seq/aseqnet/aseqnet.c:182 #, c-format msgid " -v, --verbose : print verbose messages\n" msgstr " -v, --verbose : prikazuje opširnije poruke\n" -#: seq/aseqnet/aseqnet.c:174 +#: seq/aseqnet/aseqnet.c:183 #, c-format msgid " -i, --info : print certain received events\n" msgstr " -i, --info : prikazuje određene primljene događaje\n" -#: seq/aseqnet/aseqnet.c:188 +#: seq/aseqnet/aseqnet.c:197 #, c-format msgid "can't malloc\n" msgstr "nemoguće alocirati memoriju\n" -#: seq/aseqnet/aseqnet.c:213 +#: seq/aseqnet/aseqnet.c:222 #, c-format msgid "closing files..\n" msgstr "zatvaranje datoteka...\n" -#: seq/aseqnet/aseqnet.c:272 +#: seq/aseqnet/aseqnet.c:285 #, c-format msgid "sequencer opened: %d:%d\n" msgstr "usklađivač otvoren: %d %d\n" -#: seq/aseqnet/aseqnet.c:279 +#: seq/aseqnet/aseqnet.c:292 #, c-format msgid "invalid source address %s\n" msgstr "neispravna adresa izvora %s\n" -#: seq/aseqnet/aseqnet.c:309 +#: seq/aseqnet/aseqnet.c:319 #, c-format msgid "service '%s' is not found in /etc/services\n" msgstr "usluga '%s' nije pronađena u /etc/services\n" -#: seq/aseqnet/aseqnet.c:377 +#: seq/aseqnet/aseqnet.c:414 #, c-format msgid "too many connections!\n" msgstr "previše povezivanja!\n" -#: seq/aseqnet/aseqnet.c:388 +#: seq/aseqnet/aseqnet.c:425 #, c-format msgid "accepted[%d]\n" msgstr "prihvačeno[%d]\n" -#: seq/aseqnet/aseqnet.c:411 +#: seq/aseqnet/aseqnet.c:447 #, c-format msgid "can't get address %s\n" msgstr "nemoguće dobivanje adrese %s\n" -#: seq/aseqnet/aseqnet.c:422 +#: seq/aseqnet/aseqnet.c:475 #, c-format msgid "ok.. connected\n" msgstr "u redu.. povezano\n" -#: seq/aseqnet/aseqnet.c:518 +#: seq/aseqnet/aseqnet.c:574 #, c-format msgid "Channel %2d: Control event : %5d\n" msgstr "Kanal %2d: Događaj upravljanja : %5d\n" -#: seq/aseqnet/aseqnet.c:522 +#: seq/aseqnet/aseqnet.c:578 #, c-format msgid "Channel %2d: Pitchbender : %5d\n" msgstr "Kanal %2d: Razina zvuka : %5d\n" -#: seq/aseqnet/aseqnet.c:526 +#: seq/aseqnet/aseqnet.c:582 #, c-format msgid "Channel %2d: Note On event : %5d\n" msgstr "Kanal %2d: Napomena uključivanja : %5d\n" -#: seq/aseqnet/aseqnet.c:530 +#: seq/aseqnet/aseqnet.c:586 #, c-format msgid "Channel %2d: Note Off event: %5d\n" msgstr "Kanal %2d: Napomena isključivanja: %5d\n" -#: seq/aseqnet/aseqnet.c:585 +#: seq/aseqnet/aseqnet.c:641 #, c-format msgid "disconnected\n" msgstr "prekinuto povezivanje\n" @@ -1399,207 +1399,207 @@ msgid "Channel 16" msgstr "Kanal 16" -#: speaker-test/speaker-test.c:424 +#: speaker-test/speaker-test.c:440 #, c-format msgid "Broken configuration for playback: no configurations available: %s\n" msgstr "" "Slomljeno podešavanje za reprodukciju: nema dostupnog podešavanja: %s\n" -#: speaker-test/speaker-test.c:431 +#: speaker-test/speaker-test.c:447 #, c-format msgid "Access type not available for playback: %s\n" msgstr "Vrsta pristupa nije dostupna za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:438 +#: speaker-test/speaker-test.c:454 #, c-format msgid "Sample format not available for playback: %s\n" msgstr "Vrsta uzorka nije dostupna za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:445 +#: speaker-test/speaker-test.c:461 #, c-format msgid "Channels count (%i) not available for playbacks: %s\n" msgstr "Broj kanala (%i) nije dostupan za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:453 +#: speaker-test/speaker-test.c:469 #, c-format msgid "Rate %iHz not available for playback: %s\n" msgstr "Frekvencija %iHz nije dostupna za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:458 +#: speaker-test/speaker-test.c:474 #, c-format msgid "Rate doesn't match (requested %iHz, get %iHz, err %d)\n" msgstr "" "Frekvencija se ne podudara (zahtjevana %iHz, dobivena %iHz, greška %d)\n" -#: speaker-test/speaker-test.c:462 +#: speaker-test/speaker-test.c:478 #, c-format msgid "Rate set to %iHz (requested %iHz)\n" msgstr "Postavljanje frekvencije na %iHz (zahtjevano %iHz)\n" -#: speaker-test/speaker-test.c:468 +#: speaker-test/speaker-test.c:484 #, c-format msgid "Buffer size range from %lu to %lu\n" msgstr "Veličina raspona međuspremnika od %lu do %lu\n" -#: speaker-test/speaker-test.c:469 +#: speaker-test/speaker-test.c:485 #, c-format msgid "Period size range from %lu to %lu\n" msgstr "Raspon veličine razdoblja od %lu do %lu\n" -#: speaker-test/speaker-test.c:471 +#: speaker-test/speaker-test.c:487 #, c-format msgid "Requested period time %u us\n" msgstr "Zahtjevano vrijeme razdoblja %u us\n" -#: speaker-test/speaker-test.c:474 +#: speaker-test/speaker-test.c:490 #, c-format msgid "Unable to set period time %u us for playback: %s\n" msgstr "Nemoguće postavljanje vremena razdoblja %u us za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:480 +#: speaker-test/speaker-test.c:496 #, c-format msgid "Requested buffer time %u us\n" msgstr "Zahtjevano vrijeme međuspremnika %u us\n" -#: speaker-test/speaker-test.c:483 +#: speaker-test/speaker-test.c:499 #, c-format msgid "Unable to set buffer time %u us for playback: %s\n" msgstr "" "Nemoguće postavljanje vremena međuspremnika %u us za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:492 +#: speaker-test/speaker-test.c:508 #, c-format msgid "Using max buffer size %lu\n" msgstr "Koristi se najveća veličina međuspremnika %lu\n" -#: speaker-test/speaker-test.c:495 +#: speaker-test/speaker-test.c:511 #, c-format msgid "Unable to set buffer size %lu for playback: %s\n" msgstr "" "Nemoguće postavljanje veličine međuspremnika %lu za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:501 +#: speaker-test/speaker-test.c:517 #, c-format msgid "Periods = %u\n" msgstr "Razdoblja = %u\n" -#: speaker-test/speaker-test.c:504 +#: speaker-test/speaker-test.c:520 #, c-format msgid "Unable to set nperiods %u for playback: %s\n" msgstr "Nemoguće postavljanje broja razdoblja %u za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:513 +#: speaker-test/speaker-test.c:529 #, c-format msgid "Unable to set hw params for playback: %s\n" msgstr "Nemoguće postavljanje hw parametara za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:519 +#: speaker-test/speaker-test.c:535 #, c-format msgid "was set period_size = %lu\n" msgstr "je postavljeno na veličinu_razdoblja = %lu\n" -#: speaker-test/speaker-test.c:520 +#: speaker-test/speaker-test.c:536 #, c-format msgid "was set buffer_size = %lu\n" msgstr "je postavljeno na veličinu_međuspremnika = %lu\n" -#: speaker-test/speaker-test.c:522 +#: speaker-test/speaker-test.c:538 #, c-format msgid "buffer to small, could not use\n" msgstr "međuspremnik je premali, ne može se koristiti\n" -#: speaker-test/speaker-test.c:535 +#: speaker-test/speaker-test.c:551 #, c-format msgid "Unable to determine current swparams for playback: %s\n" msgstr "" "Nemoguče otkrivanje trenutnih softverskih parametara za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:542 +#: speaker-test/speaker-test.c:558 #, c-format msgid "Unable to set start threshold mode for playback: %s\n" msgstr "Nemoguće postavljanje praga za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:549 +#: speaker-test/speaker-test.c:565 #, c-format msgid "Unable to set avail min for playback: %s\n" msgstr "Nemoguće postavljanje najmanje dostupnog za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:556 +#: speaker-test/speaker-test.c:572 #, c-format msgid "Unable to set sw params for playback: %s\n" msgstr "Nemoguće postavljanje softverskih parametara za reprodukciju: %s\n" -#: speaker-test/speaker-test.c:576 +#: speaker-test/speaker-test.c:592 #, c-format msgid "Unable to set channel map: %s\n" msgstr "Nemoguće postavljanje mapiranja kanala: %s\n" -#: speaker-test/speaker-test.c:601 +#: speaker-test/speaker-test.c:617 #, c-format msgid "Can't recovery from underrun, prepare failed: %s\n" msgstr "Nemoguć oporavak od neupotrebljivosti, priprema neuspjeha: %s\n" -#: speaker-test/speaker-test.c:612 +#: speaker-test/speaker-test.c:628 #, c-format msgid "Can't recovery from suspend, prepare failed: %s\n" msgstr "Nemogući oporavak iz suspenzije, priprema neuspjeha: %s\n" -#: speaker-test/speaker-test.c:676 speaker-test/speaker-test.c:1191 +#: speaker-test/speaker-test.c:692 speaker-test/speaker-test.c:1207 #, c-format msgid "No enough memory\n" msgstr "Nema dovoljno memorije\n" -#: speaker-test/speaker-test.c:681 +#: speaker-test/speaker-test.c:697 #, c-format msgid "Cannot open WAV file %s\n" msgstr "Nemoguće otvaranje WAV datoteke %s\n" -#: speaker-test/speaker-test.c:685 speaker-test/speaker-test.c:714 +#: speaker-test/speaker-test.c:701 speaker-test/speaker-test.c:730 #, c-format msgid "Invalid WAV file %s\n" msgstr "Neispravna WAV datoteka %s\n" -#: speaker-test/speaker-test.c:690 +#: speaker-test/speaker-test.c:706 #, c-format msgid "Not a WAV file: %s\n" msgstr "Nije WAV datoteka: %s\n" -#: speaker-test/speaker-test.c:694 +#: speaker-test/speaker-test.c:710 #, c-format msgid "Unsupported WAV format %d for %s\n" msgstr "Nepodržani WAV %d format za %s\n" -#: speaker-test/speaker-test.c:699 +#: speaker-test/speaker-test.c:715 #, c-format msgid "%s is not a mono stream (%d channels)\n" msgstr "%s nije mono strujanje (%d kanala)\n" -#: speaker-test/speaker-test.c:704 +#: speaker-test/speaker-test.c:720 #, c-format msgid "Sample rate doesn't match (%d) for %s\n" msgstr "Frekvencija se ne podudara (%d) za %s\n" -#: speaker-test/speaker-test.c:709 +#: speaker-test/speaker-test.c:725 #, c-format msgid "Unsupported sample format bits %d for %s\n" msgstr "Nepodržani bitovi formata uzorka %d za %s\n" -#: speaker-test/speaker-test.c:770 +#: speaker-test/speaker-test.c:786 #, c-format msgid "Undefined channel %d\n" msgstr "Neodređeni kanal %d\n" -#: speaker-test/speaker-test.c:821 +#: speaker-test/speaker-test.c:837 #, c-format msgid "Write error: %d,%s\n" msgstr "Greška zapisivanja: %d,%s\n" -#: speaker-test/speaker-test.c:823 +#: speaker-test/speaker-test.c:839 #, c-format msgid "xrun_recovery failed: %d,%s\n" msgstr "xrun_recovery neuspjelo: %d,%s\n" -#: speaker-test/speaker-test.c:926 +#: speaker-test/speaker-test.c:942 #, c-format msgid "" "Usage: speaker-test [OPTION]... \n" @@ -1644,72 +1644,72 @@ "-S,--scale\tVeličina stvorenih tonova testa u postocima (zadano=80)\n" "\n" -#: speaker-test/speaker-test.c:1058 +#: speaker-test/speaker-test.c:1074 #, c-format msgid "Invalid number of periods %d\n" msgstr "Neispravan broj razdoblja %d\n" -#: speaker-test/speaker-test.c:1074 speaker-test/speaker-test.c:1078 +#: speaker-test/speaker-test.c:1090 speaker-test/speaker-test.c:1094 #, c-format msgid "Invalid test type %s\n" msgstr "Neispravna vrsta testa %s\n" -#: speaker-test/speaker-test.c:1111 +#: speaker-test/speaker-test.c:1127 #, c-format msgid "Unknown option '%c'\n" msgstr "Nepoznata mogućnost '%c'\n" -#: speaker-test/speaker-test.c:1125 +#: speaker-test/speaker-test.c:1141 #, c-format msgid "Invalid parameter for -s option.\n" msgstr "Neispravan parametar za -s mogućnost.\n" -#: speaker-test/speaker-test.c:1140 +#: speaker-test/speaker-test.c:1156 #, c-format msgid "Playback device is %s\n" msgstr "Uređaj reprodukcije je %s\n" -#: speaker-test/speaker-test.c:1141 +#: speaker-test/speaker-test.c:1157 #, c-format msgid "Stream parameters are %iHz, %s, %i channels\n" msgstr "Parametri strujanja su %iHz, %s, %i kanala\n" -#: speaker-test/speaker-test.c:1144 +#: speaker-test/speaker-test.c:1160 #, c-format msgid "Using 16 octaves of pink noise\n" msgstr "Koristi se 16 oktava manjeg šuma\n" -#: speaker-test/speaker-test.c:1147 +#: speaker-test/speaker-test.c:1163 #, c-format msgid "Sine wave rate is %.4fHz\n" msgstr "Frekvencija sinusnog vala je %.4fHz\n" -#: speaker-test/speaker-test.c:1150 +#: speaker-test/speaker-test.c:1166 #, c-format msgid "WAV file(s)\n" msgstr "WAV datoteke\n" -#: speaker-test/speaker-test.c:1160 +#: speaker-test/speaker-test.c:1176 #, c-format msgid "Playback open error: %d,%s\n" msgstr "Greška otvaranja reprodukcije: %d,%s\n" -#: speaker-test/speaker-test.c:1166 +#: speaker-test/speaker-test.c:1182 #, c-format msgid "Setting of hwparams failed: %s\n" msgstr "Neuspjelo postavljanje hardverskih parametara: %s\n" -#: speaker-test/speaker-test.c:1170 +#: speaker-test/speaker-test.c:1186 #, c-format msgid "Setting of swparams failed: %s\n" msgstr "Neuspjelo postavljanje softverskih parametara: %s\n" -#: speaker-test/speaker-test.c:1216 speaker-test/speaker-test.c:1238 +#: speaker-test/speaker-test.c:1232 speaker-test/speaker-test.c:1254 #, c-format msgid "Transfer failed: %s\n" msgstr "Prijenos neuspio: %s\n" -#: speaker-test/speaker-test.c:1224 +#: speaker-test/speaker-test.c:1240 #, c-format msgid "Time per period = %lf\n" msgstr "Vrijeme po periodu = %lf\n" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apparmorapplet.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apparmorapplet.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apparmorapplet.po 2021-08-03 09:03:57.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apparmorapplet.po 2022-02-11 23:13:51.000000000 +0000 @@ -11,8 +11,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:35+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:30+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/apparmor-applet.c:244 msgid "" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apparmor-parser.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apparmor-parser.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apparmor-parser.po 2021-08-03 09:03:53.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apparmor-parser.po 2022-02-11 23:13:48.000000000 +0000 @@ -14,123 +14,135 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:35+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:30+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: ../parser_include.c:113 ../parser_include.c:111 +#: ../parser_include.c:113 ../parser_include.c:111 ../parser_include.c:96 msgid "Error: Out of memory.\n" msgstr "Greška: ponestalo memorije.\n" -#: ../parser_include.c:123 ../parser_include.c:121 +#: ../parser_include.c:123 ../parser_include.c:121 ../parser_include.c:106 #, c-format msgid "Error: basedir %s is not a directory, skipping.\n" msgstr "Greška: osnovni direktorij %s nije direktorij, preskačem.\n" -#: ../parser_include.c:137 +#: ../parser_include.c:137 ../parser_include.c:122 #, c-format msgid "Error: Could not add directory %s to search path.\n" msgstr "Greška: nemoguće dodavanje direktorija %s u putanju pretrage.\n" -#: ../parser_include.c:147 ../parser_include.c:151 +#: ../parser_include.c:147 ../parser_include.c:151 ../parser_include.c:136 msgid "Error: Could not allocate memory.\n" msgstr "Greška: nemoguće dodijeliti memoriju.\n" #: ../parser_interface.c:69 ../parser_interface.c:72 ../parser_interface.c:49 +#: ../parser_interface.c:52 msgid "Bad write position\n" msgstr "Netočan položaj zapisivanja\n" #: ../parser_interface.c:72 ../parser_interface.c:75 ../parser_interface.c:52 +#: ../parser_interface.c:55 msgid "Permission denied\n" -msgstr "Pristup odbijen\n" +msgstr "Pristup uskraćen\n" #: ../parser_interface.c:75 ../parser_interface.c:78 ../parser_interface.c:55 +#: ../parser_interface.c:58 msgid "Out of memory\n" msgstr "Ponestalo memorije\n" #: ../parser_interface.c:78 ../parser_interface.c:81 ../parser_interface.c:58 +#: ../parser_interface.c:61 msgid "Couldn't copy profile: Bad memory address\n" msgstr "Nemoguće kopiranje profila: neispravna memorijska adresa\n" #: ../parser_interface.c:81 ../parser_interface.c:84 ../parser_interface.c:61 +#: ../parser_interface.c:64 msgid "Profile doesn't conform to protocol\n" msgstr "Profil ne odgovara protokolu\n" #: ../parser_interface.c:84 ../parser_interface.c:87 ../parser_interface.c:64 +#: ../parser_interface.c:67 msgid "Profile does not match signature\n" msgstr "Profil ne odgovara potpisu\n" #: ../parser_interface.c:87 ../parser_interface.c:90 ../parser_interface.c:67 +#: ../parser_interface.c:70 msgid "Profile version not supported by Apparmor module\n" msgstr "Inačicu profila ne podržava Apparmor modul\n" #: ../parser_interface.c:90 ../parser_interface.c:93 ../parser_interface.c:70 +#: ../parser_interface.c:73 msgid "Profile already exists\n" msgstr "Profil već postoji\n" #: ../parser_interface.c:93 ../parser_interface.c:96 ../parser_interface.c:73 +#: ../parser_interface.c:76 msgid "Profile doesn't exist\n" msgstr "Profil ne postoji\n" #: ../parser_interface.c:96 ../parser_interface.c:99 ../parser_interface.c:76 +#: ../parser_interface.c:79 msgid "Permission denied; attempted to load a profile while confined?\n" msgstr "Pristup odbijen, pokušaj učitavanja profila tijekom ograničenja?\n" #: ../parser_interface.c:99 ../parser_interface.c:102 ../parser_interface.c:79 +#: ../parser_interface.c:82 #, c-format msgid "Unknown error (%d): %s\n" msgstr "Nepoznata greška (%d): %s\n" -#: ../parser_interface.c:116 ../parser_interface.c:119 -#: ../parser_interface.c:96 +#: ../parser_interface.c:116 ../parser_interface.c:119 ../parser_interface.c:96 +#: ../parser_interface.c:100 #, c-format msgid "%s: Unable to add \"%s\". " -msgstr "%s: Ne mogu dodati \"%s\". " +msgstr "%s: Nemoguće je dodati \"%s\". " #: ../parser_interface.c:121 ../parser_interface.c:124 -#: ../parser_interface.c:101 +#: ../parser_interface.c:101 ../parser_interface.c:105 #, c-format msgid "%s: Unable to replace \"%s\". " -msgstr "%s: Ne mogu zamijeniti \"%s\". " +msgstr "%s: Nemoguće je zamijeniti \"%s\". " #: ../parser_interface.c:126 ../parser_interface.c:129 -#: ../parser_interface.c:106 +#: ../parser_interface.c:106 ../parser_interface.c:110 #, c-format msgid "%s: Unable to remove \"%s\". " -msgstr "%s : Ne mogu ukloniti \"%s\". " +msgstr "%s : Nemoguće je ukloniti \"%s\". " #: ../parser_interface.c:131 ../parser_interface.c:134 -#: ../parser_interface.c:111 +#: ../parser_interface.c:111 ../parser_interface.c:115 #, c-format msgid "%s: Unable to write to stdout\n" -msgstr "%s: Ne mogu pisati na stdout\n" +msgstr "%s: Nemoguće je zapisivati u stdout\n" #: ../parser_interface.c:135 ../parser_interface.c:138 -#: ../parser_interface.c:115 +#: ../parser_interface.c:115 ../parser_interface.c:119 #, c-format msgid "%s: Unable to write to output file\n" -msgstr "%s: Ne mogu pisati izlaznu datoteku\n" +msgstr "%s: Nemoguće je zapisivati u izlaznu datoteku\n" #: ../parser_interface.c:138 ../parser_interface.c:162 #: ../parser_interface.c:141 ../parser_interface.c:165 #: ../parser_interface.c:118 ../parser_interface.c:142 +#: ../parser_interface.c:123 ../parser_interface.c:147 #, c-format msgid "%s: ASSERT: Invalid option: %d\n" msgstr "%s: UMETANJE: Neispravan izbor: %d\n" #: ../parser_interface.c:147 ../parser_interface.c:150 -#: ../parser_interface.c:127 +#: ../parser_interface.c:127 ../parser_interface.c:132 #, c-format msgid "Addition succeeded for \"%s\".\n" msgstr "Dodavanje je uspjelo za \"%s\".\n" #: ../parser_interface.c:151 ../parser_interface.c:154 -#: ../parser_interface.c:131 +#: ../parser_interface.c:131 ../parser_interface.c:136 #, c-format msgid "Replacement succeeded for \"%s\".\n" msgstr "Zamjena je uspjela za \"%s\".\n" #: ../parser_interface.c:155 ../parser_interface.c:158 -#: ../parser_interface.c:135 +#: ../parser_interface.c:135 ../parser_interface.c:140 #, c-format msgid "Removal succeeded for \"%s\".\n" msgstr "Uklanjanje je uspjelo za \"%s\".\n" @@ -142,7 +154,7 @@ "PANIKA neispravan inkrementalni spremnik %p pol %p ekst %p vel %d raz %p\n" #: ../parser_interface.c:656 ../parser_interface.c:658 -#: ../parser_interface.c:446 +#: ../parser_interface.c:446 ../parser_interface.c:476 #, c-format msgid "profile %s network rules not enforced\n" msgstr "" @@ -187,7 +199,7 @@ msgstr "%s: Ne mogu zapisati cjeli unos profila\n" #: ../parser_interface.c:839 ../parser_interface.c:831 -#: ../parser_interface.c:593 +#: ../parser_interface.c:593 ../parser_interface.c:579 #, c-format msgid "%s: Unable to write entire profile entry to cache\n" msgstr "" @@ -197,7 +209,7 @@ msgid "Could not open '%s'" msgstr "Neuspjelo otvaranje '%s'" -#: parser_lex.l:104 parser_lex.l:167 parser_lex.l:173 +#: parser_lex.l:104 parser_lex.l:167 parser_lex.l:173 parser_lex.l:174 #, c-format msgid "fstat failed for '%s'" msgstr "" @@ -223,7 +235,7 @@ msgid "Found unexpected character: '%s'" msgstr "Pronađen neočekivani znak: '%s'" -#: parser_lex.l:386 parser_lex.l:418 parser_lex.l:428 +#: parser_lex.l:386 parser_lex.l:418 parser_lex.l:428 parser_lex.l:474 msgid "Variable declarations do not accept trailing commas" msgstr "" @@ -243,6 +255,7 @@ msgstr "%s: Ne mogu rezervirati memoriju za točku montiranja poddomene\n" #: ../parser_main.c:577 ../parser_main.c:616 ../parser_main.c:479 +#: ../parser_main.c:1444 #, c-format msgid "" "Warning: unable to find a suitable fs in %s, is it mounted?\n" @@ -253,6 +266,7 @@ "Koristite --subdomainfs za premoštenje.\n" #: ../parser_main.c:597 ../parser_main.c:635 ../parser_main.c:498 +#: ../parser_main.c:822 #, c-format msgid "" "%s: Sorry. You need root privileges to run this program.\n" @@ -262,6 +276,7 @@ "\n" #: ../parser_main.c:604 ../parser_main.c:642 ../parser_main.c:505 +#: ../parser_main.c:828 #, c-format msgid "" "%s: Warning! You've set this program setuid root.\n" @@ -274,7 +289,7 @@ "\n" #: ../parser_main.c:704 ../parser_main.c:813 ../parser_main.c:836 -#: ../parser_main.c:946 ../parser_main.c:860 +#: ../parser_main.c:946 ../parser_main.c:860 ../parser_main.c:1038 #, c-format msgid "Error: Could not read profile %s: %s.\n" msgstr "Greška: Ne mogu učitati profil %s: %s.\n" @@ -296,26 +311,36 @@ #: parser_yacc.y:1166 parser_yacc.y:1170 parser_yacc.y:1180 parser_yacc.y:1190 #: parser_yacc.y:1298 parser_yacc.y:1376 parser_yacc.y:1479 parser_yacc.y:1490 #: parser_yacc.y:1565 parser_yacc.y:1583 parser_yacc.y:1590 parser_yacc.y:1639 -#: ../network.c:314 ../af_unix.cc:203 +#: ../network.c:314 ../af_unix.cc:203 ../parser_misc.c:215 ../parser_misc.c:939 +#: parser_yacc.y:343 parser_yacc.y:367 parser_yacc.y:533 parser_yacc.y:543 +#: parser_yacc.y:660 parser_yacc.y:741 parser_yacc.y:750 parser_yacc.y:1171 +#: parser_yacc.y:1219 parser_yacc.y:1255 parser_yacc.y:1264 parser_yacc.y:1268 +#: parser_yacc.y:1278 parser_yacc.y:1288 parser_yacc.y:1382 parser_yacc.y:1460 +#: parser_yacc.y:1592 parser_yacc.y:1597 parser_yacc.y:1674 parser_yacc.y:1692 +#: parser_yacc.y:1699 parser_yacc.y:1748 ../network.c:315 ../af_unix.cc:194 msgid "Memory allocation error." msgstr "Greška kod rezerviranja memorije." #: ../parser_main.c:740 ../parser_main.c:872 ../parser_main.c:757 +#: ../parser_main.c:975 #, c-format msgid "Cached load succeeded for \"%s\".\n" msgstr "" #: ../parser_main.c:744 ../parser_main.c:876 ../parser_main.c:761 +#: ../parser_main.c:979 #, c-format msgid "Cached reload succeeded for \"%s\".\n" msgstr "" #: ../parser_main.c:910 ../parser_main.c:1058 ../parser_main.c:967 +#: ../parser_main.c:1132 #, c-format msgid "%s: Errors found in file. Aborting.\n" msgstr "%s Pronađene su greške u datoteci. Prekidam.\n" #: ../parser_misc.c:426 ../parser_misc.c:597 ../parser_misc.c:339 +#: ../parser_misc.c:532 msgid "" "Uppercase qualifiers \"RWLIMX\" are deprecated, please convert to lowercase\n" "See the apparmor.d(5) manpage for details.\n" @@ -326,16 +351,19 @@ #: ../parser_misc.c:467 ../parser_misc.c:474 ../parser_misc.c:638 #: ../parser_misc.c:645 ../parser_misc.c:380 ../parser_misc.c:387 +#: ../parser_misc.c:573 ../parser_misc.c:580 msgid "Conflict 'a' and 'w' perms are mutually exclusive." msgstr "Sukob 'a' i 'w' dozvole su međusobno isključive." #: ../parser_misc.c:491 ../parser_misc.c:662 ../parser_misc.c:404 +#: ../parser_misc.c:597 msgid "Exec qualifier 'i' invalid, conflicting qualifier already specified" msgstr "" "Kvalifikator izvršavanja 'i' nije ispravan, sukobljeni kvalifikator je već " "naveden" #: ../parser_misc.c:502 ../parser_misc.c:673 ../parser_misc.c:415 +#: ../parser_misc.c:608 #, c-format msgid "" "Unconfined exec qualifier (%c%c) allows some dangerous environment variables " @@ -347,6 +375,7 @@ #: ../parser_misc.c:510 ../parser_misc.c:551 ../parser_misc.c:681 #: ../parser_misc.c:722 ../parser_misc.c:423 ../parser_misc.c:464 +#: ../parser_misc.c:616 ../parser_misc.c:657 #, c-format msgid "Exec qualifier '%c' invalid, conflicting qualifier already specified" msgstr "" @@ -355,6 +384,7 @@ #: ../parser_misc.c:537 ../parser_misc.c:545 ../parser_misc.c:708 #: ../parser_misc.c:716 ../parser_misc.c:450 ../parser_misc.c:458 +#: ../parser_misc.c:643 ../parser_misc.c:651 #, c-format msgid "" "Exec qualifier '%c%c' invalid, conflicting qualifier already specified" @@ -363,11 +393,13 @@ "već naveden" #: ../parser_misc.c:593 ../parser_misc.c:764 ../parser_misc.c:506 +#: ../parser_misc.c:699 #, c-format msgid "Internal: unexpected mode character '%c' in input" msgstr "Unutrašnje: neočekivani oblik znaka '%c' u ulazu" #: ../parser_misc.c:615 ../parser_misc.c:786 ../parser_misc.c:528 +#: ../parser_misc.c:721 #, c-format msgid "Internal error generated invalid perm 0x%llx\n" msgstr "Unutrašnja greška je stvorila neispravne dozvole 0x%llx\n" @@ -379,10 +411,12 @@ msgstr "AppArmor greška parsera: %s\n" #: ../parser_merge.c:92 ../parser_merge.c:91 ../parser_merge.c:83 +#: ../parser_merge.c:71 msgid "Couldn't merge entries. Out of Memory\n" msgstr "Ne mogu spojiti unose. Nedovoljno memorije\n" #: ../parser_merge.c:111 ../parser_merge.c:113 ../parser_merge.c:105 +#: ../parser_merge.c:93 #, c-format msgid "profile %s: has merged rule %s with conflicting x modifiers\n" msgstr "" @@ -391,48 +425,49 @@ msgid "Profile attachment must begin with a '/'." msgstr "" -#: parser_yacc.y:260 parser_yacc.y:302 parser_yacc.y:348 +#: parser_yacc.y:260 parser_yacc.y:302 parser_yacc.y:348 parser_yacc.y:407 msgid "" "Profile names must begin with a '/', namespace or keyword 'profile' or 'hat'." msgstr "" -#: parser_yacc.y:296 parser_yacc.y:338 parser_yacc.y:384 +#: parser_yacc.y:296 parser_yacc.y:338 parser_yacc.y:384 parser_yacc.y:449 #, c-format msgid "Failed to create alias %s -> %s\n" msgstr "Ne mogu napraviti alias %s -> %s\n" -#: parser_yacc.y:417 parser_yacc.y:460 parser_yacc.y:506 +#: parser_yacc.y:417 parser_yacc.y:460 parser_yacc.y:506 parser_yacc.y:581 msgid "Profile flag chroot_relative conflicts with namespace_relative" msgstr "" -#: parser_yacc.y:421 parser_yacc.y:464 parser_yacc.y:510 +#: parser_yacc.y:421 parser_yacc.y:464 parser_yacc.y:510 parser_yacc.y:585 msgid "Profile flag mediate_deleted conflicts with delegate_deleted" msgstr "" -#: parser_yacc.y:424 parser_yacc.y:467 parser_yacc.y:513 +#: parser_yacc.y:424 parser_yacc.y:467 parser_yacc.y:513 parser_yacc.y:588 msgid "" "Profile flag attach_disconnected conflicts with no_attach_disconnected" msgstr "" -#: parser_yacc.y:427 parser_yacc.y:470 parser_yacc.y:516 +#: parser_yacc.y:427 parser_yacc.y:470 parser_yacc.y:516 parser_yacc.y:591 msgid "Profile flag chroot_attach conflicts with chroot_no_attach" msgstr "" -#: parser_yacc.y:441 parser_yacc.y:484 parser_yacc.y:530 +#: parser_yacc.y:441 parser_yacc.y:484 parser_yacc.y:530 parser_yacc.y:607 msgid "Profile flag 'debug' is no longer valid." msgstr "Zastavica profila 'uklanjanje grešaka' više nije ispravna." -#: parser_yacc.y:463 parser_yacc.y:506 parser_yacc.y:552 +#: parser_yacc.y:463 parser_yacc.y:506 parser_yacc.y:552 parser_yacc.y:629 #, c-format msgid "Invalid profile flag: %s." msgstr "Neispravna zastavica profila: %s." #: parser_yacc.y:498 parser_yacc.y:520 parser_yacc.y:548 parser_yacc.y:594 +#: parser_yacc.y:673 msgid "Assert: `rule' returned NULL." msgstr "Potvrda: `rule' je vratilo NULL." #: parser_yacc.y:501 parser_yacc.y:546 parser_yacc.y:552 parser_yacc.y:584 -#: parser_yacc.y:598 parser_yacc.y:630 +#: parser_yacc.y:598 parser_yacc.y:630 parser_yacc.y:677 parser_yacc.y:709 msgid "" "Invalid mode, in deny rules 'x' must not be preceded by exec qualifier 'i', " "'p', or 'u'" @@ -440,72 +475,74 @@ "Neispravan način, u pravilima odbijanja 'x' ne smije imati kvalifikatore " "izvršavanja 'i', 'p', ili 'u' u prefiksu" -#: parser_yacc.y:524 parser_yacc.y:556 parser_yacc.y:602 +#: parser_yacc.y:524 parser_yacc.y:556 parser_yacc.y:602 parser_yacc.y:681 msgid "" "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', 'c', or 'u'" msgstr "" "Neispravan oblik, ispred 'x' moraju biti kvalifikatori izvršavanja 'i', 'p', " "'c' ili 'u'" -#: parser_yacc.y:549 parser_yacc.y:587 parser_yacc.y:633 +#: parser_yacc.y:549 parser_yacc.y:587 parser_yacc.y:633 parser_yacc.y:712 msgid "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', or 'u'" msgstr "" "Neispravan oblik, ispred 'x' moraju biti kvalifikatori izvršavanja 'i', 'p' " "ili 'u'" #: parser_yacc.y:574 parser_yacc.y:612 parser_yacc.y:614 parser_yacc.y:660 +#: parser_yacc.y:739 msgid "Assert: `network_rule' return invalid protocol." msgstr "Potvrda: `network_rule' je vratilo neispravan protokol." -#: parser_yacc.y:649 parser_yacc.y:696 parser_yacc.y:786 +#: parser_yacc.y:649 parser_yacc.y:696 parser_yacc.y:786 parser_yacc.y:867 msgid "Assert: `change_profile' returned NULL." msgstr "Potvrda: `change_profile' je vratilo NULL." -#: parser_yacc.y:680 parser_yacc.y:720 parser_yacc.y:810 +#: parser_yacc.y:680 parser_yacc.y:720 parser_yacc.y:810 parser_yacc.y:905 msgid "Assert: 'hat rule' returned NULL." msgstr "Potvrda: `hat rule' je vratilo NULL." -#: parser_yacc.y:689 parser_yacc.y:729 parser_yacc.y:819 +#: parser_yacc.y:689 parser_yacc.y:729 parser_yacc.y:819 parser_yacc.y:914 msgid "Assert: 'local_profile rule' returned NULL." msgstr "" -#: parser_yacc.y:824 parser_yacc.y:885 parser_yacc.y:992 +#: parser_yacc.y:824 parser_yacc.y:885 parser_yacc.y:992 parser_yacc.y:1077 #, c-format msgid "Unset boolean variable %s used in if-expression" msgstr "Nepostavljena varijabla istinitosti %s korištena u if-uvjetu" -#: parser_yacc.y:882 parser_yacc.y:986 parser_yacc.y:1092 +#: parser_yacc.y:882 parser_yacc.y:986 parser_yacc.y:1092 parser_yacc.y:1181 msgid "unsafe rule missing exec permissions" msgstr "Nesigurnom pravilu nedostaju prava izvršavanja" -#: parser_yacc.y:901 parser_yacc.y:954 parser_yacc.y:1060 +#: parser_yacc.y:901 parser_yacc.y:954 parser_yacc.y:1060 parser_yacc.y:1148 msgid "subset can only be used with link rules." msgstr "" -#: parser_yacc.y:903 parser_yacc.y:956 parser_yacc.y:1062 +#: parser_yacc.y:903 parser_yacc.y:956 parser_yacc.y:1062 parser_yacc.y:1150 msgid "link and exec perms conflict on a file rule using ->" msgstr "" -#: parser_yacc.y:905 parser_yacc.y:958 parser_yacc.y:1064 +#: parser_yacc.y:905 parser_yacc.y:958 parser_yacc.y:1064 parser_yacc.y:1152 msgid "link perms are not allowed on a named profile transition.\n" msgstr "" -#: parser_yacc.y:921 parser_yacc.y:1003 parser_yacc.y:1109 +#: parser_yacc.y:921 parser_yacc.y:1003 parser_yacc.y:1109 parser_yacc.y:1198 #, c-format msgid "missing an end of line character? (entry: %s)" msgstr "nedostaje oznaka kraja niza? (unos: %s)" #: parser_yacc.y:975 parser_yacc.y:985 parser_yacc.y:1057 parser_yacc.y:1067 -#: parser_yacc.y:1145 parser_yacc.y:1155 +#: parser_yacc.y:1145 parser_yacc.y:1155 parser_yacc.y:1234 parser_yacc.y:1244 msgid "Invalid network entry." msgstr "Neispravan mrežni unos." #: parser_yacc.y:1039 parser_yacc.y:1048 parser_yacc.y:1254 parser_yacc.y:1510 +#: parser_yacc.y:1617 #, c-format msgid "Invalid capability %s." msgstr "Neispravna mogućnost %s." -#: parser_yacc.y:1066 parser_yacc.y:1269 parser_yacc.y:1525 +#: parser_yacc.y:1066 parser_yacc.y:1269 parser_yacc.y:1525 parser_yacc.y:1637 #, c-format msgid "AppArmor parser error for %s%s%s at line %d: %s\n" msgstr "" @@ -521,6 +558,7 @@ msgstr "%s: Neispravno otvaranje {, ugniježđena grupiranja nisu dozvoljena\n" #: ../parser_regex.c:265 ../parser_regex.c:274 ../parser_regex.c:278 +#: ../parser_regex.c:306 #, c-format msgid "%s: Regex grouping error: Invalid number of items between {}\n" msgstr "" @@ -528,6 +566,7 @@ "između {}\n" #: ../parser_regex.c:271 ../parser_regex.c:280 ../parser_regex.c:284 +#: ../parser_regex.c:312 #, c-format msgid "" "%s: Regex grouping error: Invalid close }, no matching open { detected\n" @@ -536,6 +575,7 @@ "nema odgovarajućeg otvaranja {\n" #: ../parser_regex.c:337 ../parser_regex.c:343 ../parser_regex.c:361 +#: ../parser_regex.c:403 #, c-format msgid "" "%s: Regex grouping error: Unclosed grouping or character class, expecting " @@ -551,16 +591,19 @@ "%s: Detektiran je prelijev unutrašnjeg spremnika, %d znakova previše\n" #: ../parser_regex.c:355 ../parser_regex.c:361 ../parser_regex.c:377 +#: ../parser_regex.c:419 #, c-format msgid "%s: Unable to parse input line '%s'\n" msgstr "%s: Ne mogu parsirati ulaznu liniju '%s'\n" #: ../parser_regex.c:397 ../parser_regex.c:405 ../parser_regex.c:421 +#: ../parser_regex.c:487 #, c-format msgid "%s: Invalid profile name '%s' - bad regular expression\n" msgstr "" #: ../parser_policy.c:202 ../parser_policy.c:402 ../parser_policy.c:375 +#: ../parser_policy.c:383 #, c-format msgid "ERROR merging rules for profile %s, failed to load\n" msgstr "GREŠKA kod spajanja pravila za profil %s, ne mogu učitati\n" @@ -578,16 +621,19 @@ "\t'**' se može koristiti samo na kraju pravila.\n" #: ../parser_policy.c:279 ../parser_policy.c:359 ../parser_policy.c:332 +#: ../parser_policy.c:340 #, c-format msgid "ERROR processing regexs for profile %s, failed to load\n" msgstr "GREŠKA kod obrade regularnih izraza za profil %s, ne mogu učitati\n" #: ../parser_policy.c:306 ../parser_policy.c:389 ../parser_policy.c:362 +#: ../parser_policy.c:370 #, c-format msgid "ERROR expanding variables for profile %s, failed to load\n" msgstr "GREŠKA kod učitavanja varijabli za profil %s, ne mogu učitati\n" #: ../parser_policy.c:390 ../parser_policy.c:382 ../parser_policy.c:355 +#: ../parser_policy.c:363 #, c-format msgid "ERROR adding hat access rule for profile %s\n" msgstr "" @@ -621,7 +667,7 @@ "%s: Nađene su greške prilikom postprocesiranja kombiniranja pravila. " "Prekidam.\n" -#: parser_lex.l:180 parser_lex.l:186 +#: parser_lex.l:180 parser_lex.l:186 parser_lex.l:187 #, c-format msgid "Could not process include directory '%s' in '%s'" msgstr "" @@ -631,7 +677,8 @@ msgstr "" #: ../parser_main.c:1115 ../parser_main.c:1132 ../parser_main.c:1024 -#: ../parser_main.c:1041 +#: ../parser_main.c:1041 ../parser_main.c:1332 ../parser_main.c:1354 +#: ../parser_misc.c:280 ../parser_misc.c:299 ../parser_misc.c:308 msgid "Out of memory" msgstr "Ponestalo memorije" @@ -660,11 +707,11 @@ msgid "Internal error generated invalid DBus perm 0x%x\n" msgstr "" -#: parser_yacc.y:575 parser_yacc.y:621 +#: parser_yacc.y:575 parser_yacc.y:621 parser_yacc.y:700 msgid "deny prefix not allowed" msgstr "" -#: parser_yacc.y:612 parser_yacc.y:658 +#: parser_yacc.y:612 parser_yacc.y:658 parser_yacc.y:737 msgid "owner prefix not allowed" msgstr "" @@ -680,41 +727,41 @@ msgid "owner prefix not allow on capability rules" msgstr "" -#: parser_yacc.y:1357 parser_yacc.y:1613 +#: parser_yacc.y:1357 parser_yacc.y:1613 parser_yacc.y:1722 #, c-format msgid "invalid mount conditional %s%s" msgstr "" -#: parser_yacc.y:1374 parser_yacc.y:1628 +#: parser_yacc.y:1374 parser_yacc.y:1628 parser_yacc.y:1737 msgid "bad mount rule" msgstr "" -#: parser_yacc.y:1381 parser_yacc.y:1635 +#: parser_yacc.y:1381 parser_yacc.y:1635 parser_yacc.y:1744 msgid "mount point conditions not currently supported" msgstr "" -#: parser_yacc.y:1398 parser_yacc.y:1650 +#: parser_yacc.y:1398 parser_yacc.y:1650 parser_yacc.y:1759 #, c-format msgid "invalid pivotroot conditional '%s'" msgstr "" -#: ../parser_regex.c:241 ../parser_regex.c:236 +#: ../parser_regex.c:241 ../parser_regex.c:236 ../parser_regex.c:264 #, c-format msgid "" "%s: Regex grouping error: Invalid close ], no matching open [ detected\n" msgstr "" -#: ../parser_regex.c:257 ../parser_regex.c:256 +#: ../parser_regex.c:257 ../parser_regex.c:256 ../parser_regex.c:284 #, c-format msgid "%s: Regex grouping error: Exceeded maximum nesting of {}\n" msgstr "" -#: ../parser_policy.c:366 ../parser_policy.c:339 +#: ../parser_policy.c:366 ../parser_policy.c:339 ../parser_policy.c:347 #, c-format msgid "ERROR processing policydb rules for profile %s, failed to load\n" msgstr "" -#: ../parser_policy.c:396 ../parser_policy.c:369 +#: ../parser_policy.c:396 ../parser_policy.c:369 ../parser_policy.c:377 #, c-format msgid "ERROR replacing aliases for profile %s, failed to load\n" msgstr "" @@ -734,51 +781,51 @@ msgid "Error: Could not read cache file '%s', skipping...\n" msgstr "" -#: ../parser_misc.c:575 +#: ../parser_misc.c:575 ../parser_misc.c:768 #, c-format msgid "Internal: unexpected %s mode character '%c' in input" msgstr "" -#: ../parser_misc.c:599 +#: ../parser_misc.c:599 ../parser_misc.c:792 #, c-format msgid "Internal error generated invalid %s perm 0x%x\n" msgstr "" -#: parser_yacc.y:703 +#: parser_yacc.y:703 parser_yacc.y:784 msgid "owner prefix not allowed on mount rules" msgstr "" -#: parser_yacc.y:720 +#: parser_yacc.y:720 parser_yacc.y:801 msgid "owner prefix not allowed on dbus rules" msgstr "" -#: parser_yacc.y:736 +#: parser_yacc.y:736 parser_yacc.y:817 msgid "owner prefix not allowed on signal rules" msgstr "" -#: parser_yacc.y:752 +#: parser_yacc.y:752 parser_yacc.y:833 msgid "owner prefix not allowed on ptrace rules" msgstr "" -#: parser_yacc.y:768 +#: parser_yacc.y:768 parser_yacc.y:849 parser_yacc.y:869 msgid "owner prefix not allowed on unix rules" msgstr "" -#: parser_yacc.y:794 +#: parser_yacc.y:794 parser_yacc.y:885 msgid "owner prefix not allowed on capability rules" msgstr "" -#: parser_yacc.y:1293 +#: parser_yacc.y:1293 parser_yacc.y:1377 #, c-format msgid "dbus rule: invalid conditional group %s=()" msgstr "" -#: parser_yacc.y:1371 +#: parser_yacc.y:1371 parser_yacc.y:1455 #, c-format msgid "unix rule: invalid conditional group %s=()" msgstr "" -#: ../parser_regex.c:368 +#: ../parser_regex.c:368 ../parser_regex.c:410 #, c-format msgid "%s: Regex error: trailing '\\' escape character\n" msgstr "" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/app-install-data.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/app-install-data.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/app-install-data.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/app-install-data.po 2022-02-11 23:13: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: 2021-08-02 17:38+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:34+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../menu-data-additional/7zip.desktop.in.h:1 msgid "7zip" @@ -758,7 +758,7 @@ #: ../menu-data/aliki:aliki-alsa.desktop.in.h:1 msgid "Aliki (with ALSA support)" -msgstr "" +msgstr "Aliki (sa ALSA podrškom)" #: ../menu-data/aliki:aliki-alsa.desktop.in.h:2 #: ../menu-data/aliki:aliki-jack.desktop.in.h:2 @@ -7617,7 +7617,7 @@ #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:2 msgid "Alsa mixer" -msgstr "" +msgstr "Alsa mikser" #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:1 msgid "Gmerlin KBD" @@ -15203,11 +15203,11 @@ #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:1 msgid "Nautilus Compare Extension Preferences" -msgstr "Nautilus Compare Extension Preferences" +msgstr "Osobitosti za Nautilus Compare proširenje" #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:2 msgid "Preferences for Nautilus Compare Extension" -msgstr "" +msgstr "Osobitosti za Nautilus Compare proširenje" #: ../menu-data/nautilus-dropbox:dropbox.desktop.in.h:1 msgid "Dropbox" @@ -16354,7 +16354,7 @@ #: ../menu-data/padevchooser:padevchooser.desktop.in.h:1 msgid "PulseAudio Device Chooser" -msgstr "" +msgstr "PulseAudio odabiratelj uređaja" #: ../menu-data/padevchooser:padevchooser.desktop.in.h:2 msgid "An Applet for Quick Device Changing" @@ -16378,11 +16378,11 @@ #: ../menu-data/paman:paman.desktop.in.h:1 msgid "PulseAudio Manager" -msgstr "" +msgstr "PulseAudio upravitelj" #: ../menu-data/paman:paman.desktop.in.h:2 msgid "Manage your PulseAudio sound server" -msgstr "" +msgstr "Upravljajte svojim PulseAudio zvučnim poslužiteljem" #: ../menu-data/pan:pan.desktop.in.h:1 msgid "Pan Newsreader" @@ -16402,7 +16402,7 @@ #: ../menu-data/paprefs:paprefs.desktop.in.h:1 msgid "PulseAudio Preferences" -msgstr "" +msgstr "PulseAudio osobitosti" #: ../menu-data/paprefs:paprefs.desktop.in.h:2 msgid "View and modify the configuration of the local sound server" @@ -16466,11 +16466,11 @@ #: ../menu-data/pasystray:pasystray.desktop.in.h:1 msgid "PulseAudio System Tray" -msgstr "" +msgstr "PulseAudio obavijesno područje sustava" #: ../menu-data/pasystray:pasystray.desktop.in.h:2 msgid "An Applet for PulseAudio" -msgstr "" +msgstr "Aplet za PulseAudio" #: ../menu-data/patchage:patchage.desktop.in.h:1 msgid "Patchage" @@ -16515,7 +16515,7 @@ #: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1 msgid "PulseAudio Volume Control" -msgstr "" +msgstr "PulseAudio upravljanje glasnoćom zvuka" #: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2 msgid "Adjust the volume level" @@ -16523,7 +16523,7 @@ #: ../menu-data/pavumeter:pavumeter.desktop.in.h:1 msgid "PulseAudio Volume Meter (Playback)" -msgstr "" +msgstr "PulseAudio metar glasnoće zvuka (Reprodukcija)" #: ../menu-data/pavumeter:pavumeter.desktop.in.h:2 msgid "Monitor the output volume" @@ -17439,11 +17439,11 @@ #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:1 msgid "projectM PulseAudio Visualization" -msgstr "" +msgstr "projectM PulseAudio vizualizacija" #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:2 msgid "Visualization of PulseAudio streams with projectM" -msgstr "" +msgstr "Vizualizacija PulseAudio strujanja sa projectM" #: ../menu-data/promoe:promoe.desktop.in.h:1 msgid "Promoe" @@ -18059,7 +18059,7 @@ #: ../menu-data/qashctl:qashctl.desktop.in.h:2 msgid "ALSA HCTL mixer" -msgstr "" +msgstr "ALSA HCTL mikser" #: ../menu-data/qasmixer:qasmixer.desktop.in.h:1 msgid "QasMixer" @@ -18067,7 +18067,7 @@ #: ../menu-data/qasmixer:qasmixer.desktop.in.h:2 msgid "Graphical mixer application for the ALSA" -msgstr "" +msgstr "Grafička mikser aplikacija za ALSA" #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:2 msgid "qBittorrent" @@ -22984,7 +22984,7 @@ #: ../menu-data/veromix:veromix.desktop.in.h:2 msgid "Mixer for the PulseAudio sound server (GTK+)" -msgstr "" +msgstr "Mikser za PulseAudio zvučni poslužitelj (GTK+)" #: ../menu-data/veusz:veusz.desktop.in.h:1 msgid "Veusz" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apport.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apport.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apport.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apport.po 2022-02-11 23:13:51.000000000 +0000 @@ -7,17 +7,150 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-18 15:35+0000\n" +"POT-Creation-Date: 2021-10-20 11:36+0000\n" "PO-Revision-Date: 2020-07-06 09:42+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:24+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:19+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" +#: ../data/general-hooks/ubuntu.py:200 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:200 +msgid "" +"An Ubuntu package has a file conflict with a package that is not a genuine " +"Ubuntu package." +msgstr "Ubuntu paket je u sukob s paketom koji nije izvorni Ubuntu paket." + +#: ../data/general-hooks/ubuntu.py:208 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:208 +msgid "You have already encountered this package installation failure." +msgstr "Već ste naišli na neuspjeh instalacije ovog paketa." + +#: ../data/general-hooks/ubuntu.py:224 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:224 +msgid "" +"Your system was initially configured with grub version 2, but you have " +"removed it from your system in favor of grub 1 without configuring it. To " +"ensure your bootloader configuration is updated whenever a new kernel is " +"available, open a terminal and run:\n" +"\n" +" sudo apt-get install grub-pc\n" +msgstr "" +"Vaš sustav je početno podešen za rad s grubom inačice 2, ali ste ga uklonili " +"s vašeg sustava u zamjenu za grub 1 bez naknadnog podešavanja. Da bi " +"osigurali nadopunu vašeg podešavanja boot učitača kada god je novi kernel " +"dostupan, otvorite terminal i upišite:\n" +"\n" +" sudo apt-get install grub-pc\n" + +#: ../bin/apport-cli.py:166 ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146 +#: ../kde/apport-kde.py:363 ../debian/tmp/usr/share/apport/apport-kde.py:363 +msgid "(binary data)" +msgstr "(binarni podaci)" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 +#, python-format +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "Aplikacija %s je neočekivano zaustavljena." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 +#, python-format +msgid "Sorry, %s has closed unexpectedly." +msgstr "%s se neočekivano zatvorio." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169 +#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 +#: ../debian/tmp/usr/share/apport/apport-kde.py:200 +#: ../debian/tmp/usr/share/apport/apport-kde.py:238 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "%s je iskusio unutrašnju grešku." + +#: ../bin/apport-cli.py:194 ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../kde/apport-kde.py:186 ../debian/tmp/usr/share/apport/apport-kde.py:186 +msgid "Send problem report to the developers?" +msgstr "Pošaljite izvještaj problema razvijateljima?" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-kde.py:194 +msgid "Send" +msgstr "Pošalji" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204 +#: ../gtk/apport-gtk.py:575 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-kde.py:292 +msgid "Show Details" +msgstr "Prikaži pojedinosti" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216 +#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 +#: ../debian/tmp/usr/share/apport/apport-kde.py:231 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 +msgid "Continue" +msgstr "Nastavi" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 +#, python-format +msgid "The application %s has stopped responding." +msgstr "Aplikacija %s više ne odgovara." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 +#, python-format +msgid "The program \"%s\" has stopped responding." +msgstr "Program \"%s\" više ne odgovara." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259 +#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208 +#, python-format +msgid "Package: %s" +msgstr "Paket: %s" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265 +#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214 +msgid "Sorry, a problem occurred while installing software." +msgstr "Problem se dogodio tijekom instalacije softvera." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 +#: ../gtk/apport-gtk.py:289 ../kde/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 +#, python-format +msgid "The application %s has experienced an internal error." +msgstr "Aplikacija %s je iskusila unutrašnju grešku." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277 +#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223 +#, python-format +msgid "The application %s has closed unexpectedly." +msgstr "Aplikacija %s se zatvorila neočekivano." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-kde.py:241 +msgid "If you notice further problems, try restarting the computer." +msgstr "" +"Ako primjetite daljne probleme, pokušajte ponovno pokrenuti računalo." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299 +#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245 +msgid "Ignore future problems of this type" +msgstr "Zanemari buduće probleme ove vrste" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579 +#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289 +msgid "Hide Details" +msgstr "Sakrij pojedinosti" + #: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 msgid "Press any key to continue..." msgstr "Pritisnite bilo koju tipku za nastavak..." @@ -36,21 +169,6 @@ msgid "(%i bytes)" msgstr "(%i bajta)" -#: ../kde/apport-kde.py:363 ../bin/apport-cli.py:166 -#: ../debian/tmp/usr/bin/apport-cli.py:166 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 ../gtk/apport-gtk.py:146 -msgid "(binary data)" -msgstr "(binarni podaci)" - -#: ../gtk/apport-gtk.ui.h:6 ../kde/apport-kde.py:186 ../bin/apport-cli.py:194 -#: ../debian/tmp/usr/bin/apport-cli.py:194 -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.py:181 -msgid "Send problem report to the developers?" -msgstr "Pošaljite izvještaj problema razvijateljima?" - #: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195 msgid "" "After the problem report has been sent, please fill out the form in the\n" @@ -105,9 +223,8 @@ msgid "Error: %s" msgstr "Greška: %s" -#: ../kde/apport-kde.py:407 ../bin/apport-cli.py:254 -#: ../debian/tmp/usr/bin/apport-cli.py:254 -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 +#: ../bin/apport-cli.py:254 ../debian/tmp/usr/bin/apport-cli.py:254 +#: ../kde/apport-kde.py:407 ../debian/tmp/usr/share/apport/apport-kde.py:407 msgid "Collecting problem information" msgstr "Skupljanje informacija o problemu" @@ -120,10 +237,9 @@ "aplikacija\n" "poboljšala. Ovo može potrajati nekoliko minuta." -#: ../gtk/apport-gtk.ui.h:17 ../kde/apport-kde.py:435 ../bin/apport-cli.py:267 -#: ../debian/tmp/usr/bin/apport-cli.py:267 -#: ../debian/tmp/usr/share/apport/apport-kde.py:435 -#: ../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-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 +#: ../kde/apport-kde.py:435 ../debian/tmp/usr/share/apport/apport-kde.py:435 msgid "Uploading problem information" msgstr "Slanje informacija o problemu" @@ -167,360 +283,37 @@ #: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 msgid "To continue, you must visit the following URL:" msgstr "Za nastavak, morate posjetiti sljedeći URL:" - -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 -msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." -msgstr "" -"Sada možete pokrenuti internet preglednik, ili kopirati ovaj URL u " -"preglednik na drugom računalu." - -#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "Pokreni preglednik odmah" - -#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 -msgid "No pending crash reports. Try --help for more information." -msgstr "" -"Nema izvještaja o rušenju koji su na čekanju. Pokušajte s --help za više " -"informacija." - -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "Pogledajte man stranice za više pojedinosti." - -#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "odredi naziv datoteke zaspisa koju je stvorio valgrind" - -#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 -msgid "" -"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " -"create it" -msgstr "" -"ponovno koristi prije stvoreni sandbox direktorij (SDIR) ili, ako ne " -"postoji, stvori ga" - -#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 -msgid "" -"do not create or reuse a sandbox directory for additional debug symbols " -"but rely only on installed debug symbols." -msgstr "" -"ne stvaraj ili ponovno koristi sandbox direktorij za dodatne simbole " -"otklanjanja greške nego se samo oslanjaj na instalirane simbole otklanjanja " -"greške." - -#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 -msgid "" -"reuse a previously created cache dir (CDIR) or, if it does not exist, create " -"it" -msgstr "" -"ponovno koristi prije stvoreni direktorij predmemorije (CDIR) ili, ako ne " -"postoji, stvori ga" - -#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 -msgid "" -"report download/install progress when installing packages into sandbox" -msgstr "" -"prijavi napredak preuzimanja/instalacije prilikom instalacije paketa u " -"sandbox" - -#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 -msgid "" -"the executable that is run under valgrind's memcheck tool for memory leak " -"detection" -msgstr "" -"izvršna datoteka koja se pokreće pod valgrindovim alatom provjere memorije " -"zbog otkrivanja problema s memorijom" - -#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65 -msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" -msgstr "Instaliraj dodatne pakete u sandbox (može se odrediti više puta)" - -#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 -#, python-format -msgid "Error: %s is not an executable. Stopping." -msgstr "Greška: %s nije izvršna datoteka. Zaustavljanje." - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 -#, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "Aplikacija %s je neočekivano zaustavljena." - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "%s se neočekivano zatvorio." - -#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-kde.py:200 -#: ../debian/tmp/usr/share/apport/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169 -#, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "%s je iskusio unutrašnju grešku." - -#: ../gtk/apport-gtk.ui.h:14 ../kde/apport-kde.py:194 -#: ../debian/tmp/usr/share/apport/apport-kde.py:194 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.py:188 -msgid "Send" -msgstr "Pošalji" - -#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:292 -#: ../debian/tmp/usr/share/apport/apport-kde.py:292 -#: ../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 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:575 -msgid "Show Details" -msgstr "Prikaži pojedinosti" - -#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216 -msgid "Continue" -msgstr "Nastavi" - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 -#, python-format -msgid "The application %s has stopped responding." -msgstr "Aplikacija %s više ne odgovara." - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "Program \"%s\" više ne odgovara." - -#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259 -#, python-format -msgid "Package: %s" -msgstr "Paket: %s" - -#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265 -msgid "Sorry, a problem occurred while installing software." -msgstr "Problem se dogodio tijekom instalacije softvera." - -#: ../kde/apport-kde.py:220 ../debian/tmp/usr/share/apport/apport-kde.py:220 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 -#: ../gtk/apport-gtk.py:289 -#, python-format -msgid "The application %s has experienced an internal error." -msgstr "Aplikacija %s je iskusila unutrašnju grešku." - -#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277 -#, python-format -msgid "The application %s has closed unexpectedly." -msgstr "Aplikacija %s se zatvorila neočekivano." - -#: ../gtk/apport-gtk.ui.h:7 ../kde/apport-kde.py:241 -#: ../debian/tmp/usr/share/apport/apport-kde.py:241 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:297 -msgid "If you notice further problems, try restarting the computer." -msgstr "" -"Ako primjetite daljne probleme, pokušajte ponovno pokrenuti računalo." - -#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299 -msgid "Ignore future problems of this type" -msgstr "Zanemari buduće probleme ove vrste" - -#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579 -msgid "Hide Details" -msgstr "Sakrij pojedinosti" - -#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 -msgid "Leave Closed" -msgstr "Ostavi zatvoreno" - -#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381 -#: ../debian/tmp/usr/share/apport/apport-kde.py:235 -#: ../debian/tmp/usr/share/apport/apport-kde.py:381 -msgid "Relaunch" -msgstr "Pokreni ponovo" - -#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 -msgid "Username:" -msgstr "Korisničko Ime:" - -#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 -msgid "Password:" -msgstr "Lozinka:" - -#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 -msgid "Collecting Problem Information" -msgstr "Prikupljanje Informacija o problemu" - -#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 -msgid "" -"The collected information can be sent to the developers to improve the " -"application. This might take a few minutes." -msgstr "" -"Prikupljene informacije mogu biti poslane razvijateljima kako bi se " -"aplikacija poboljšala. Ovo može potrajati nekoliko minuta." - -#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 -msgid "Uploading Problem Information" -msgstr "Slanje informacija o problemu" - -#: ../gtk/apport-gtk.ui.h:19 ../kde/apport-kde.py:436 -#: ../debian/tmp/usr/share/apport/apport-kde.py:436 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 -msgid "" -"The collected information is being sent to the bug tracking system. This " -"might take a few minutes." -msgstr "" -"Prikupljene informacije se šalju sustavu za praćenje grešaka. Ovo može " -"potrajati nekoliko minuta." - -#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 -#: ../kde/apport-kde.py:524 ../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 -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 -msgid "Apport" -msgstr "Apport" - -#: ../kde/apport-kde.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 -msgid "Report a problem..." -msgstr "Prijavite problem..." - -#: ../kde/apport-kde.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 -msgid "Report a malfunction to the developers" -msgstr "Prijavite neispravnost razvojnom timu" - -#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "" -"Moguće je da vaš sustav postane nestabilan i zatreba ponovno pokretanje." - -#: ../gtk/apport-gtk.ui.h:2 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 -msgid "Cancel" -msgstr "Odustani" - -#: ../gtk/apport-gtk.ui.h:3 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 -msgid "OK" -msgstr "U redu" - -#: ../gtk/apport-gtk.ui.h:4 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 -msgid "Crash report" -msgstr "Izvještaj rušenja" - -#: ../gtk/apport-gtk.ui.h:5 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 -msgid "Sorry, an internal error happened." -msgstr "Nažalost, dogodila se unutrašnja greška." - -#: ../gtk/apport-gtk.ui.h:8 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 -msgid "Remember this in future" -msgstr "Zapamti ovo za ubuduće" - -#: ../gtk/apport-gtk.ui.h:9 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:9 -msgid "Ignore future problems of this program version" -msgstr "Zanemari buduće probleme za progam ove inačice" - -#: ../gtk/apport-gtk.ui.h:10 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 -msgid "Relaunch this application" -msgstr "Ponovno pokreni ovu aplikaciju" - -#: ../gtk/apport-gtk.ui.h:12 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 -msgid "_Examine locally" -msgstr "_Pregledaj lokalno" - -#: ../gtk/apport-gtk.ui.h:13 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 -msgid "Don't send" -msgstr "Ne šalji" - -#: ../gtk/apport-gtk.ui.h:15 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 -msgid "Collecting problem information" -msgstr "Prikupljanje informacija o problemu" - -#: ../gtk/apport-gtk.ui.h:16 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 -msgid "" -"Information is being collected that may help the developers fix the problem " -"you report." -msgstr "" -"Prikupljaju se informacije koje mogu pomoći razvijateljima u popravljanju " -"problema koji prijavljujete." - -#: ../gtk/apport-gtk.ui.h:18 ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 -msgid "Uploading problem information" -msgstr "Učitavanje informacija o problemu" - -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "Prikupljanje informacija o sustavu" - -#: ../apport/com.ubuntu.apport.policy.in.h:2 -msgid "" -"Authentication is required to collect system information for this problem " -"report" -msgstr "" -"Ovjera je potrebna za prikupljanje informacija o sustavu za ovaj izvještaj " -"problema" - -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "Izvještaji o problemu sustava" - -#: ../apport/com.ubuntu.apport.policy.in.h:4 -msgid "" -"Please enter your password to access problem reports of system programs" -msgstr "" -"Upišite svoju lozinku za pristup izvještajima problema programa sustava" - -#: ../data/apportcheckresume.py:67 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 -msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." -msgstr "" -"Ovo je nastalo tijekom prijašnje suspenzije i spriječilo je ispravno " -"pokretanje sustava." - -#: ../data/apportcheckresume.py:69 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 -msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." -msgstr "" -"Ovo je nastalo tijekom prijašnje hibernacije i spriječilo je ispravno " -"pokretanje sustava." - -#: ../data/apportcheckresume.py:74 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 + +#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." +"You can launch a browser now, or copy this URL into a browser on another " +"computer." msgstr "" -"Postupak pokretanja se prekinuo pred sam kraj i završit će se u potpunosti " -"normalno." +"Sada možete pokrenuti internet preglednik, ili kopirati ovaj URL u " +"preglednik na drugom računalu." -#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " -msgstr "Upotreba: %s " +#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "Pokreni preglednik odmah" -#: ../bin/apport-unpack.py:42 ../debian/tmp/usr/bin/apport-unpack.py:42 -msgid "Destination directory exists and is not empty." -msgstr "Direktorji odredišta postoji i nije prazan." +#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." +msgstr "" +"Nema izvještaja o rušenju koji su na čekanju. Pokušajte s --help za više " +"informacija." #: ../kde/apport-kde-mimelnk.desktop.in.h:1 msgid "Apport crash file" msgstr "Apport datoteka o rušenju" +#: ../data/kernel_oops.py:29 ../debian/tmp/usr/share/apport/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "" +"Moguće je da vaš sustav postane nestabilan i zatreba ponovno pokretanje." + #: ../apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:139 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:139 msgid "This package does not seem to be installed correctly" msgstr "Izgleda da ovaj paket nije ispravno instaliran" @@ -536,6 +329,8 @@ "ponovno." #: ../apport/ui.py:166 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:166 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:166 #, python-format msgid "" @@ -550,24 +345,34 @@ "%s" #: ../apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:303 msgid "unknown program" msgstr "nepoznati program" #: ../apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:304 #, python-format msgid "Sorry, the program \"%s\" closed unexpectedly" msgstr "Program \"%s\" se neočekivano zatvorio" -#: ../apport/ui.py:306 ../apport/ui.py:1458 +#: ../apport/ui.py:306 ../apport/ui.py:1459 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:306 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1459 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1459 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1458 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1459 #, python-format msgid "Problem in %s" msgstr "Problem u %s" #: ../apport/ui.py:307 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:307 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:307 msgid "" "Your computer does not have enough free memory to automatically analyze the " @@ -578,70 +383,110 @@ #: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:519 #: ../apport/ui.py:522 ../apport/ui.py:727 ../apport/ui.py:1264 -#: ../apport/ui.py:1430 ../apport/ui.py:1434 +#: ../apport/ui.py:1431 ../apport/ui.py:1435 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:362 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:370 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:519 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:522 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:727 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1264 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1431 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1435 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:362 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:370 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:519 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:522 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:727 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1264 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1431 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1435 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:362 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:370 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:519 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:522 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:727 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1264 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1434 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1431 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1435 msgid "Invalid problem report" msgstr "Neispravan izvještaj o problemu" #: ../apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:363 msgid "You are not allowed to access this problem report." msgstr "Niste ovlašteni za pristup ovom izvještaju o problemu." #: ../apport/ui.py:366 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:366 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:366 msgid "Error" msgstr "Greška" #: ../apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:367 msgid "There is not enough disk space available to process this report." msgstr "Nema dovoljno prostora na disku za obradu ovog izvještaja." #: ../apport/ui.py:403 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:403 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:403 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:403 msgid "No PID specified" msgstr "PID nije naveden" #: ../apport/ui.py:404 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:404 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:404 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:404 msgid "You need to specify a PID. See --help for more information." msgstr "Morate navesti PID. Pogledajte --help za više informacija." #: ../apport/ui.py:411 ../apport/ui.py:500 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:411 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:500 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:411 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:500 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:411 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:500 msgid "Invalid PID" msgstr "Neispravan PID" #: ../apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:412 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:412 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:412 msgid "The specified process ID does not exist." msgstr "Određeni ID procesa ne postoji." #: ../apport/ui.py:415 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:415 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:415 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:415 msgid "Not your PID" msgstr "Nije vaš PID" #: ../apport/ui.py:416 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:416 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:416 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:416 msgid "The specified process ID does not belong to you." msgstr "Određeni ID procesa vam ne pripada." #: ../apport/ui.py:467 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:467 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:467 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:467 msgid "No package specified" msgstr "Nema određenih paketa" #: ../apport/ui.py:468 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:468 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:468 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:468 msgid "" "You need to specify a package or a PID. See --help for more information." @@ -649,11 +494,15 @@ "Morate odrediti paket ili PID. Pogledajte --help za više informacija." #: ../apport/ui.py:497 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:497 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:497 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:497 msgid "Permission denied" msgstr "Pristup odbijen" #: ../apport/ui.py:498 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:498 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:498 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:498 msgid "" "The specified process does not belong to you. Please run this program as the " @@ -662,23 +511,35 @@ "Određeni proces vam ne pripada. Pokrenite ovaj program kao root korisnik." #: ../apport/ui.py:501 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:501 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:501 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:501 msgid "The specified process ID does not belong to a program." msgstr "Određeni ID proces ne pripada programu." #: ../apport/ui.py:520 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:520 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:520 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:520 #, python-format msgid "Symptom script %s did not determine an affected package" msgstr "Skripta simptoma %s nije odredila zahvaćeni paket" #: ../apport/ui.py:523 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:523 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:523 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:523 #, python-format msgid "Package %s does not exist" msgstr "Paket %s ne postoji" #: ../apport/ui.py:552 ../apport/ui.py:739 ../apport/ui.py:744 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:552 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:739 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:744 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:552 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:744 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:552 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:739 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:744 @@ -686,6 +547,12 @@ msgstr "Ne mogu napraviti izvještaj" #: ../apport/ui.py:567 ../apport/ui.py:613 ../apport/ui.py:629 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:567 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:613 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:629 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:567 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:613 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:629 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:567 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:613 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:629 @@ -693,6 +560,8 @@ msgstr "Nadopuna izvještaja problema" #: ../apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:568 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:568 msgid "" "You are not the reporter or subscriber of this problem report, or the report " @@ -706,6 +575,8 @@ "Napravite novi izvještaj koristeći \"apport-bug\"." #: ../apport/ui.py:577 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:577 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:577 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:577 msgid "" "You are not the reporter of this problem report. It is much easier to mark a " @@ -727,28 +598,40 @@ "Želite li stvarno nastaviti?" #: ../apport/ui.py:614 ../apport/ui.py:630 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:614 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:630 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:614 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:630 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:614 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:630 msgid "No additional information collected." msgstr "Nisu prikupljene dodatne informacije." #: ../apport/ui.py:681 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:681 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:681 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:681 msgid "What kind of problem do you want to report?" msgstr "Kakav problem želite prijaviti?" #: ../apport/ui.py:698 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:698 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:698 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:698 msgid "Unknown symptom" msgstr "Nepoznat simptom" #: ../apport/ui.py:699 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:699 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:699 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:699 #, python-format msgid "The symptom \"%s\" is not known." msgstr "Simptom \"%s\" nije poznat." #: ../apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:730 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:730 msgid "" "After closing this message please click on an application window to report a " @@ -758,28 +641,42 @@ "problema." #: ../apport/ui.py:740 ../apport/ui.py:745 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:740 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:745 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:740 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:745 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:740 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:745 msgid "xprop failed to determine process ID of the window" msgstr "xprop nije uspio odrediti proces ID prozora" #: ../apport/ui.py:759 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:759 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:759 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:759 msgid "%prog " msgstr "%prog " #: ../apport/ui.py:761 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:761 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:761 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:761 msgid "Specify package name." msgstr "Odredite naziv paketa." #: ../apport/ui.py:763 ../apport/ui.py:815 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:763 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:815 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:763 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:815 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:763 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:815 msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "Dodajte dodatnu oznaku u izvještaj. Moguće je odrediti više puta." #: ../apport/ui.py:794 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:794 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:794 msgid "" "%prog [options] [symptom|pid|package|program path|.apport/.crash file]" @@ -788,6 +685,8 @@ "datoteka]" #: ../apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:797 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:797 msgid "" "Start in bug filing mode. Requires --package and an optional --pid, or just " @@ -799,16 +698,22 @@ "simptoma. (Podrazumijeva se ako je jedan argument zadan.)" #: ../apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:799 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:799 msgid "Click a window as a target for filing a problem report." msgstr "Kliknite na prozor kao cilj za podnošenje izvještaja o problemu." #: ../apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:801 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:801 msgid "Start in bug updating mode. Can take an optional --package." msgstr "Početak načina nadopune greške. Može se dodati po izboru --package." #: ../apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:803 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:803 msgid "" "File a bug report about a symptom. (Implied if symptom name is given as only " @@ -818,6 +723,8 @@ "naveden kao jedini argument.)" #: ../apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:805 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:805 msgid "" "Specify package name in --file-bug mode. This is optional if a --pid is " @@ -827,6 +734,8 @@ "naveden. (Podrazumijeva se ako je naziv paketa naveden kao jedini argument.)" #: ../apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:807 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:807 msgid "" "Specify a running program in --file-bug mode. If this is specified, the bug " @@ -838,11 +747,15 @@ "kao jedini argument.)" #: ../apport/ui.py:809 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:809 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:809 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:809 msgid "The provided pid is a hanging application." msgstr "Zadani pid prekida aplikaciju." #: ../apport/ui.py:811 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:811 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:811 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:811 #, python-format msgid "" @@ -854,6 +767,8 @@ "argument.)" #: ../apport/ui.py:813 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:813 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:813 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:813 msgid "" "In bug filing mode, save the collected information into a file instead of " @@ -865,11 +780,15 @@ "računala." #: ../apport/ui.py:817 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:817 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:817 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:817 msgid "Print the Apport version number." msgstr "Ispiši broj Apport inačice." #: ../apport/ui.py:968 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:968 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:968 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:968 msgid "" "This will launch apport-retrace in a terminal window to examine the crash." @@ -877,28 +796,38 @@ "To će pokrenuti apport-retrace u prozoru terminala zbog ispitivanja rušenja." #: ../apport/ui.py:969 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:969 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:969 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:969 msgid "Run gdb session" msgstr "Pokreni gdb sesiju" #: ../apport/ui.py:970 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:970 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:970 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:970 msgid "Run gdb session without downloading debug symbols" msgstr "Pokreni gdb sesiju bez preuzimanja simbola otklanjanja greške" #. TRANSLATORS: %s contains the crash report file name #: ../apport/ui.py:972 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:972 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:972 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:972 #, python-format msgid "Update %s with fully symbolic stack trace" msgstr "Nadopuni %s s potpunim simboličkim opširnim zapisom" #: ../apport/ui.py:1008 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1008 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1008 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1008 msgid "Can't remember send report status settings" msgstr "Nemoguće zapamtiti postavke stanja slanja izvještaja" #: ../apport/ui.py:1009 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1009 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1009 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1009 msgid "" "Saving crash reporting state failed. Can't set auto or never reporting mode." @@ -907,6 +836,10 @@ "automatskog ili isključenog načina." #: ../apport/ui.py:1068 ../apport/ui.py:1078 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1078 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1078 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1068 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1078 msgid "" @@ -915,6 +848,8 @@ "Ovaj izvještaj problema se odnosi na program koji više nije instaliran." #: ../apport/ui.py:1093 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1093 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1093 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1093 #, python-format msgid "" @@ -923,24 +858,36 @@ msgstr "" "Dogodio se problem s programom %s koji se promijenio otkada se srušio." -#: ../apport/ui.py:1140 ../apport/ui.py:1221 ../apport/ui.py:1436 +#: ../apport/ui.py:1140 ../apport/ui.py:1221 ../apport/ui.py:1437 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1140 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1221 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1437 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1140 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1221 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1437 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1140 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1221 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1436 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1437 msgid "This problem report is damaged and cannot be processed." msgstr "Ovaj izvještaj o problemu je oštećen i ne može biti obrađen." #: ../apport/ui.py:1145 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1145 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1145 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1145 msgid "This report is about a package that is not installed." msgstr "Ovaj izvještaj je o paketu koji nije instaliran." #: ../apport/ui.py:1149 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1149 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1149 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1149 msgid "An error occurred while attempting to process this problem report:" msgstr "Došlo je do greške pri pokušaju obrade izvještaja problema:" #: ../apport/ui.py:1159 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1159 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1159 msgid "" "You have two versions of this application installed, which one do you want " @@ -950,18 +897,24 @@ "grešku?" #: ../apport/ui.py:1160 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1160 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1160 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1160 #, python-format msgid "%s snap" msgstr "%s snap paket" #: ../apport/ui.py:1161 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1161 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1161 #, python-format msgid "%s deb package" msgstr "%s deb paket" #: ../apport/ui.py:1194 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1194 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1194 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1194 #, python-format msgid "" @@ -971,6 +924,8 @@ "putem %s za pomoć." #: ../apport/ui.py:1196 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1196 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1196 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1196 #, python-format msgid "" @@ -981,55 +936,73 @@ "kontakt, posjetite forum https://forum.snapcraft.io/ za pomoć." #: ../apport/ui.py:1265 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1265 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1265 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1265 msgid "Could not determine the package or source package name." msgstr "Ne može se odrediti paket ili naziv izvornog paketa." #: ../apport/ui.py:1283 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1283 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1283 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1283 msgid "Unable to start web browser" msgstr "Nemoguće pokretanje Internet preglednika" #: ../apport/ui.py:1284 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1284 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1284 #: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1284 #, python-format msgid "Unable to start web browser to open %s." msgstr "Nemoguće pokretanje Internet preglednik za otvaranje %s." -#: ../apport/ui.py:1384 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1384 +#: ../apport/ui.py:1385 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1385 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1385 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1385 #, python-format msgid "Please enter your account information for the %s bug tracking system" msgstr "" "Upišite informacije vašeg korisničkog računa za %s sustav praćenja grešaka" -#: ../apport/ui.py:1396 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1396 +#: ../apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1397 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1397 msgid "Network problem" msgstr "Problem s mrežom" -#: ../apport/ui.py:1398 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1398 +#: ../apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1399 msgid "" "Cannot connect to crash database, please check your Internet connection." msgstr "" "Nemoguće povezivanje na bazu podataka rušenja. Provjerite vaš pristup " "Internetu." -#: ../apport/ui.py:1425 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1425 +#: ../apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1426 msgid "Memory exhaustion" msgstr "Nedostatak memorije" -#: ../apport/ui.py:1426 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1426 +#: ../apport/ui.py:1427 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1427 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1427 msgid "Your system does not have enough memory to process this crash report." msgstr "" "Vaš sustav nema dovoljno memorije za obradu ovog izvještaja o rušenju " "sustava." -#: ../apport/ui.py:1461 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1461 +#: ../apport/ui.py:1462 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1462 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1462 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1462 #, python-format msgid "" "The problem cannot be reported:\n" @@ -1040,14 +1013,20 @@ "\n" "%s" -#: ../apport/ui.py:1517 ../apport/ui.py:1524 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1517 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1524 +#: ../apport/ui.py:1518 ../apport/ui.py:1525 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1518 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1525 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1518 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1525 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1518 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1525 msgid "Problem already known" msgstr "Problem je već poznat" -#: ../apport/ui.py:1518 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1518 +#: ../apport/ui.py:1519 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1519 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1519 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1519 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 " @@ -1057,45 +1036,78 @@ "internet pregledniku. Provjerite možete li dodati neke dodatne informacije " "koje mogu pomoći razvijateljima." -#: ../apport/ui.py:1525 -#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1525 +#: ../apport/ui.py:1526 +#: ../debian/tmp/usr/lib/python3.10/dist-packages/apport/ui.py:1526 +#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1526 +#: ../debian/tmp/usr/lib/python3.9/dist-packages/apport/ui.py:1526 msgid "This problem was already reported to developers. Thank you!" msgstr "Ovaj problem je već prijavljen razvijateljima. Hvala Vam!" -#: ../data/general-hooks/ubuntu.py:200 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:200 +#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 +msgid "Leave Closed" +msgstr "Ostavi zatvoreno" + +#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381 +#: ../debian/tmp/usr/share/apport/apport-kde.py:235 +#: ../debian/tmp/usr/share/apport/apport-kde.py:381 +msgid "Relaunch" +msgstr "Pokreni ponovo" + +#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 +msgid "Username:" +msgstr "Korisničko Ime:" + +#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 +msgid "Password:" +msgstr "Lozinka:" + +#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 +msgid "Collecting Problem Information" +msgstr "Prikupljanje Informacija o problemu" + +#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 msgid "" -"An Ubuntu package has a file conflict with a package that is not a genuine " -"Ubuntu package." -msgstr "Ubuntu paket je u sukob s paketom koji nije izvorni Ubuntu paket." +"The collected information can be sent to the developers to improve the " +"application. This might take a few minutes." +msgstr "" +"Prikupljene informacije mogu biti poslane razvijateljima kako bi se " +"aplikacija poboljšala. Ovo može potrajati nekoliko minuta." -#: ../data/general-hooks/ubuntu.py:208 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:208 -msgid "You have already encountered this package installation failure." -msgstr "Već ste naišli na neuspjeh instalacije ovog paketa." +#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 +msgid "Uploading Problem Information" +msgstr "Slanje informacija o problemu" -#: ../data/general-hooks/ubuntu.py:224 -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:224 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19 +#: ../kde/apport-kde.py:436 ../debian/tmp/usr/share/apport/apport-kde.py:436 msgid "" -"Your system was initially configured with grub version 2, but you have " -"removed it from your system in favor of grub 1 without configuring it. To " -"ensure your bootloader configuration is updated whenever a new kernel is " -"available, open a terminal and run:\n" -"\n" -" sudo apt-get install grub-pc\n" +"The collected information is being sent to the bug tracking system. This " +"might take a few minutes." msgstr "" -"Vaš sustav je početno podešen za rad s grubom inačice 2, ali ste ga uklonili " -"s vašeg sustava u zamjenu za grub 1 bez naknadnog podešavanja. Da bi " -"osigurali nadopunu vašeg podešavanja boot učitača kada god je novi kernel " -"dostupan, otvorite terminal i upišite:\n" -"\n" -" sudo apt-get install grub-pc\n" +"Prikupljene informacije se šalju sustavu za praćenje grešaka. Ovo može " +"potrajati nekoliko minuta." -#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 +#: ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-kde.py:469 +#: ../debian/tmp/usr/share/apport/apport-kde.py:504 +#: ../debian/tmp/usr/share/apport/apport-kde.py:524 +msgid "Apport" +msgstr "Apport" + +#: ../bin/apport-unpack.py:22 ../debian/tmp/usr/bin/apport-unpack.py:22 +#, python-format +msgid "Usage: %s " +msgstr "Upotreba: %s " + +#: ../bin/apport-unpack.py:42 ../debian/tmp/usr/bin/apport-unpack.py:42 +msgid "Destination directory exists and is not empty." +msgstr "Direktorji odredišta postoji i nije prazan." + +#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34 msgid "Do not put the new traces into the report, but write them to stdout." msgstr "Ne spremaj nove podatke u izvještaj, već ih zapiši u stdout." -#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 +#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 msgid "" "Start an interactive gdb session with the report's core dump (-o ignored; " "does not rewrite report)" @@ -1103,35 +1115,35 @@ "Pokreni interaktivnu gdb sesiju s izvještajima sadržaja jezgre (-o " "zanemareno; ne prepisuje izvještaj)" -#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 +#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 msgid "" "Write modified report to given file instead of changing the original report" msgstr "" "Zapiši izmijenjen izvještaj za zadanu datoteku umjesto promjene izvornog " "izvještaja" -#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 msgid "Remove the core dump from the report after stack trace regeneration" msgstr "" "Ukloni sadržaj jezgre iz izvještaja nakon regeneracije opširnog zapisa" -#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 msgid "Override report's CoreFile" msgstr "Zaobiđi datoteku jezgre izvještaja" -#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 msgid "Override report's ExecutablePath" msgstr "Zaobiđi izvršnu putanju izvještaja" -#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 msgid "Override report's ProcMaps" msgstr "Zaobiđi ProcMaps izvještaja" -#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 msgid "Rebuild report's Package information" msgstr "Obnovi izvještaje o informacijama paketa" -#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 +#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 msgid "" "Build a temporary sandbox and download/install the necessary packages and " "debug symbols in there; without this option it assumes that the necessary " @@ -1148,7 +1160,7 @@ "onda samo biti moguće zapisivati rušenja koja su se dogodila na trenutno " "pokrenutom izdanju." -#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 +#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 msgid "" "Build another temporary sandbox for installing gdb and its dependencies " "using the same release as the report rather than whatever version of gdb you " @@ -1158,27 +1170,27 @@ "zavisnosti upotrebom istog izdanja kao izvještaja bez obzira koju gdb " "inačicu imate instaliranu." -#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 msgid "" "Report download/install progress when installing packages into sandbox" msgstr "" "Prijavi napredak preuzimanja/instalacije tijekom instalacije paketa u sandbox" -#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 +#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 msgid "Prepend timestamps to log messages, for batch operation" msgstr "Dodaj vremenske oznake u poruke zapisa, za skupne radnje" -#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 msgid "" "Create and use third-party repositories from origins specified in reports" msgstr "" "Stvori i koristi repozitorije treće strane iz izvora navedenih u izvješću" -#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 msgid "Cache directory for packages downloaded in the sandbox" msgstr "Direktorij predmemorije za pakete preuzete u sandboxu" -#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 +#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 msgid "" "Directory for unpacked packages. Future runs will assume that any already " "downloaded package is also extracted to this sandbox." @@ -1186,7 +1198,13 @@ "Direktorij za neraspakirane pakete. Buduća pokretanja će pretpostaviti da " "svaki preuzeti paket je isto tako raspakiran u sandboxu." -#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 +#: ../bin/apport-retrace.py:65 ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../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 "Instaliraj dodatne pakete u sandbox (može se odrediti više puta)" + +#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 msgid "" "Path to a file with the crash database authentication information. This is " "used when specifying a crash ID to upload the retraced stack traces (only if " @@ -1196,7 +1214,7 @@ "koristi pri određivanju ID-a rušenja za slanje ponovljenog opširnog " "zapisivanja (samo ako su -g, -o, ili -s određeni)" -#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 msgid "" "Display retraced stack traces and ask for confirmation before sending them " "to the crash database." @@ -1204,22 +1222,186 @@ "Prikaži ponovljeno opširno zapisivanje i traži potvrdu prije slanja u bazu " "podataka rušenja." -#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 +#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 msgid "" "Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "" "Putanja do kopije sqlite baze podataka (zadano: bez provjere ima li još " "kopija)" -#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 +#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 msgid "Do not add StacktraceSource to the report." msgstr "Nemoj dodati opširni zapis u izvješće." -#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 +#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 msgid "You cannot use -C without -S. Stopping." msgstr "Ne možete koristiti -C bez -S. Zaustavljanje." #. translators: don't translate y/n, apport currently only checks for "y" -#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115 +#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115 msgid "OK to send these as attachments? [y/n]" msgstr "Je li u redu poslati ovo kao privitke? [y/n]" + +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 +msgid "Report a problem..." +msgstr "Prijavite problem..." + +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 +#: ../kde/apport-kde-mime.desktop.in.h:2 +msgid "Report a malfunction to the developers" +msgstr "Prijavite neispravnost razvojnom timu" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 +msgid "Cancel" +msgstr "Odustani" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 +msgid "OK" +msgstr "U redu" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 +msgid "Crash report" +msgstr "Izvještaj rušenja" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:5 ../gtk/apport-gtk.ui.h:5 +msgid "Sorry, an internal error happened." +msgstr "Nažalost, dogodila se unutrašnja greška." + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 +msgid "Remember this in future" +msgstr "Zapamti ovo za ubuduće" + +#: ../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 "Zanemari buduće probleme za progam ove inačice" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:10 ../gtk/apport-gtk.ui.h:10 +msgid "Relaunch this application" +msgstr "Ponovno pokreni ovu aplikaciju" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 +msgid "_Examine locally" +msgstr "_Pregledaj lokalno" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:13 ../gtk/apport-gtk.ui.h:13 +msgid "Don't send" +msgstr "Ne šalji" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 +msgid "Collecting problem information" +msgstr "Prikupljanje informacija o problemu" + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16 +msgid "" +"Information is being collected that may help the developers fix the problem " +"you report." +msgstr "" +"Prikupljaju se informacije koje mogu pomoći razvijateljima u popravljanju " +"problema koji prijavljujete." + +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 +msgid "Uploading problem information" +msgstr "Učitavanje informacija o problemu" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 +msgid "" +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." +msgstr "" +"Ovo je nastalo tijekom prijašnje suspenzije i spriječilo je ispravno " +"pokretanje sustava." + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 +msgid "" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." +msgstr "" +"Ovo je nastalo tijekom prijašnje hibernacije i spriječilo je ispravno " +"pokretanje sustava." + +#: ../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." +msgstr "" +"Postupak pokretanja se prekinuo pred sam kraj i završit će se u potpunosti " +"normalno." + +#: ../debian/tmp/usr/bin/apport-valgrind.py:37 ../bin/apport-valgrind.py:37 +msgid "See man page for details." +msgstr "Pogledajte man stranice za više pojedinosti." + +#: ../debian/tmp/usr/bin/apport-valgrind.py:43 ../bin/apport-valgrind.py:43 +msgid "specify the log file name produced by valgrind" +msgstr "odredi naziv datoteke zaspisa koju je stvorio valgrind" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:46 ../bin/apport-valgrind.py:46 +msgid "" +"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " +"create it" +msgstr "" +"ponovno koristi prije stvoreni sandbox direktorij (SDIR) ili, ako ne " +"postoji, stvori ga" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:50 ../bin/apport-valgrind.py:50 +msgid "" +"do not create or reuse a sandbox directory for additional debug symbols " +"but rely only on installed debug symbols." +msgstr "" +"ne stvaraj ili ponovno koristi sandbox direktorij za dodatne simbole " +"otklanjanja greške nego se samo oslanjaj na instalirane simbole otklanjanja " +"greške." + +#: ../debian/tmp/usr/bin/apport-valgrind.py:54 ../bin/apport-valgrind.py:54 +msgid "" +"reuse a previously created cache dir (CDIR) or, if it does not exist, create " +"it" +msgstr "" +"ponovno koristi prije stvoreni direktorij predmemorije (CDIR) ili, ako ne " +"postoji, stvori ga" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:58 ../bin/apport-valgrind.py:58 +msgid "" +"report download/install progress when installing packages into sandbox" +msgstr "" +"prijavi napredak preuzimanja/instalacije prilikom instalacije paketa u " +"sandbox" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:62 ../bin/apport-valgrind.py:62 +msgid "" +"the executable that is run under valgrind's memcheck tool for memory leak " +"detection" +msgstr "" +"izvršna datoteka koja se pokreće pod valgrindovim alatom provjere memorije " +"zbog otkrivanja problema s memorijom" + +#: ../debian/tmp/usr/bin/apport-valgrind.py:97 ../bin/apport-valgrind.py:97 +#, python-format +msgid "Error: %s is not an executable. Stopping." +msgstr "Greška: %s nije izvršna datoteka. Zaustavljanje." + +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "Prikupljanje informacija o sustavu" + +#: ../apport/com.ubuntu.apport.policy.in.h:2 +msgid "" +"Authentication is required to collect system information for this problem " +"report" +msgstr "" +"Ovjera je potrebna za prikupljanje informacija o sustavu za ovaj izvještaj " +"problema" + +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "Izvještaji o problemu sustava" + +#: ../apport/com.ubuntu.apport.policy.in.h:4 +msgid "" +"Please enter your password to access problem reports of system programs" +msgstr "" +"Upišite svoju lozinku za pristup izvještajima problema programa sustava" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/appstream-glib.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/appstream-glib.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/appstream-glib.po 2021-08-03 09:03:58.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/appstream-glib.po 2022-02-11 23:13:52.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:29+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:26+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #. TRANSLATORS: command line option #: client/as-builder.c:90 client/as-compose.c:340 client/as-util.c:4173 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/appstream.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/appstream.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/appstream.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/appstream.po 2022-02-11 23:13:45.000000000 +0000 @@ -15,16 +15,16 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:21+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:18+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" -#: tools/appstream-cli.c:156 +#: tools/appstreamcli.c:157 #, c-format msgid "'%s' command" msgstr "„%s” naredba" -#: src/as-category.c:168 +#: src/as-category.c:169 msgctxt "Category of Graphics" msgid "3D Graphics" msgstr "3D grafike" @@ -45,7 +45,7 @@ "(metapodaci glevne grane). Umjesto toga lokaliziraj pojedinačne odlomke." #. TRANSLATORS: Please do not translate AppStream tag and property names (in backticks). -#: src/as-validator-issue-tag.h:200 +#: src/as-validator-issue-tag.h:210 msgid "" "A screenshot must contain at least one image or video in order to be useful. " "Please add an to it." @@ -53,7 +53,7 @@ "Snimka ekrana mora sadržati barem jednu sliku ili videozapis, da bi bila " "korisna. Dodaj joj oznaku ." -#: src/as-validator-issue-tag.h:205 +#: src/as-validator-issue-tag.h:215 msgid "" "A screenshot must contain either images or videos, but not both at the same " "time. Please use this screenshot exclusively for either static images or for " @@ -62,24 +62,24 @@ "Snimka ekrana mora sadržati slike ili videozapise, ali ne oboje istovremeno. " "Koristi ovu snimku ekrana samo za statične slike ili videozapise." -#: src/as-category.c:123 +#: src/as-category.c:124 msgctxt "Category of Games" msgid "Action" msgstr "Akcijske igre" #. TRANSLATORS: this is the main category for Add-ons #. TRANSLATORS: Addons are extensions for existing software components, e.g. support for more visual effects for a video editor -#: src/as-category.c:320 tools/ascli-utils.c:371 +#: src/as-category.c:321 tools/ascli-utils.c:371 msgid "Add-ons" msgstr "Dodaci" -#: src/as-category.c:126 +#: src/as-category.c:127 msgctxt "Category of Games" msgid "Adventure" msgstr "Pustolovne igre" #. TRANSLATORS: ascli flag description for: --pedantic (used by the "validate" command) -#: tools/appstream-cli.c:118 +#: tools/appstreamcli.c:119 msgid "Also show pedantic hints." msgstr "Također pokaži pedantne savjete." @@ -103,7 +103,7 @@ msgstr "AppStream CLI" #. TRANSLATORS: Output if appstreamcli --version is run and the CLI and libappstream versions differ. -#: tools/appstream-cli.c:1202 +#: tools/appstream-compose.c:250 tools/appstreamcli.c:1279 #, c-format msgid "" "AppStream CLI tool version: %s\n" @@ -113,7 +113,7 @@ "Verzija AppStream biblioteke: %s" #. TRANSLATORS: In the status report of ascli: Header -#: tools/ascli-actions-misc.c:47 +#: tools/ascli-actions-misc.c:48 msgid "AppStream Status:" msgstr "AppStream stanje:" @@ -130,7 +130,7 @@ #. TRANSLATORS: This is the header to the --help menu for subcommands #. TRANSLATORS: This is the header to the --help menu -#: tools/appstream-cli.c:153 tools/appstream-cli.c:956 +#: tools/appstreamcli.c:154 tools/appstreamcli.c:1022 msgid "AppStream command-line interface" msgstr "AppStream sučelje naredbenog retka" @@ -154,7 +154,7 @@ "AppStream je univerzalna specifikacija za pružanje metapodataka o " "komponentama softvera." -#: src/as-pool.c:2124 +#: src/as-pool.c:2125 #, c-format msgid "" "AppStream system cache refresh failed. Turn on verbose mode to get detailed " @@ -164,22 +164,22 @@ "opširnog izvještavanja za dobivanje detaljnih informacija o problemu." #. TRANSLATORS: Output if appstreamcli --version is executed. -#: tools/appstream-cli.c:1199 +#: tools/appstream-compose.c:247 tools/appstreamcli.c:1276 #, c-format msgid "AppStream version: %s" msgstr "AppStream verzija: %s" -#: src/as-category.c:129 +#: src/as-category.c:130 msgctxt "Category of Games" msgid "Arcade" msgstr "Arkadne igre" -#: src/as-category.c:234 +#: src/as-category.c:235 msgctxt "Category of Science" msgid "Artificial Intelligence" msgstr "Umjetna inteligencija" -#: src/as-validator-issue-tag.h:91 +#: src/as-validator-issue-tag.h:96 msgid "" "As per AppStream specification, the mentioned tag must only appear once in " "this context. Having multiple tags of this kind is not valid." @@ -188,32 +188,32 @@ "pojaviti samo jednom. Neispravno je imati više od jedne oznake ove vrste." #. TRANSLATORS: ascli flag description for: --format as part of the news-to-metainfo command -#: tools/appstream-cli.c:815 +#: tools/appstreamcli.c:842 msgid "Assume the input file is in the selected format ('yaml' or 'text')." msgstr "" "Pretpostavi, da je datoteka unosa odabranog formata („yaml” ili „text”)." -#: src/as-category.c:101 +#: src/as-category.c:102 msgctxt "Category of Education" msgid "Astronomy" msgstr "Astronomija" -#: src/as-category.c:237 +#: src/as-category.c:238 msgctxt "Category of Science" msgid "Astronomy" msgstr "Astronomija" #. TRANSLATORS: this is the menu spec main category for Audio & Video -#: src/as-category.c:302 +#: src/as-category.c:303 msgid "Audio & Video" msgstr "Audio- i videosnimke" -#: src/as-category.c:68 +#: src/as-category.c:69 msgctxt "Category of AudioVideo" msgid "Audio Creation & Editing" msgstr "Stvaranje i uređivanje audiosnimaka" -#: tools/ascli-actions-misc.c:219 +#: tools/ascli-actions-misc.c:149 #, c-format msgid "Augmenting existing desktop-entry file '%s' with data from '%s'." msgstr "" @@ -223,12 +223,12 @@ msgid "Binaries" msgstr "Binarne datoteke" -#: src/as-category.c:132 +#: src/as-category.c:133 msgctxt "Category of Games" msgid "Blocks" msgstr "Igre blokova" -#: src/as-category.c:135 +#: src/as-category.c:136 msgctxt "Category of Games" msgid "Board" msgstr "Igre na ploči" @@ -237,12 +237,12 @@ msgid "Bundle" msgstr "Paket" -#: src/as-pool.c:1995 +#: src/as-cache.c:909 #, c-format msgid "Cache location '%s' is not writable." msgstr "Mjesto predmemorije „%s” je zaštićeno od pisanja." -#: src/as-category.c:191 +#: src/as-category.c:192 msgctxt "Category of Office" msgid "Calendar" msgstr "Kalendar" @@ -256,7 +256,7 @@ "Nije moguće kopirati „%s”: Datoteka nema „.metainfo.xml” ili „.appdata.xml” " "sufiks." -#: src/as-category.c:138 +#: src/as-category.c:139 msgctxt "Category of Games" msgid "Card" msgstr "Kartaške igre" @@ -265,33 +265,33 @@ msgid "Categories" msgstr "Kategorije" -#: src/as-category.c:259 +#: src/as-category.c:260 msgctxt "Category of Communication" msgid "Chat" msgstr "Chat" -#: src/as-category.c:104 +#: src/as-category.c:105 msgctxt "Category of Education" msgid "Chemistry" msgstr "Kemija" -#: src/as-category.c:240 +#: src/as-category.c:241 msgctxt "Category of Science" msgid "Chemistry" msgstr "Kemija" -#: src/as-category.c:214 +#: src/as-category.c:215 msgctxt "Category of Addons" msgid "Codecs" msgstr "Kodeki" #. TRANSLATORS: this is the menu spec main category for Communication -#: src/as-category.c:326 +#: src/as-category.c:327 msgid "Communication & News" msgstr "Komunikacija i vijesti" #. TRANSLATORS: `appstreamcli vercmp` command description. -#: tools/appstream-cli.c:1146 +#: tools/appstreamcli.c:1217 msgid "Compare two version numbers." msgstr "Usporedi brojeve dviju verzija." @@ -309,18 +309,18 @@ msgid "Compulsory for" msgstr "Obavezno za" -#: src/as-validator-issue-tag.h:398 +#: src/as-validator-issue-tag.h:420 msgid "Consider using a secure (HTTPS) URL for the remote icon link." msgstr "" "Razmotri mogućnost upotrebe sigurne (HTTPS) URL adrese za poveznicu na " "udaljenu ikonu." -#: src/as-validator-issue-tag.h:420 +#: src/as-validator-issue-tag.h:442 msgid "Consider using a secure (HTTPS) URL for this web link." msgstr "" "Razmotri mogućnost upotrebe sigurne (HTTPS) URL adrese za ovu web-poveznicu." -#: src/as-validator-issue-tag.h:194 +#: src/as-validator-issue-tag.h:204 msgid "" "Consider using a secure (HTTPS) URL to reference this screenshot image or " "video." @@ -329,17 +329,17 @@ "sliku ili videosnimku snimke ekrana." #. TRANSLATORS: `appstreamcli news-to-metainfo` command description. -#: tools/appstream-cli.c:1162 +#: tools/appstreamcli.c:1233 msgid "Convert a YAML or text NEWS file into metainfo releases." msgstr "Pretvori YAML ili tekstualnu NEWS datoteku u izdanja metapodataka." #. TRANSLATORS: `appstreamcli convert` command description. "Collection XML" is a term describing a specific type of AppStream XML data. -#: tools/appstream-cli.c:1141 +#: tools/appstreamcli.c:1212 msgid "Convert collection XML to YAML or vice versa." msgstr "Pretvori XML zbirku u YAML ili obratno." #. TRANSLATORS: Search for provided items (e.g. mimetypes, modaliases, ..) yielded no results -#: tools/ascli-actions-mdata.c:227 +#: tools/ascli-actions-mdata.c:245 #, c-format msgid "Could not find component providing '%s::%s'." msgstr "Nije bilo moguće pronaći komponentu, koja omogućuje „%s::%s”." @@ -349,14 +349,14 @@ msgstr "Stvori XDG desktop-entry datoteku iz metainfo datoteke." #. TRANSLATORS: `appstreamcli new-template` command description. -#: tools/appstream-cli.c:1152 +#: tools/appstreamcli.c:1223 msgid "" "Create a template for a metainfo file (to be filled out by the upstream " "project)." msgstr "" "Stvori predložak za datoteku metapodataka (popunjava se izvornim projektom)." -#: tools/ascli-actions-misc.c:228 +#: tools/ascli-actions-misc.c:158 #, c-format msgid "Creating new desktop-entry file '%s' using data from '%s'" msgstr "" @@ -370,12 +370,12 @@ msgid "D-Bus System Services" msgstr "Usluge D-Bus sustava" -#: src/as-category.c:195 +#: src/as-category.c:196 msgctxt "Category of Office" msgid "Database" msgstr "Baza podataka" -#: src/as-category.c:86 +#: src/as-category.c:87 msgctxt "Category of Development" msgid "Debuggers" msgstr "Otklanjanje grešaka" @@ -385,7 +385,7 @@ msgstr "Standardni URL za slike ekrana" #. TRANSLATORS: ascli flag description for: --format -#: tools/appstream-cli.c:85 +#: tools/appstreamcli.c:86 msgid "Default metadata format (valid values are 'xml' and 'yaml')." msgstr "" "Standardni format metapodataka (ispravne vrijednosti su „xml” i „yaml”)." @@ -400,12 +400,12 @@ msgstr "Programer" #. TRANSLATORS: this is the menu spec main category for Development -#: src/as-category.c:305 +#: src/as-category.c:306 msgid "Developer Tools" msgstr "Alati za programere" #. TRANSLATORS: `appstreamcli status` command description. -#: tools/appstream-cli.c:1126 +#: tools/appstreamcli.c:1197 msgid "Display status information about available AppStream metadata." msgstr "Prikaži podatke stanja dostupnih AppStream metapodataka." @@ -415,23 +415,24 @@ msgstr "Metapodaci distribucije:" #. TRANSLATORS: ascli flag description for: --no-net (used by the "validate" command) -#: tools/appstream-cli.c:128 +#: tools/appstreamcli.c:129 msgid "Do not use network access." msgstr "Nemoj koristiti mrežni pristup." +#. TRANSLATORS: ascompose flag description for: --no-color #. TRANSLATORS: ascli flag description for: --no-color -#: tools/appstream-cli.c:1062 +#: tools/appstream-compose.c:186 tools/appstreamcli.c:1128 msgid "Don't show colored output." msgstr "Nemoj prikazati rezultat u boji." #. TRANSLATORS: `appstreamcli dump` command description. -#: tools/appstream-cli.c:1093 +#: tools/appstreamcli.c:1159 msgid "Dump raw XML metadata for a component matching the ID." msgstr "" "Iščitaj neobrađene XML metapodatke za komponentu koja odgovara ID oznaci." #. TRANSLATORS: this is the menu spec main category for Education -#: src/as-category.c:308 +#: src/as-category.c:309 msgid "Education" msgstr "Obrazovanje" @@ -440,13 +441,13 @@ msgid "Empty." msgstr "Prazno." -#: src/as-category.c:141 +#: src/as-category.c:142 msgctxt "Category of Games" msgid "Emulators" msgstr "Emulatori" #. TRANSLATORS: ascli flag description for: --force -#: tools/appstream-cli.c:245 +#: tools/appstreamcli.c:247 msgid "Enforce a cache refresh." msgstr "Prisilno aktualiziraj predmemoriju." @@ -454,7 +455,7 @@ msgid "Enumerations must only have list items (
  • ) as children." msgstr "Nabrajanja smiju sadržati samo podređene elemente popisa (
  • )." -#: tools/ascli-actions-misc.c:159 +#: tools/ascli-actions-misc.c:88 #, c-format msgid "Error while loading the metadata pool: %s" msgstr "Greška tijekom učitavanja sabirališta metadataka: %s" @@ -463,62 +464,62 @@ msgid "Extends" msgstr "Proširenja" -#: src/as-category.c:65 +#: src/as-category.c:66 msgctxt "Category of AudioVideo" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:256 +#: src/as-category.c:257 msgctxt "Category of Communication" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:83 +#: src/as-category.c:84 msgctxt "Category of Development" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:98 +#: src/as-category.c:99 msgctxt "Category of Education" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:120 +#: src/as-category.c:121 msgctxt "Category of Games" msgid "Featured" msgstr "Predstavljene igre" -#: src/as-category.c:165 +#: src/as-category.c:166 msgctxt "Category of Graphics" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:188 +#: src/as-category.c:189 msgctxt "Category of Office" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:231 +#: src/as-category.c:232 msgctxt "Category of Science" msgid "Featured" msgstr "Predstavljeno" -#: src/as-category.c:278 +#: src/as-category.c:279 msgctxt "Category of Utility" msgid "Featured" msgstr "Predstavljeno" -#: tools/ascli-actions-validate.c:176 tools/ascli-actions-validate.c:354 +#: tools/ascli-actions-validate.c:176 tools/ascli-actions-validate.c:356 #, c-format msgid "File '%s' does not exist." msgstr "Datoteka „%s” ne postoji." -#: src/as-category.c:287 +#: src/as-category.c:288 msgctxt "Category of Utility" msgid "File System" msgstr "Datotečni sustav" -#: src/as-category.c:198 +#: src/as-category.c:199 msgctxt "Category of Office" msgid "Finance" msgstr "Računovodstvo" @@ -531,12 +532,12 @@ msgid "Fonts" msgstr "Fontovi" -#: src/as-category.c:211 +#: src/as-category.c:212 msgctxt "Category of Addons" msgid "Fonts" msgstr "Fontovi" -#: src/as-validator-issue-tag.h:242 +#: src/as-validator-issue-tag.h:252 msgid "" "For videos, only the WebM and Matroska (.mkv) container formats are " "currently supported. The file extension of the referenced video does not " @@ -547,7 +548,7 @@ "nijednom od ovih formata." #. TRANSLATORS: ascli flag description for: --format when validating XML files -#: tools/appstream-cli.c:133 +#: tools/appstreamcli.c:134 msgid "Format of the generated report (valid values are 'text' and 'yaml')." msgstr "" "Format izrađenog izvještaja (ispravne vrijednosti su „text” i „yaml”)." @@ -587,7 +588,7 @@ "instead." msgstr "" -#: src/as-validator-issue-tag.h:253 +#: src/as-validator-issue-tag.h:263 msgid "" "Found an unknown tag in a requires/recommends group. This is likely an " "error, because a component relation of this type is unknown." @@ -605,19 +606,20 @@ msgstr "" #. TRANSLATORS: An invalid XML tag was found, "Found" refers to the tag name found, "Allowed" to the permitted name. -#: src/as-validator.c:524 src/as-validator.c:945 src/as-validator.c:1039 -#: src/as-validator.c:1440 src/as-validator.c:1460 src/as-validator.c:1493 +#: src/as-validator.c:522 src/as-validator.c:1027 src/as-validator.c:1078 +#: src/as-validator.c:1172 src/as-validator.c:1583 src/as-validator.c:1603 +#: src/as-validator.c:1636 #, c-format msgid "Found: %s - Allowed: %s" msgstr "Pronađeno: %s – Dozvoljeno: %s" #. TRANSLATORS: this is the menu spec main category for Game -#: src/as-category.c:311 +#: src/as-category.c:312 msgid "Games" msgstr "Igre" #. TRANSLATORS: ascli flag description for: --format as part of the metainfo-to-news command -#: tools/appstream-cli.c:862 +#: tools/appstreamcli.c:898 msgid "Generate the output in the selected format ('yaml' or 'text')." msgstr "Izradi rezultat u odabranom formatu („yaml” ili „text”)." @@ -626,12 +628,12 @@ msgstr "Dobij komponente koje pružaju zadani element." #. TRANSLATORS: `appstreamcli get` command description. -#: tools/appstream-cli.c:1082 +#: tools/appstreamcli.c:1148 msgid "Get information about a component by its ID." msgstr "Dobavi podatke komponente na osnovi njene ID oznake." #. TRANSLATORS: this is the menu spec main category for Graphics -#: src/as-category.c:314 +#: src/as-category.c:315 msgid "Graphics & Photography" msgstr "Grafike i fotografija" @@ -639,7 +641,7 @@ msgid "Homepage" msgstr "Početna web-stranica" -#: src/as-category.c:89 +#: src/as-category.c:90 msgctxt "Category of Development" msgid "IDEs" msgstr "Integrirana razvojna okruženja" @@ -660,7 +662,7 @@ "relative path to the icon. Only file basenames or stock names are allowed." msgstr "" -#: tools/ascli-actions-misc.c:94 +#: src/as-pool.c:2429 msgid "Iconsets" msgstr "Kompleti ikona" @@ -668,18 +670,18 @@ msgid "Identifier" msgstr "Identifikator" -#: src/as-category.c:217 +#: src/as-category.c:218 msgctxt "Category of Addons" msgid "Input Sources" msgstr "Izvori unosa" #. TRANSLATORS: `appstreamcli put` command description. -#: tools/appstream-cli.c:1136 +#: tools/appstreamcli.c:1207 msgid "Install a metadata file into the right location." msgstr "Instaliraj jednu datoteku metapodataka na ispravno mjesto." #. TRANSLATORS: `appstreamcli install` command description. -#: tools/appstream-cli.c:1115 +#: tools/appstreamcli.c:1186 msgid "Install software matching the component-ID." msgstr "Instaliraj softver koji se poklapa s ID oznakom komponente." @@ -697,7 +699,7 @@ "permitted." msgstr "" -#: tools/ascli-actions-mdata.c:212 +#: tools/ascli-actions-mdata.c:230 msgid "Invalid type for provided item selected. Valid values are:" msgstr "" "Odabrana je neispravna vrsta za pružani element. Ispravne vrijednosti su:" @@ -710,7 +712,7 @@ "Neispravna operacija uspoređivanja verzija na elementu veze. Dozvoljene samo " "eq/ne/lt/gt/le/ge." -#: src/as-validator-issue-tag.h:492 +#: src/as-validator-issue-tag.h:514 msgid "" "It is recommended to add a long description to this component to present it " "better to users." @@ -718,7 +720,7 @@ "Preporučujemo dodati dugačak opis ovoj komponenti, kako bi se bolje " "predstavila korisnicima." -#: src/as-validator-issue-tag.h:487 +#: src/as-validator-issue-tag.h:509 msgid "" "It would be useful to add a long description to this font to present it " "better to users." @@ -726,17 +728,17 @@ "Bilo bi korisno dodati dugačak opis ovom fontu, kako bi se bolje predstavio " "korisnicima." -#: src/as-category.c:144 +#: src/as-category.c:145 msgctxt "Category of Games" msgid "Kids" msgstr "Dječje igre" -#: src/as-category.c:220 +#: src/as-category.c:221 msgctxt "Category of Addons" msgid "Language Packs" msgstr "Jezični paketi" -#: src/as-category.c:107 +#: src/as-category.c:108 msgctxt "Category of Education" msgid "Languages" msgstr "Jezici" @@ -760,7 +762,7 @@ msgstr "" #. TRANSLATORS: ascli flag description for: --limit as part of the news-to-metainfo command -#: tools/appstream-cli.c:820 +#: tools/appstreamcli.c:820 msgid "" "Limit the number of release entries that end up in the metainfo file (0 for " "unlimited)." @@ -768,32 +770,32 @@ "Ograniči broj unosa izdanja koji će se na kraju naći u datoteci metapodataka " "(0 za neograničeno)." -#: src/as-category.c:223 +#: src/as-category.c:224 msgctxt "Category of Addons" msgid "Localization" msgstr "Lokalizacija" -#: src/as-category.c:147 +#: src/as-category.c:148 msgctxt "Category of Games" msgid "Logic" msgstr "Logičke igre" #. TRANSLATORS: ascli flag description for: --no-cache -#: tools/appstream-cli.c:69 +#: tools/appstreamcli.c:69 msgid "Make request without any caching." msgstr "Postavi zahtjev bez spremanja u predmemoriju." #. TRANSLATORS: ascli flag description for: --cachepath -#: tools/appstream-cli.c:59 +#: tools/appstreamcli.c:60 msgid "Manually selected location of AppStream cache." msgstr "Ručno odaberi mjesto AppStream predmemorije." #. TRANSLATORS: ascli flag description for: --datapath -#: tools/appstream-cli.c:64 +#: tools/appstreamcli.c:65 msgid "Manually selected location of AppStream metadata to scan." msgstr "Ručno odaberi mjesto za traženje AppStream metapodataka." -#: src/as-pool.c:1369 +#: src/as-pool.c:1370 msgid "" "Many components have been recognized as invalid. See debug output for " "details." @@ -801,12 +803,12 @@ "Mnoge komponente prepoznate su kao neispravne. Pojedinosti se mogu " "pregledati u rezultatu otklanjanja grešaka." -#: src/as-category.c:111 +#: src/as-category.c:112 msgctxt "Category of Education" msgid "Math" msgstr "Matematika" -#: src/as-category.c:243 +#: src/as-category.c:244 msgctxt "Category of Science" msgid "Math" msgstr "Matematika" @@ -815,17 +817,17 @@ msgid "Media types" msgstr "Vrste medija" -#: tools/ascli-actions-mdata.c:347 +#: tools/ascli-actions-mdata.c:365 #, c-format msgid "Metadata file '%s' does not exist." msgstr "Datoteka metapodataka „%s” ne postoji." -#: src/as-pool.c:962 +#: src/as-pool.c:1114 msgid "Metadata files have errors:" msgstr "Datoteke metapodataka sadrže greške:" -#: tools/ascli-actions-misc.c:198 tools/ascli-actions-misc.c:436 -#: tools/ascli-actions-misc.c:515 +#: tools/ascli-actions-misc.c:128 tools/ascli-actions-misc.c:371 +#: tools/ascli-actions-misc.c:448 #, c-format msgid "Metainfo file '%s' does not exist." msgstr "Datoteka metapodataka „%s” ne postoji." @@ -846,7 +848,7 @@ msgid "Modaliases" msgstr "Modaliasi" -#: src/as-category.c:74 +#: src/as-category.c:75 msgctxt "Category of AudioVideo" msgid "Music Players" msgstr "Reproduktori glazbe" @@ -855,21 +857,22 @@ msgid "Name" msgstr "Ime" -#: src/as-category.c:266 +#: src/as-category.c:267 msgctxt "Category of Communication" msgid "News" msgstr "Vijesti" -#: src/as-validator-issue-tag.h:631 +#: src/as-validator-issue-tag.h:653 msgid "No AppStream metadata was found in this directory or directory tree." msgstr "U ovoj mapi ili stablu mapa nema AppStream metapodataka." #. pedantic because not everything which has metadata is an application -#: src/as-validator-issue-tag.h:636 +#: src/as-validator-issue-tag.h:658 msgid "No XDG applications directory found." msgstr "Nema mape XDG-programa." -#: tools/ascli-actions-mdata.c:182 +#. TRANSLATORS: We got no full-text search results +#: tools/ascli-actions-mdata.c:200 #, c-format msgid "No component matching '%s' found." msgstr "Nema komponente koja se poklapa s „%s”." @@ -878,13 +881,13 @@ msgid "No icons." msgstr "Nema ikona." -#: tools/ascli-actions-misc.c:402 +#: tools/ascli-actions-misc.c:337 msgid "No output filename specified, modifying metainfo file directly." msgstr "" "Ime datoteke rezultata nije navedeno. Datoteka metapodataka se izravno " "mijenja." -#: tools/ascli-actions-misc.c:306 +#: tools/ascli-actions-misc.c:236 msgid "" "No provided binary specified in metainfo file, and no exec command specified " "via '--exec'. Can not create 'Exec=' key." @@ -893,7 +896,7 @@ "Također nijedna navedena nijedna izvršna naredba putem „--exec”. Nije moguće " "stvoriti „Exec=” ključ." -#: tools/ascli-actions-misc.c:284 +#: tools/ascli-actions-misc.c:214 msgid "" "No stock icon name was provided in the metainfo file. Can not continue." msgstr "" @@ -908,17 +911,17 @@ "Nije pronađeno odgovarajuće sučelje naredbenog retka upravljača paketa. " "Provjeri, je li npr. dostupan „pkcon” (dio PackageKit-a)." -#: tools/ascli-actions-mdata.c:206 +#: tools/ascli-actions-mdata.c:224 msgid "No value for the item to search for was defined." msgstr "Vrijednost za traženi element nije određen." #. TRANSLATORS: this is the menu spec main category for Office -#: src/as-category.c:317 +#: src/as-category.c:318 msgid "Office" msgstr "Ured" #. TRANSLATORS: An unknown option was passed to appstreamcli. -#: tools/appstream-cli.c:191 +#: tools/appstreamcli.c:193 #, c-format msgid "Option '%s' is unknown." msgstr "Opcija „%s” je nepoznata." @@ -927,18 +930,18 @@ msgid "Package" msgstr "Paket" -#: src/as-category.c:171 +#: src/as-category.c:172 msgctxt "Category of Graphics" msgid "Photography" msgstr "Fotografija" #. TRANSLATORS: ascli flag description for: --explain (used by the "validate" command) -#: tools/appstream-cli.c:123 +#: tools/appstreamcli.c:124 msgid "Print detailed explanation for found issues." msgstr "Ispiši detaljna obrazloženja za pronađene probleme." #. TRANSLATORS: ascli flag description for: --details -#: tools/appstream-cli.c:100 +#: tools/appstreamcli.c:101 msgid "Print detailed output about found components." msgstr "Ispiši detaljan rezultat o pronađenim komponentama." @@ -960,39 +963,39 @@ msgstr "Python 3" #. TRANSLATORS: `appstreamcli refresh-cache` command description. -#: tools/appstream-cli.c:1098 +#: tools/appstreamcli.c:1164 msgid "Rebuild the component metadata cache." msgstr "Ponovo izgradi predmemoriju metapodataka komponente." #. TRANSLATORS: `appstreamcli remove` command description. -#: tools/appstream-cli.c:1120 +#: tools/appstreamcli.c:1191 msgid "Remove software matching the component-ID." msgstr "Ukloni softver koji se poklapa s ID oznakom komponente." #. TRANSLATORS: We tried to download from an URL, but the retrieved data was empty -#: src/as-curl.c:247 +#: src/as-curl.c:315 #, c-format msgid "Retrieved file size was zero." msgstr "Veličina preuzete datoteke je bila nula." -#: src/as-category.c:248 +#: src/as-category.c:249 msgctxt "Category of Science" msgid "Robotics" msgstr "Robotika" -#: src/as-category.c:150 +#: src/as-category.c:151 msgctxt "Category of Games" msgid "Role Playing" msgstr "Igranje uloga" -#: tools/appstream-cli.c:195 tools/appstream-cli.c:1176 +#: tools/appstreamcli.c:197 tools/appstreamcli.c:1253 #, c-format msgid "Run '%s --help' to see a full list of available command line options." msgstr "" "Pokreni „%s --help“ za prikaz popisa svih dostupnih mogućnosti u naredbenom " "retku." -#: tools/appstream-cli.c:197 +#: tools/appstreamcli.c:199 #, c-format msgid "" "Run '%s --help' to see a list of available commands and options, and '%s %s -" @@ -1005,33 +1008,34 @@ msgid "Runtime Firmware" msgstr "Firmver vremena izvođenja" -#: src/as-category.c:174 +#: src/as-category.c:175 msgctxt "Category of Graphics" msgid "Scanning" msgstr "Skeniranje" #. TRANSLATORS: this is the menu spec main category for Science -#: src/as-category.c:323 +#: src/as-category.c:324 msgid "Science" msgstr "Znanost" #. TRANSLATORS: `appstreamcli search` command description. -#: tools/appstream-cli.c:1077 +#: tools/appstreamcli.c:1143 msgid "Search the component database." msgstr "Pretraži bazu podataka za komponente." -#: src/as-category.c:293 +#: src/as-category.c:294 msgctxt "Category of Utility" msgid "Security" msgstr "Sigurnost" #. TRANSLATORS: ascli flag description for: --verbose -#: tools/appstream-cli.c:1057 +#: tools/appstreamcli.c:1123 msgid "Show extra debugging information." msgstr "Prikaži dodatne informacije otklanjanja grešaka." +#. TRANSLATORS: ascompose flag description for: --version #. TRANSLATORS: ascli flag description for: --version -#: tools/appstream-cli.c:1051 +#: tools/appstream-compose.c:189 tools/appstreamcli.c:1117 msgid "Show the program version." msgstr "Prikaži verziju programa." @@ -1042,18 +1046,18 @@ "this runtime." msgstr "" -#: src/as-category.c:153 +#: src/as-category.c:154 msgctxt "Category of Games" msgid "Sports" msgstr "Sportske igre" -#: src/as-category.c:157 +#: src/as-category.c:158 msgctxt "Category of Games" msgid "Strategy" msgstr "Strateške igre" #. these are commands we can use with appstreamcli -#: tools/appstream-cli.c:958 +#: tools/appstreamcli.c:1024 msgid "Subcommands:" msgstr "Podnaredbe:" @@ -1069,11 +1073,11 @@ msgstr "Sažetak" #. TRANSLATORS: Status summary in ascli -#: tools/ascli-actions-misc.c:145 +#: tools/ascli-actions-misc.c:70 msgid "Summary:" msgstr "Sažetak:" -#: src/as-category.c:290 +#: src/as-category.c:291 msgctxt "Category of Utility" msgid "System Monitoring" msgstr "Praćenje sustava" @@ -1082,12 +1086,12 @@ msgid "Tags of this name are not permitted in this section." msgstr "Oznake s ovim imenom nisu dozvoljene u ovom odjeljku." -#: src/as-category.c:284 +#: src/as-category.c:285 msgctxt "Category of Utility" msgid "Terminal Emulators" msgstr "Emulatori terminala" -#: src/as-category.c:281 +#: src/as-category.c:282 msgctxt "Category of Utility" msgid "Text Editors" msgstr "Uređivanje teksta" @@ -1105,12 +1109,12 @@ "The 'update_contact' tag should not be included in collection AppStream XML." msgstr "" -#: tools/ascli-actions-mdata.c:483 +#: tools/ascli-actions-mdata.c:505 #, c-format msgid "The .desktop file '%s' does not exist." msgstr ".desktop datoteka „%s” ne postoji." -#: src/as-validator-issue-tag.h:435 +#: src/as-validator-issue-tag.h:457 msgid "The can not contain a hyperlink." msgstr "Oznaka ne smije sadržati hiperpoveznicu." @@ -1120,7 +1124,7 @@ "conversion to the recent metainfo format." msgstr "" -#: src/as-validator-issue-tag.h:712 +#: src/as-validator-issue-tag.h:740 msgid "" "The AppStream specification requires a complete, ISO 8601 date string with " "at least day-granularity to denote dates. Please ensure the date string is " @@ -1130,7 +1134,7 @@ "8601 formatu, koji sadrži barem vrijednost za dan. Provjeri ispravnost " "datuma." -#: src/as-pool.c:2110 +#: src/as-pool.c:2111 #, c-format msgid "" "The AppStream system cache was updated, but problems were found which " @@ -1139,7 +1143,7 @@ "AppStream predmemorija sustava je aktualizirana, ali pronađeni su problemi, " "zbog čega su metapodaci zanemareni: %s" -#: src/as-pool.c:2108 +#: src/as-pool.c:2109 msgid "" "The AppStream system cache was updated, but some components were ignored. " "Refer to the verbose log for more information." @@ -1147,21 +1151,21 @@ "AppStream predmemorija sustava je aktualizirana, ali neke komponente su " "zanemarene. Dodatne informacije nalaze se u opširnom log-zapisu." -#: src/as-validator-issue-tag.h:156 +#: src/as-validator-issue-tag.h:166 msgid "The SPDX license expression is invalid and could not be parsed." msgstr "Izraz SPDX licence nije ispravan i nije ga moguće obraditi." #. TRANSLATORS: Additional help text for the 'new-template' ascli subcommand, a bullet-pointed list of types follows -#: tools/appstream-cli.c:734 +#: tools/appstreamcli.c:760 #, c-format msgid "The TYPE must be a valid component-type, such as: %s" msgstr "TYPE mora biti ispravni component-type (vrsta komponente), poput: %s" -#: src/as-validator-issue-tag.h:589 +#: src/as-validator-issue-tag.h:611 msgid "The XML of this file is malformed." msgstr "XML ove datoteke nije ispravno formatiran." -#: src/as-validator-issue-tag.h:626 +#: src/as-validator-issue-tag.h:648 msgid "" "The category defined in the .desktop file is not valid. Refer to the XDG " "Menu Specification for a list of valid categories." @@ -1169,7 +1173,7 @@ "U .desktop datoteci definirana kategorija nije ispravna. Popis ispravnih " "kategorija nalazi se u specifikaciji XDG izbornika." -#: src/as-validator-issue-tag.h:574 +#: src/as-validator-issue-tag.h:596 msgid "" "The category name is not valid. Refer to the XDG Menu Specification for a " "list of valid category names." @@ -1184,7 +1188,7 @@ "good option is to replace any hyphens with underscores ('_')." msgstr "" -#: src/as-validator-issue-tag.h:130 +#: src/as-validator-issue-tag.h:135 msgid "" "The component ID contains a segment starting with a number. Starting a " "segment of the reverse-DNS ID with a number is strongly discouraged, to keep " @@ -1196,7 +1200,7 @@ "bi se poboljšala interoperabilnost s drugim alatima poput D-Bus-a. Najbolje " "je, da ti segmenti počnu s podvlakom (`_`)." -#: src/as-validator-issue-tag.h:119 +#: src/as-validator-issue-tag.h:124 msgid "" "The component ID contains an invalid character. Only ASCII characters, dots " "and numbers are permitted." @@ -1204,7 +1208,7 @@ "ID oznaka komponente sadrži neispravan znak. Dopušteni su samo ASCII " "znakovi, točke i brojevi." -#: src/as-validator-issue-tag.h:106 +#: src/as-validator-issue-tag.h:111 msgid "" "The component ID is not a reverse domain-name. Please update the ID to avoid " "future issues and be compatible with all AppStream implementations.\n" @@ -1225,7 +1229,7 @@ "program mogao pokrentui iz softverskih centara i podatke .desktop datoteka " "povezanih s podacima metapodataka." -#: src/as-validator-issue-tag.h:101 +#: src/as-validator-issue-tag.h:106 msgid "" "The component ID is required to follow a reverse domain-name scheme for its " "name. See the AppStream specification for details." @@ -1233,7 +1237,7 @@ "ID oznaka komponente mora slijediti obrnutu domain-name shemu za ime. " "Pojedinosti se nalaze u AppStream specifikaciji." -#: src/as-validator-issue-tag.h:114 +#: src/as-validator-issue-tag.h:119 msgid "" "The component ID might not follow the reverse domain-name schema (the TLD " "used by it is not known to the validator)." @@ -1247,7 +1251,7 @@ "files." msgstr "" -#: src/as-validator-issue-tag.h:325 +#: src/as-validator-issue-tag.h:342 msgid "" "The component has a priority value set. This is not allowed in metainfo " "files." @@ -1260,26 +1264,26 @@ msgid "The component is an addon, but no 'extends' tag was specified." msgstr "" -#: src/as-validator-issue-tag.h:482 +#: src/as-validator-issue-tag.h:504 msgid "" "The component is missing a long description. Components of this type must " "have a long description." msgstr "" "Komponenti nedostaje dug opis. Komponente ove vrste moraju imati dug opis." -#: src/as-validator-issue-tag.h:340 +#: src/as-validator-issue-tag.h:357 msgid "The component is missing a name ( tag)." msgstr "Komponenti nedostaje ime ( oznaka)." -#: src/as-validator-issue-tag.h:345 +#: src/as-validator-issue-tag.h:362 msgid "The component is missing a summary ( tag)." msgstr "Komponenti nedostaje sažetak ( oznaka)." -#: src/as-validator-issue-tag.h:335 +#: src/as-validator-issue-tag.h:352 msgid "The component is missing an ID ( tag)." msgstr "Komponenti nedostaje ID oznaka ( oznaka)." -#: src/as-validator-issue-tag.h:141 +#: src/as-validator-issue-tag.h:151 msgid "" "The component is part of the Freedesktop project, but its ID does not start " "with fd.o's reverse-DNS name (\"org.freedesktop\")." @@ -1287,7 +1291,7 @@ "Komponenta je dio Freedesktop projekta, ali njegova ID oznaka ne započinje s " "Freedesktopovim obrnutim DNS imenom („org.freedesktop”)." -#: src/as-validator-issue-tag.h:151 +#: src/as-validator-issue-tag.h:161 msgid "" "The component is part of the GNOME project, but its ID does not start with " "GNOMEs reverse-DNS name (\"org.gnome\")." @@ -1295,7 +1299,7 @@ "Komponenta je dio GNOME projekta, ali njegova ID oznaka ne započinje s GNOME-" "ovim obrnutim DNS imenom („org.gnome”)." -#: src/as-validator-issue-tag.h:146 +#: src/as-validator-issue-tag.h:156 msgid "" "The component is part of the KDE project, but its ID does not start with " "KDEs reverse-DNS name (\"org.kde\")." @@ -1307,7 +1311,7 @@ msgid "The component name should (likely) not end with a dot ('.')." msgstr "" -#: src/as-validator-issue-tag.h:370 +#: src/as-validator-issue-tag.h:387 msgid "The component summary must not contain tabs or linebreaks." msgstr "" "Sažetak komponente ne smije sadržati tabulatore niti prijelome redaka." @@ -1316,7 +1320,7 @@ msgid "The component summary should not end with a dot ('.')." msgstr "" -#: src/as-validator-issue-tag.h:248 +#: src/as-validator-issue-tag.h:258 msgid "" "The default screenshot of a software component must not be a video. Use a " "static image as default screenshot and set the video as a secondary " @@ -1326,7 +1330,7 @@ "standardnu snimku ekrana postavlja se statička slika, videosnimka se " "postavlja kao sekundarna snimka ekrana." -#: src/as-validator-issue-tag.h:86 +#: src/as-validator-issue-tag.h:91 msgid "" "The description contains a web URL in plain text. This is not allowed, " "please use the tag instead to share links." @@ -1358,7 +1362,7 @@ "detailed information on this component immediately in the first paragraph." msgstr "" -#: src/as-validator-issue-tag.h:161 +#: src/as-validator-issue-tag.h:171 msgid "" "The license ID was not found in the SPDX database. Please check that the " "license ID is written in an SPDX-conformant way and is a valid free software " @@ -1368,7 +1372,7 @@ "oznaka licence zapisana na odgovarrajući SPDX način i je li lincenca " "ispravna za besplatan softver." -#: src/as-validator-issue-tag.h:96 +#: src/as-validator-issue-tag.h:101 msgid "" "The mentioned tag is empty, which is highly likely not intended as it should " "have content." @@ -1376,7 +1380,7 @@ "Spomenuta oznaka je prazna, što se vrlo vjerojatno ne želi, jer bi trebala " "imati sadržaj." -#: src/as-validator-issue-tag.h:173 +#: src/as-validator-issue-tag.h:183 msgid "" "The metadata itself does not seem to be licensed under a permissive license. " "Please license the data under a permissive license, like FSFAP, CC0-1.0 or " @@ -1388,7 +1392,7 @@ "distributerima dozvolilo uključivanje podataka u miješane zbirke podataka, " "bez rizika od kršenja licenci zbog obostrano nekompatibilnih licenci." -#: src/as-validator-issue-tag.h:167 +#: src/as-validator-issue-tag.h:177 msgid "" "The metadata itself seems to be licensed under a complex collection of " "licenses. Please license the data under a simple permissive license, like " @@ -1408,12 +1412,12 @@ "'/usr/share/metainfo'." msgstr "" -#: src/as-validator-issue-tag.h:646 +#: src/as-validator-issue-tag.h:668 msgid "The metainfo file specifies multiple components. This is not allowed." msgstr "Datoteka metapodataka navodi više komponenata. To nije dozvoljeno." #. TRANSLATORS: Please do not translate AppStream tag and property names (in backticks). -#: src/as-validator-issue-tag.h:601 +#: src/as-validator-issue-tag.h:623 msgid "" "The metainfo file uses an ancient version of the AppStream specification, " "which can not be validated. Please migrate it to version 0.6 (or higher)." @@ -1421,11 +1425,11 @@ "Datoteka metapodataka koristi prastaru verziju AppStream specifikacije, koju " "nije moguće provjeriti. Prebaci je na verziju 0.6 (ili noviju)." -#: src/as-validator-issue-tag.h:611 +#: src/as-validator-issue-tag.h:633 msgid "The metainfo filename does not match the component ID." msgstr "Ime datoteke metapodataka ne se poklapa s ID oznakom komponente." -#: src/as-validator-issue-tag.h:651 +#: src/as-validator-issue-tag.h:673 msgid "" "The releases are not sorted in a latest to oldest version order. This is " "required as some tools will assume that the latest version is always at the " @@ -1442,7 +1446,7 @@ msgstr "" "Podnaslov snimke ekrana je predug (treba biti kraći od ili jednak 80 znakova)" -#: src/as-validator-issue-tag.h:211 +#: src/as-validator-issue-tag.h:221 msgid "The screenshot does not have a caption text. Consider adding one." msgstr "" "Snimka ekrana nema podnaslov. Razmotri mogućnost dodavanja podnaslova." @@ -1478,14 +1482,14 @@ "values for the 'container' property." msgstr "" -#: src/as-validator-issue-tag.h:320 +#: src/as-validator-issue-tag.h:337 msgid "" "The set component type is not a recognized, valid AppStream component type." msgstr "" "Postavljena vrsta komponente nije prepoznata, ispravna AppStream vrsta " "komponente." -#: src/as-validator-issue-tag.h:440 +#: src/as-validator-issue-tag.h:462 msgid "" "The set value is not an identifier for a desktop environment as registered " "with Freedesktop.org." @@ -1493,7 +1497,7 @@ "Postavljena vrijednost nije identifikator za radno okruženje, kao što je " "registrirano pri Freedesktop.org." -#: tools/ascli-actions-mdata.c:465 +#: tools/ascli-actions-mdata.c:487 #, c-format msgid "" "The software component type '%s' is not valid in AppStream. Possible values " @@ -1502,13 +1506,13 @@ "Softverska vrsta komponenata „%s” nije ispravna u AppStreamu. Moguće " "vrijednosti su:" -#: src/as-validator-issue-tag.h:375 +#: src/as-validator-issue-tag.h:381 msgid "The summary must not contain any URL. Use the tags for links." msgstr "" "Sažetak ne smije sadržati nijednu URL adresu. Za poveznice, koristi " "oznake." -#: src/as-validator-issue-tag.h:736 +#: src/as-validator-issue-tag.h:764 msgid "" "The type of the item that the component provides is not known to AppStream." msgstr "AppStream ne pozna vrstu elemenata koju komponenta pruža." @@ -1519,7 +1523,7 @@ "'@' is only allowed as '_at_' or '_AT_')." msgstr "" -#: tools/ascli-actions-validate.c:368 tools/ascli-actions-validate.c:497 +#: tools/ascli-actions-validate.c:370 tools/ascli-actions-validate.c:501 #, c-format msgid "" "The validator can not create reports in the '%s' format. You may select " @@ -1578,7 +1582,7 @@ "block is likely missing." msgstr "" -#: src/as-validator-issue-tag.h:606 +#: src/as-validator-issue-tag.h:628 msgid "" "This XML document has an unknown root tag. Maybe this file is not a metainfo " "document?" @@ -1587,7 +1591,7 @@ "dokument metapodataka?" #. TRANSLATORS: Additional help text for the 'new-template' ascli subcommand -#: tools/appstream-cli.c:731 +#: tools/appstreamcli.c:757 msgid "" "This command takes optional TYPE and FILE positional arguments, FILE being a " "file to write to (or \"-\" for standard output)." @@ -1595,7 +1599,7 @@ "Ova naredba uzima opcionalne argumente TYPE i FILE, pri čemu je FILE " "datoteka u koju se piše (ili „-” za standardni izlaz)." -#: src/as-validator-issue-tag.h:718 +#: src/as-validator-issue-tag.h:746 msgid "" "This component extends, provides, requires or recommends itself, which is " "certainly not intended and may confuse users or machines dealing with this " @@ -1605,7 +1609,7 @@ "nije namjera i može zbuniti korisnike ili strojeve koji rade s ovim " "metapodacima." -#: src/as-validator-issue-tag.h:621 +#: src/as-validator-issue-tag.h:643 msgid "This component metadata refers to a non-existing .desktop file." msgstr "" "Ovaj se metapodatak komponente poziva na nepostojeću .desktop datoteku." @@ -1632,7 +1636,7 @@ "`appstream-generator`) će već sam od sebe ispravno postupiti pri " "sastavljanju podataka." -#: src/as-validator-issue-tag.h:497 +#: src/as-validator-issue-tag.h:519 msgid "" "This generic component is missing a long description. It may be useful to " "add one." @@ -1640,7 +1644,7 @@ "Ovoj generičkoj komponenti nedostaje dug opis. Možda bi bilo korisno dodati " "ga." -#: src/as-validator-issue-tag.h:463 +#: src/as-validator-issue-tag.h:485 msgid "" "This tag is a GNOME-specific extension to AppStream and not part of the " "official specification. Do not expect it to work in all implementations and " @@ -1667,14 +1671,14 @@ "MIME vrstu i za instaliranje pomoću njenog identifikatora komponenata " "softvera." -#: src/as-validator-issue-tag.h:430 +#: src/as-validator-issue-tag.h:452 msgid "" "This web link uses the FTP protocol. Consider switching to HTTP(S) instead." msgstr "" "Web-poveznica koristi FTP protokol. Razmotri mogućnost prebacivanja na " "HTTP(S)." -#: tools/appstream-cli.c:700 +#: tools/appstreamcli.c:726 msgid "" "Too many parameters: Need two version numbers or version numbers and a " "comparison operator." @@ -1707,13 +1711,13 @@ msgid "URL format is invalid." msgstr "URL format je neispravan." -#: tools/ascli-actions-mdata.c:560 +#: tools/ascli-actions-mdata.c:582 #, c-format msgid "Unable to build the template metainfo file: %s" msgstr "Nije moguće izgraditi predložak datoteke metapodataka: %s" #. TRANSLATORS: User is trying to convert a file in ascli -#: tools/ascli-actions-mdata.c:383 +#: tools/ascli-actions-mdata.c:405 msgid "" "Unable to convert file: Could not determine output format, please set it " "explicitly using '--format='." @@ -1722,37 +1726,37 @@ "Podesi je izričito, koristeći „--format=”." #. TRANSLATORS: We failed to find any component in the database, likely due to an error -#: tools/ascli-actions-mdata.c:177 +#: tools/ascli-actions-mdata.c:194 #, c-format msgid "Unable to find component matching %s!" msgstr "Nije moguće pronaći komponentu koja se poklapa s %s!" -#: tools/ascli-actions-mdata.c:144 tools/ascli-actions-mdata.c:265 +#: tools/ascli-actions-mdata.c:161 tools/ascli-actions-mdata.c:283 #: tools/ascli-actions-pkgmgr.c:93 #, c-format msgid "Unable to find component with ID '%s'!" msgstr "Nije moguće pronaći komponentu s ID oznakom „%s”!" -#: tools/ascli-actions-misc.c:224 +#: tools/ascli-actions-misc.c:154 #, c-format msgid "Unable to load existing desktop-entry file template: %s" msgstr "Nije moguće učitati postojeći predložak desktop-entry datoteke: %s" -#: src/as-validator-issue-tag.h:393 +#: src/as-validator-issue-tag.h:415 msgid "" "Unable to reach remote icon at the given web location - does it exist?" msgstr "" "Nije moguće dohvatiti udaljenu ikonu na određenom web-mjestu – je li uopće " "postoji?" -#: src/as-validator-issue-tag.h:415 +#: src/as-validator-issue-tag.h:437 msgid "" "Unable to reach remote location that this URL references - does it exist?" msgstr "" "Nije moguće dohvatiti udaljeno mjesto na koje se ova URL adresa povezuje – " "je li uopće postoji?" -#: src/as-validator-issue-tag.h:184 +#: src/as-validator-issue-tag.h:194 msgid "" "Unable to reach the screenshot image on its remote location - does the image " "exist?" @@ -1760,7 +1764,7 @@ "Nije moguće dohvatiti sliku snimke ekrana na njenom udaljenom mjestu – je li " "slika uopće postoji?" -#: src/as-validator-issue-tag.h:189 +#: src/as-validator-issue-tag.h:199 msgid "" "Unable to reach the screenshot video on its remote location - does the video " "file exist?" @@ -1768,30 +1772,30 @@ "Nije moguće dohvatiti videosnimku ekrana na njenom udaljenom mjestu – je li " "videosnimka uopće postoji?" -#: src/as-validator-issue-tag.h:584 +#: src/as-validator-issue-tag.h:606 msgid "Unable to read file." msgstr "Nije moguće čitati datoteku." -#: src/as-validator-issue-tag.h:616 +#: src/as-validator-issue-tag.h:638 msgid "Unable to read the .desktop file associated with this component." msgstr "" "Nije moguće čitati .desktop datoteku koja je povezana s ovom komponentom." -#: tools/ascli-actions-mdata.c:489 +#: tools/ascli-actions-mdata.c:511 #, c-format msgid "Unable to read the .desktop file: %s" msgstr "Nije moguće čitati .desktop datoteku: %s" -#: src/as-pool.c:619 +#: src/as-pool.c:620 msgid "Unable to remove old cache." msgstr "Nije moguće ukloniti staru predmemoriju." -#: tools/ascli-actions-misc.c:370 +#: tools/ascli-actions-misc.c:300 #, c-format msgid "Unable to save desktop entry file: %s" msgstr "Nije moguće spremiti desktop-entry datoteku: %s" -#: tools/ascli-actions-mdata.c:568 +#: tools/ascli-actions-mdata.c:590 #, c-format msgid "Unable to save the template metainfo file: %s" msgstr "Nije moguće spremiti predložak datoteke metapodataka: %s" @@ -1814,13 +1818,13 @@ msgstr "Nepoznata naredba „%s”." #. * TRANSLATORS: The user tried to compare version numbers, but the comparison operator (greater-then, equal, etc.) was invalid. -#: tools/appstream-cli.c:660 +#: tools/appstreamcli.c:686 #, c-format msgid "Unknown compare relation '%s'. Valid values are:" msgstr "Nepoznat odnos usporedbe „%s”. Ispravne vrijednosti su:" #. TRANSLATORS: ascli flag description for: --from-desktop (part of the new-template subcommand) -#: tools/appstream-cli.c:726 +#: tools/appstreamcli.c:752 msgid "" "Use the given .desktop file to fill in the basic values of the metainfo file." msgstr "" @@ -1828,36 +1832,36 @@ "datoteke metapodataka." #. TRANSLATORS: ascli flag description for: --exec (part of the make-desktop-file subcommand) -#: tools/appstream-cli.c:775 +#: tools/appstreamcli.c:801 msgid "Use the specified line for the 'Exec=' key of the desktop-entry file." msgstr "Koristi navedeni redak za „Exec=” ključ desktop-entry datoteke." #. TRANSLATORS: this is the menu spec main category for Utilities -#: src/as-category.c:329 +#: src/as-category.c:330 msgid "Utilities" msgstr "Uslužni programi" #. TRANSLATORS: `appstreamcli validate` command description. -#: tools/appstream-cli.c:1104 +#: tools/appstreamcli.c:1170 msgid "Validate AppStream XML files for issues." msgstr "Provjeri AppStream XML datoteke." #. TRANSLATORS: `appstreamcli validate-tree` command description. -#: tools/appstream-cli.c:1109 +#: tools/appstreamcli.c:1175 msgid "Validate an installed file-tree of an application for valid metadata." msgstr "" "Provjeri ispravnost metapodataka za instalirano stablo datoteka programa." -#: tools/ascli-actions-validate.c:306 tools/ascli-actions-validate.c:447 +#: tools/ascli-actions-validate.c:307 tools/ascli-actions-validate.c:450 #, c-format msgid "Validation failed: %s" msgstr "Provjera je neuspjela: %s" -#: tools/ascli-actions-validate.c:294 tools/ascli-actions-validate.c:435 +#: tools/ascli-actions-validate.c:294 tools/ascli-actions-validate.c:437 msgid "Validation was successful." msgstr "Provjera je uspjela." -#: tools/ascli-actions-validate.c:296 tools/ascli-actions-validate.c:437 +#: tools/ascli-actions-validate.c:296 tools/ascli-actions-validate.c:439 #, c-format msgid "Validation was successful: %s" msgstr "Provjera je uspjela: %s" @@ -1866,43 +1870,43 @@ msgid "Value of the item that should be found." msgstr "Vrijednost traženog elementa." -#: src/as-category.c:177 +#: src/as-category.c:178 msgctxt "Category of Graphics" msgid "Vector Graphics" msgstr "Vektorske grafike" -#: tools/ascli-actions-misc.c:48 +#: tools/ascli-actions-misc.c:49 #, c-format msgid "Version: %s" msgstr "Inačica %s" -#: src/as-category.c:180 +#: src/as-category.c:181 msgctxt "Category of Graphics" msgid "Viewers" msgstr "Prikazivači" -#: tools/ascli-actions-misc.c:153 +#: tools/ascli-actions-misc.c:84 #, c-format msgid "We have information on %i software components." msgstr "Imamo informacije o komponentama %i softvera." -#: src/as-category.c:270 +#: src/as-category.c:271 msgctxt "Category of Communication" msgid "Web Browsers" msgstr "Web preglednici" -#: src/as-category.c:202 +#: src/as-category.c:203 msgctxt "Category of Office" msgid "Word Processor" msgstr "Obrada teksta" #. TRANSLATORS: `appstreamcli metainfo-to-news` command description. -#: tools/appstream-cli.c:1167 +#: tools/appstreamcli.c:1238 msgid "Write NEWS text or YAML file with information from a metainfo file." msgstr "" "Zapiši tekstualnu NEWS ili YAML datoteku s podacima iz datoteke metapodataka." -#: tools/appstream-cli.c:1004 +#: tools/appstreamcli.c:1070 msgid "" "You can find information about subcommand-specific options by passing \"--" "help\" to the subcommand." @@ -1911,11 +1915,11 @@ "help” u podnaredbi." #. TRANSLATORS: In ascli: The requested action needs higher permissions. -#: tools/ascli-actions-mdata.c:70 +#: tools/ascli-actions-mdata.c:91 msgid "You might need superuser permissions to perform this action." msgstr "Za izvršavanje ove radnje možda su potrebna administratorska prava." -#: tools/ascli-actions-mdata.c:463 +#: tools/ascli-actions-mdata.c:485 msgid "" "You need to give an AppStream software component type to generate a " "template. Possible values are:" @@ -1923,73 +1927,73 @@ "Za generiranje predloška mora se zadati AppStream vrsta softverske " "komponente. Moguće vrijednosti su:" -#: tools/appstream-cli.c:631 +#: tools/appstreamcli.c:657 msgid "" "You need to provide at least two version numbers to compare as parameters." msgstr "" "Moraju se zadati barem dva broja verzija za uspoređivanje kao parametara." -#: tools/ascli-actions-misc.c:393 +#: tools/ascli-actions-misc.c:328 msgid "You need to specify a NEWS file as input." msgstr "Mora se navesti jedna NEWS datoteka kao unos." -#: tools/ascli-actions-misc.c:509 +#: tools/ascli-actions-misc.c:442 msgid "You need to specify a NEWS file as output, or '-' to print to stdout." msgstr "" "Mora se navesti jedna NEWS datoteka kao rezultat ili „-” za ispis u " "standardni rezultat." -#: tools/ascli-actions-misc.c:540 +#: tools/ascli-actions-misc.c:473 msgid "You need to specify a NEWS format to write the output in." msgstr "Mora se navesti jedan NEWS format u kojem će se zapisati rezultat." #. TRANSLATORS: ascli has been run without command. -#: tools/appstream-cli.c:1175 +#: tools/appstreamcli.c:1252 msgid "You need to specify a command." msgstr "Mora se navesti jedna naredba." #. TRANSLATORS: An AppStream component-id is missing in the command-line arguments #. TRANSLATORS: ascli was told to find a software component by its ID, but no component-id was specified. -#: tools/ascli-actions-mdata.c:132 tools/ascli-actions-mdata.c:253 +#: tools/ascli-actions-mdata.c:149 tools/ascli-actions-mdata.c:271 #: tools/ascli-actions-pkgmgr.c:80 msgid "You need to specify a component-ID." msgstr "Mora se navesti jedna ID oznaka komponenata." -#: tools/ascli-actions-misc.c:188 +#: tools/ascli-actions-misc.c:118 msgid "" "You need to specify a desktop-entry file to create or augment as output." msgstr "" "Mora se navesti jedna desktop-entry datoteka za stvaranje ili proširivanje " "kao rezultat." -#: tools/ascli-actions-mdata.c:306 +#: tools/ascli-actions-mdata.c:324 msgid "You need to specify a metadata file." msgstr "Mora se navesti jedna datoteka metapodataka." -#: tools/ascli-actions-misc.c:184 tools/ascli-actions-misc.c:505 +#: tools/ascli-actions-misc.c:114 tools/ascli-actions-misc.c:438 msgid "You need to specify a metainfo file as input." msgstr "Mora se navesti jedna datoteka metapodataka kao unos." -#: tools/ascli-actions-misc.c:397 +#: tools/ascli-actions-misc.c:332 msgid "" "You need to specify a metainfo file to augment, or '-' to print to stdout." msgstr "" "Mora se navesti jedna datoteka metapodataka za proširivanje ili „-” za ispis " "u standardni rezultat." -#: tools/ascli-actions-validate.c:390 tools/ascli-actions-validate.c:484 +#: tools/ascli-actions-validate.c:392 tools/ascli-actions-validate.c:488 msgid "You need to specify a root directory to start validation!" msgstr "Za pokretanje provjere mora se navesti jedna početna mapa!" -#: tools/ascli-actions-mdata.c:164 +#: tools/ascli-actions-mdata.c:181 msgid "You need to specify a term to search for." msgstr "Mora se navesti jedan traženi pojam." -#: tools/ascli-actions-mdata.c:340 +#: tools/ascli-actions-mdata.c:358 msgid "You need to specify an input and output file." msgstr "Moraju se navesti datoteke za unos i za rezultat." -#: tools/ascli-actions-validate.c:268 tools/ascli-actions-validate.c:342 +#: tools/ascli-actions-validate.c:268 tools/ascli-actions-validate.c:344 msgid "You need to specify at least one file to validate!" msgstr "Za provjeru se mora navesti barem jedna datoteka!" @@ -1999,7 +2003,7 @@ #. * to include in a search but that should normally be ignored in #. * the search. #. -#: src/as-pool.c:111 +#: src/as-pool.c:103 msgid "app;application;package;program;programme;suite;tool" msgstr "app;aplikacija;paket;program;komplet;alat" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt.c.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt.c.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt.c.po 2021-08-03 09:03:50.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt.c.po 2022-02-11 23:13:45.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: cmdline/apt.cc:46 msgid "" @@ -89,7 +89,7 @@ msgid "satisfy dependency strings" msgstr "udovolji izrazima zavisnosti" -#: cmdline/apt-cache.cc:184 cmdline/apt-mark.cc:173 +#: cmdline/apt-cache.cc:184 cmdline/apt-mark.cc:175 #, c-format msgid "%s does not take any arguments" msgstr "%s ne sadrži nikakve argumente" @@ -217,18 +217,18 @@ msgid "Couldn't find package %s" msgstr "Nemoguć pronalazak paketa %s" -#: cmdline/apt-get.cc:121 cmdline/apt-mark.cc:94 -#: apt-private/private-install.cc:1060 +#: cmdline/apt-get.cc:121 cmdline/apt-mark.cc:95 +#: apt-private/private-install.cc:1048 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je postavljen za ručnu instalaciju.\n" -#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96 +#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:97 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je postavljen za automatsku instalaciju.\n" -#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135 +#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:137 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -459,80 +459,80 @@ msgid "analyse a pattern" msgstr "analiza uzorka" -#: cmdline/apt-mark.cc:56 cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310 +#: cmdline/apt-mark.cc:57 cmdline/apt-mark.cc:116 cmdline/apt-mark.cc:314 #: apt-private/private-depends.cc:35 apt-private/private-download.cc:255 -#: apt-private/private-show.cc:408 apt-private/private-show.cc:410 -#: apt-private/private-show.cc:465 +#: apt-private/private-show.cc:411 apt-private/private-show.cc:413 +#: apt-private/private-show.cc:468 msgid "No packages found" msgstr "Nema pronađenih paketa" -#: cmdline/apt-mark.cc:66 +#: cmdline/apt-mark.cc:67 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s ne može biti označen da nije instaliran.\n" -#: cmdline/apt-mark.cc:72 +#: cmdline/apt-mark.cc:73 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s je već postavljen na ručnu instalaciju.\n" -#: cmdline/apt-mark.cc:74 +#: cmdline/apt-mark.cc:75 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s je već postavljen na automatsku instalaciju.\n" -#: cmdline/apt-mark.cc:240 +#: cmdline/apt-mark.cc:242 msgid "No changes necessary" msgstr "Promjene nisu potrebne" -#: cmdline/apt-mark.cc:244 +#: cmdline/apt-mark.cc:246 msgid "The following packages will be marked as automatically installed:" msgstr "Sljedeći paketi će biti označeni kao automatski instalirani:" -#: cmdline/apt-mark.cc:251 apt-private/private-install.cc:332 +#: cmdline/apt-mark.cc:253 apt-private/private-install.cc:320 msgid "Do you want to continue?" msgstr "Želite li nastaviti?" -#: cmdline/apt-mark.cc:323 +#: cmdline/apt-mark.cc:327 #, c-format msgid "%s was already set on hold.\n" msgstr "%s je već postavljen na čekanje.\n" -#: cmdline/apt-mark.cc:325 +#: cmdline/apt-mark.cc:329 #, c-format msgid "%s was already not hold.\n" msgstr "%s još nije na čekanju.\n" -#: cmdline/apt-mark.cc:352 +#: cmdline/apt-mark.cc:356 msgid "Executing dpkg failed. Are you root?" msgstr "Pokretanje dpkg-a neuspjelo. Imate li korijenske ovlati?" -#: cmdline/apt-mark.cc:355 +#: cmdline/apt-mark.cc:359 #, c-format msgid "%s set on hold.\n" msgstr "%s je postavljen na čekanje.\n" -#: cmdline/apt-mark.cc:357 +#: cmdline/apt-mark.cc:361 #, c-format msgid "Canceled hold on %s.\n" msgstr "Prekinuto čekanje na %s.\n" -#: cmdline/apt-mark.cc:359 +#: cmdline/apt-mark.cc:363 #, c-format msgid "Selected %s for purge.\n" msgstr "Odaberi %s za uklanjanje paketa i datoteke podešavanja.\n" -#: cmdline/apt-mark.cc:361 +#: cmdline/apt-mark.cc:365 #, c-format msgid "Selected %s for removal.\n" msgstr "Odaberi %s za uklanjanje.\n" -#: cmdline/apt-mark.cc:363 +#: cmdline/apt-mark.cc:367 #, c-format msgid "Selected %s for installation.\n" msgstr "Odaberi %s za instalaciju.\n" -#: cmdline/apt-mark.cc:415 +#: cmdline/apt-mark.cc:419 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -548,35 +548,35 @@ "manipulaciju dpkg(1) stanja odabira paketa, i za ispis\n" "svih paketa s ili bez određenog odabira.\n" -#: cmdline/apt-mark.cc:427 +#: cmdline/apt-mark.cc:431 msgid "Mark the given packages as automatically installed" msgstr "Označi zadane pakete kao automatski instalirane" -#: cmdline/apt-mark.cc:428 +#: cmdline/apt-mark.cc:432 msgid "Mark the given packages as manually installed" msgstr "Označi zadane pakete kao ručno instalirane" -#: cmdline/apt-mark.cc:429 +#: cmdline/apt-mark.cc:433 msgid "Mark all dependencies of meta packages as automatically installed." msgstr "Označi sve zavisnosti meta paketa kao automatski instalirane." -#: cmdline/apt-mark.cc:430 +#: cmdline/apt-mark.cc:434 msgid "Mark a package as held back" msgstr "Označi paket kao zadržan" -#: cmdline/apt-mark.cc:431 +#: cmdline/apt-mark.cc:435 msgid "Unset a package set as held back" msgstr "Odznači paket kao zadržan" -#: cmdline/apt-mark.cc:436 +#: cmdline/apt-mark.cc:440 msgid "Print the list of automatically installed packages" msgstr "Prikaži popis automatski instaliranih paketa" -#: cmdline/apt-mark.cc:437 +#: cmdline/apt-mark.cc:441 msgid "Print the list of manually installed packages" msgstr "Prikaži popis ručno instaliranih paketa" -#: cmdline/apt-mark.cc:438 +#: cmdline/apt-mark.cc:442 msgid "Print the list of packages on hold" msgstr "Prikaži popis paketa na čekanju" @@ -654,12 +654,12 @@ msgid " Done" msgstr " Završeno" -#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:721 +#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:709 msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" "Možda želite pokrenuti 'apt --fix-broken install' za ispravljanje problema." -#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:723 +#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:711 msgid "" "Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " "specify a solution)." @@ -667,43 +667,43 @@ "Nerazrješive zavisnosti. Pokušajte 'apt --fix-broken install' bez paketa " "(ili navedite rješenje)." -#: apt-private/private-cacheset.cc:36 apt-private/private-search.cc:89 +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:89 msgid "Sorting" msgstr "Razvrstavanje" -#: apt-private/private-cacheset.cc:212 +#: apt-private/private-cacheset.cc:226 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Napomena, odabir '%s' za zadatak '%s'\n" -#: apt-private/private-cacheset.cc:218 +#: apt-private/private-cacheset.cc:232 #, c-format msgid "Note, selecting '%s' for glob '%s'\n" msgstr "Napomena, odabiranje '%s' za glob '%s'\n" -#: apt-private/private-cacheset.cc:224 +#: apt-private/private-cacheset.cc:238 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Napomena, odabir '%s' za uobičajeni izraz '%s'\n" -#: apt-private/private-cacheset.cc:251 +#: apt-private/private-cacheset.cc:266 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je virtualan paket pružen od:\n" -#: apt-private/private-cacheset.cc:263 +#: apt-private/private-cacheset.cc:280 msgid " [Installed]" msgstr " [Instalirano]" -#: apt-private/private-cacheset.cc:272 +#: apt-private/private-cacheset.cc:292 msgid " [Not candidate version]" msgstr " [Nije inačica kandidata]" -#: apt-private/private-cacheset.cc:274 +#: apt-private/private-cacheset.cc:295 msgid "You should explicitly select one to install." msgstr "Trebali bi obavezno odabrati jedan za instalaciju." -#: apt-private/private-cacheset.cc:277 +#: apt-private/private-cacheset.cc:298 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -714,48 +714,48 @@ "To može značiti kako paket nedostaje, zastario je ili je\n" "samo dostupan iz drugog izvora.\n" -#: apt-private/private-cacheset.cc:293 +#: apt-private/private-cacheset.cc:314 msgid "However the following packages replace it:" msgstr "Ipak sljedeći paketi ga zamjenjuju:" -#: apt-private/private-cacheset.cc:333 +#: apt-private/private-cacheset.cc:386 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Paket '%s' nema kandidata za instalaciju" -#: apt-private/private-cacheset.cc:346 +#: apt-private/private-cacheset.cc:399 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtualan paket poput '%s' se ne može ukloniti\n" #. TRANSLATORS: Note, this is not an interactive question -#: apt-private/private-cacheset.cc:358 apt-private/private-install.cc:1144 +#: apt-private/private-cacheset.cc:411 apt-private/private-install.cc:1132 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Paket '%s' nije instaliran, stoga se ne može ukloniti. Jeste li mislili " "'%s'?\n" -#: apt-private/private-cacheset.cc:364 apt-private/private-install.cc:1150 +#: apt-private/private-cacheset.cc:417 apt-private/private-install.cc:1138 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Paket '%s' nije instaliran, stoga se ne može ukloniti.\n" -#: apt-private/private-cacheset.cc:409 +#: apt-private/private-cacheset.cc:487 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Napomena, odabir '%s' umjesto '%s'\n" -#: apt-private/private-cmndline.cc:417 +#: apt-private/private-cmndline.cc:418 msgid "Most used commands:" msgstr "Najčešće korištene naredbe:" -#: apt-private/private-cmndline.cc:457 +#: apt-private/private-cmndline.cc:458 #, c-format msgid "See %s for more information about the available commands." msgstr "Pogledajte %s za više informacija o dostupnim naredbama." -#: apt-private/private-cmndline.cc:461 +#: apt-private/private-cmndline.cc:462 msgid "" "Configuration options and syntax is detailed in apt.conf(5).\n" "Information about how to configure sources can be found in sources.list(5).\n" @@ -767,15 +767,15 @@ "Izbori paketa i inačice su dostupne putem apt_preferences(5).\n" "Sigurnosne pojedinosti su dostupne u apt-secure(8).\n" -#: apt-private/private-cmndline.cc:466 +#: apt-private/private-cmndline.cc:467 msgid "This APT has Super Cow Powers." msgstr "Ovaj APT ima moći Super krave." -#: apt-private/private-cmndline.cc:468 +#: apt-private/private-cmndline.cc:469 msgid "This APT helper has Super Meep Powers." msgstr "Ovaj APT pomagać ima moći Super Meepa." -#: apt-private/private-cmndline.cc:565 +#: apt-private/private-cmndline.cc:567 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -847,7 +847,7 @@ #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:70 apt-private/private-install.cc:563 +#: apt-private/private-install.cc:70 apt-private/private-install.cc:551 msgid "The following information may help to resolve the situation:" msgstr "Sljedeće informacije mogu pomoći u rješavanju ovog problema:" @@ -855,7 +855,7 @@ msgid "Broken packages" msgstr "Slomljeni paketi" -#: apt-private/private-install.cc:174 apt-private/private-install.cc:366 +#: apt-private/private-install.cc:174 apt-private/private-install.cc:354 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -931,7 +931,7 @@ msgstr "" "Nakon ove radnje, %sB dodatnog prostora na disku će biti oslobođeno.\n" -#: apt-private/private-install.cc:305 apt-private/private-install.cc:327 +#: apt-private/private-install.cc:305 apt-private/private-install.cc:315 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Obični samo određeni, ali ovo nije obična radnja." @@ -952,31 +952,31 @@ "Za nastavk utipkajte izraz '%s'\n" " ?] " -#: apt-private/private-install.cc:317 apt-private/private-install.cc:334 +#: apt-private/private-install.cc:322 msgid "Abort." msgstr "Prekinuto." -#: apt-private/private-install.cc:360 +#: apt-private/private-install.cc:348 msgid "Some files failed to download" msgstr "Neke datoteke se nisu preuzele" -#: apt-private/private-install.cc:361 apt-private/private-source.cc:495 +#: apt-private/private-install.cc:349 apt-private/private-source.cc:492 msgid "Download complete and in download only mode" msgstr "Preuzimanje je završeno u načinu rada samo preuzimanja" -#: apt-private/private-install.cc:369 +#: apt-private/private-install.cc:357 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamjena medija trenutno nisu podržani" -#: apt-private/private-install.cc:374 +#: apt-private/private-install.cc:362 msgid "Unable to correct missing packages." msgstr "Nemoguć ispravak nedostajućih paketa." -#: apt-private/private-install.cc:375 +#: apt-private/private-install.cc:363 msgid "Aborting install." msgstr "Prekidanje instalacije." -#: apt-private/private-install.cc:403 +#: apt-private/private-install.cc:391 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -993,16 +993,16 @@ "Sljedeći paketi su nestali s vašeg sustava jer su\n" "sve datoteke zamijenjene drugim paketima:" -#: apt-private/private-install.cc:410 +#: apt-private/private-install.cc:398 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Napomena: ovo je učinjeno automatski kao potreba dpkg-a." -#: apt-private/private-install.cc:453 +#: apt-private/private-install.cc:441 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Ne podržavamo brisanje stvari, nemoguće pokretanje automatskog uklanjatelja" -#: apt-private/private-install.cc:560 +#: apt-private/private-install.cc:548 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1010,11 +1010,11 @@ "Hm, izgleda kako je automatski uklanjatelj uništio nešto što zapravo\n" "nije trebao. Prijavite izvještaj greške za apt." -#: apt-private/private-install.cc:567 +#: apt-private/private-install.cc:555 msgid "Internal Error, AutoRemover broke stuff" msgstr "Unutrašnja greška, automatski uklanjatelj je slomio postupak" -#: apt-private/private-install.cc:578 +#: apt-private/private-install.cc:566 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -1024,7 +1024,7 @@ msgstr[1] "Sljedeći paketi su automatski instalirani i više nisu potrebni:" msgstr[2] "Sljedeći paketi su automatski instalirani i više nisu potrebni:" -#: apt-private/private-install.cc:585 +#: apt-private/private-install.cc:573 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1033,7 +1033,7 @@ msgstr[1] "%lu paketa su automatski instalirana i više nisu potrebna.\n" msgstr[2] "%lu paketa je automatski instalirano i više nisu potrebni.\n" -#: apt-private/private-install.cc:595 +#: apt-private/private-install.cc:583 #, c-format msgid "Use '%s' to remove it." msgid_plural "Use '%s' to remove them." @@ -1041,51 +1041,51 @@ msgstr[1] "Koristi '%s' kako bi ih uklonili." msgstr[2] "Koristi '%s' kako bi ih uklonili." -#: apt-private/private-install.cc:802 apt-private/private-install.cc:809 -#: apt-private/private-install.cc:817 +#: apt-private/private-install.cc:790 apt-private/private-install.cc:797 +#: apt-private/private-install.cc:805 #, c-format msgid "Unsupported file %s given on commandline" msgstr "Nepodržana datoteka %s zadana u naredbenom redku" -#: apt-private/private-install.cc:886 +#: apt-private/private-install.cc:874 msgid "The following additional packages will be installed:" msgstr "Sljedeći dodatni paketi će biti instalirani:" -#: apt-private/private-install.cc:975 +#: apt-private/private-install.cc:963 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: apt-private/private-install.cc:977 +#: apt-private/private-install.cc:965 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: apt-private/private-install.cc:1019 +#: apt-private/private-install.cc:1007 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskačem %s, već je instaliran a nadogradnja nije postavljena.\n" -#: apt-private/private-install.cc:1023 +#: apt-private/private-install.cc:1011 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Preskačem %s, nije instaliran a samo nadogradnje su zahtjevane.\n" -#: apt-private/private-install.cc:1035 +#: apt-private/private-install.cc:1023 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna instalacija %s nije moguća, ne može se preuzeti.\n" #. TRANSLATORS: First string is package name, second is version -#: apt-private/private-install.cc:1041 +#: apt-private/private-install.cc:1029 #, c-format msgid "%s is already the newest version (%s).\n" msgstr "%s je već najnovije inačice (%s).\n" -#: apt-private/private-install.cc:1093 +#: apt-private/private-install.cc:1081 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Odabrana inačica '%s' (%s) za '%s'\n" -#: apt-private/private-install.cc:1102 +#: apt-private/private-install.cc:1090 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Odabrana inačica '%s' (%s) za '%s' zbog '%s'\n" @@ -1290,7 +1290,7 @@ msgid "Full Text Search" msgstr "Potpuni tekst pretrage" -#: apt-private/private-show.cc:392 +#: apt-private/private-show.cc:395 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" @@ -1302,48 +1302,48 @@ msgstr[2] "" "Postoji %i dodatnih snimaka. Koristite '-a' zamjenjivač kako bi ih vidjeli" -#: apt-private/private-show.cc:400 +#: apt-private/private-show.cc:403 msgid "not a real package (virtual)" msgstr "nije stvaran paket (virtualan)" -#: apt-private/private-show.cc:460 +#: apt-private/private-show.cc:463 #, c-format msgid "Unable to locate package %s" msgstr "Nemoguće je locirati paket %s" -#: apt-private/private-show.cc:486 +#: apt-private/private-show.cc:489 msgid "Package files:" msgstr "Datoteke paketa:" -#: apt-private/private-show.cc:495 apt-private/private-show.cc:579 +#: apt-private/private-show.cc:498 apt-private/private-show.cc:582 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predmemorija nije usklađena, nemoguće x-ref datoteku paketa" #. Show any packages have explicit pins -#: apt-private/private-show.cc:509 +#: apt-private/private-show.cc:512 msgid "Pinned packages:" msgstr "Prikačeni paketi:" #. Print the package name and the version we are forcing to -#: apt-private/private-show.cc:520 +#: apt-private/private-show.cc:523 #, c-format msgid "%s -> %s with priority %d\n" msgstr "%s -> %s s prioritetom %d\n" -#: apt-private/private-show.cc:526 +#: apt-private/private-show.cc:529 msgid " Installed: " msgstr " Instalirano: " -#: apt-private/private-show.cc:527 +#: apt-private/private-show.cc:530 msgid " Candidate: " msgstr " Kandidat: " -#: apt-private/private-show.cc:545 apt-private/private-show.cc:553 +#: apt-private/private-show.cc:548 apt-private/private-show.cc:556 msgid "(none)" msgstr "(nijedan)" #. Show the priority tables -#: apt-private/private-show.cc:558 +#: apt-private/private-show.cc:561 msgid " Version table:" msgstr " Tablica inačice:" @@ -1367,22 +1367,22 @@ msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Odabir '%s' kao paketa izvora umjesto '%s'\n" -#: apt-private/private-source.cc:292 +#: apt-private/private-source.cc:289 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Nemoguć pronalazak inačice '%s' paketa '%s'" -#: apt-private/private-source.cc:314 +#: apt-private/private-source.cc:311 msgid "Must specify at least one package to fetch source for" msgstr "Treba biti određen bar jedan paket za koji se preuzima izvor" -#: apt-private/private-source.cc:348 apt-private/private-source.cc:764 -#: apt-private/private-source.cc:774 apt-private/private-source.cc:801 +#: apt-private/private-source.cc:345 apt-private/private-source.cc:760 +#: apt-private/private-source.cc:770 apt-private/private-source.cc:797 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemoguć pronalazak paketa izvora za %s" -#: apt-private/private-source.cc:368 +#: apt-private/private-source.cc:365 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -1391,7 +1391,7 @@ "NAPOMENA: '%s' pakiranje se održava u inačici '%s' sustava upravljanja pri:\n" "%s\n" -#: apt-private/private-source.cc:379 +#: apt-private/private-source.cc:376 #, c-format msgid "" "Please use:\n" @@ -1402,64 +1402,64 @@ "%s\n" "kako bi preuzeli najnovije (po mogućnosti neobjavljene) nadopune za paket.\n" -#: apt-private/private-source.cc:427 +#: apt-private/private-source.cc:424 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskačem već preuzete pakete '%s'\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-source.cc:459 +#: apt-private/private-source.cc:456 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je preuzeti %sB/%sB izvora arhiva.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-source.cc:464 +#: apt-private/private-source.cc:461 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je preuzeti %sB izvora arhiva.\n" -#: apt-private/private-source.cc:470 +#: apt-private/private-source.cc:467 #, c-format msgid "Fetch source %s\n" msgstr "Preuzmi izvor %s\n" -#: apt-private/private-source.cc:491 +#: apt-private/private-source.cc:488 msgid "Failed to fetch some archives." msgstr "Neuspjelo preuzimanje nekih arhiva" -#: apt-private/private-source.cc:512 +#: apt-private/private-source.cc:509 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakanje raspakiravanja već raspakiranih izvora u %s\n" -#: apt-private/private-source.cc:525 +#: apt-private/private-source.cc:522 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Naredba raspakiravanja '%s' neuspjela.\n" -#: apt-private/private-source.cc:528 +#: apt-private/private-source.cc:525 msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Provjerite je li 'dpkg-dev' paket instaliran.\n" -#: apt-private/private-source.cc:558 +#: apt-private/private-source.cc:555 #, c-format msgid "Build command '%s' failed.\n" msgstr "Naredba izgradnje '%s' neuspjela.\n" -#: apt-private/private-source.cc:583 apt-private/private-source.cc:589 +#: apt-private/private-source.cc:580 apt-private/private-source.cc:586 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemoguće preuzimanje informacije zavisnosti izgradnje za %s" -#: apt-private/private-source.cc:594 +#: apt-private/private-source.cc:591 #, c-format msgid "%s has no build depends.\n" msgstr "%s nema zavisnosti izgradnje.\n" -#: apt-private/private-source.cc:646 +#: apt-private/private-source.cc:644 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) " @@ -1468,11 +1468,11 @@ "Nema dostupne informacije arhitekture za %s. Pogledajte apt.conf(5) " "APT::Architectures za postavljanje" -#: apt-private/private-source.cc:663 +#: apt-private/private-source.cc:659 msgid "Must specify at least one package to check builddeps for" msgstr "Morate odrediti bar jedan paket provjere zavisnosti izgradnje za" -#: apt-private/private-source.cc:706 +#: apt-private/private-source.cc:702 #, c-format msgid "" "Invalid operator '%c' at offset %d, did you mean '%c%c' or '%c='? - in: %s" @@ -1480,19 +1480,19 @@ "Neispravan operator '%c' na pomaku %d, jeste li mislili '%c%c' ili '%c='? - " "u: %s" -#: apt-private/private-source.cc:768 +#: apt-private/private-source.cc:764 #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" msgstr "" "Napomena, koristi se direktorij '%s'za preuzimanje zavisnosti izgradnje\n" -#: apt-private/private-source.cc:770 +#: apt-private/private-source.cc:766 #, c-format msgid "Note, using file '%s' to get the build dependencies\n" msgstr "" "Napomena, koristi se datoteka '%s'za preuzimanje zavisnosti izgradnje\n" -#: apt-private/private-source.cc:900 +#: apt-private/private-source.cc:896 msgid "Failed to process build dependencies" msgstr "Neuspjela obrada zavisnosti izgradnje" @@ -1681,16 +1681,16 @@ msgstr "Nepoznata greška pokretanja apt-key" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. -#: methods/gpgv.cc:448 +#: methods/gpgv.cc:472 #, c-format msgid "Signature by key %s uses weak digest algorithm (%s)" msgstr "Potpis ključem %s koristi slab algoritam (%s)" -#: methods/gpgv.cc:464 methods/gpgv.cc:470 +#: methods/gpgv.cc:488 methods/gpgv.cc:494 msgid "The following signatures were invalid:\n" msgstr "Sljedeći potpisi su neispravni:\n" -#: methods/gpgv.cc:476 +#: methods/gpgv.cc:500 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1723,7 +1723,7 @@ msgid "Disk not found." msgstr "Disk nije pronađen." -#: methods/http.cc:620 methods/http.cc:858 methods/basehttp.cc:727 +#: methods/http.cc:622 methods/http.cc:860 methods/basehttp.cc:760 #: methods/ftp.cc:970 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" @@ -1735,23 +1735,23 @@ msgid "Error writing to the file" msgstr "Greška zapisivanja u datoteku" -#: methods/http.cc:724 +#: methods/http.cc:726 msgid "Error reading from server. Remote end closed connection" msgstr "Greška čitanja s poslužitelja. Udaljeno povezivanje prekinuto." -#: methods/http.cc:728 +#: methods/http.cc:730 msgid "Error reading from server" msgstr "Greška čitanja s poslužitelja" -#: methods/http.cc:747 +#: methods/http.cc:749 msgid "Error writing to file" msgstr "Greška zapisivanja u datoteku" -#: methods/http.cc:815 +#: methods/http.cc:817 msgid "Select failed" msgstr "Odabir neuspio" -#: methods/http.cc:821 +#: methods/http.cc:823 msgid "Connection timed out" msgstr "Istek povezivanja" @@ -1759,47 +1759,47 @@ msgid "Error writing to output file" msgstr "Greška zapisivanja izlazne datoteke" -#: methods/http.cc:1015 methods/ftp.cc:918 methods/rsh.cc:334 +#: methods/http.cc:1017 methods/ftp.cc:918 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "Problem jednistvene vrijednosti datoteke" -#: methods/basehttp.cc:53 +#: methods/basehttp.cc:55 msgid "Waiting for headers" msgstr "Čekanje zaglavlja" -#: methods/basehttp.cc:104 methods/basehttp.cc:111 +#: methods/basehttp.cc:106 methods/basehttp.cc:113 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP poslužitelj je poslao neispravan odgovor zaglavlja" -#: methods/basehttp.cc:142 +#: methods/basehttp.cc:144 msgid "Bad header line" msgstr "Nevaljani redak zaglavlja" -#: methods/basehttp.cc:168 +#: methods/basehttp.cc:173 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP poslužitelj je poslao neispravno zaglavlje Sadržaja-Duljine" -#: methods/basehttp.cc:199 +#: methods/basehttp.cc:206 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP poslužitelj je poslao neispravno zaglavlje Sadržaja-Opsega" -#: methods/basehttp.cc:201 +#: methods/basehttp.cc:208 msgid "This HTTP server has broken range support" msgstr "Ovaj HTTP poslužitelj ima slomljen opseg podrške" -#: methods/basehttp.cc:239 +#: methods/basehttp.cc:247 msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/basehttp.cc:655 +#: methods/basehttp.cc:688 msgid "Bad header data" msgstr "Nevaljali podatak zaglavlja" -#: methods/basehttp.cc:674 +#: methods/basehttp.cc:707 msgid "Connection failed" msgstr "Neuspjelo povezivanje" -#: methods/basehttp.cc:769 +#: methods/basehttp.cc:802 #, c-format msgid "" "Automatically disabled %s due to incorrect response from server/proxy. (man " @@ -1808,7 +1808,7 @@ "Automatski onemogućen %s uslijed neispravnog odgovora s poslužitelja/proxya. " "(man 5 apt.conf)" -#: methods/basehttp.cc:871 +#: methods/basehttp.cc:904 msgid "Internal error" msgstr "Unutrašnja greška" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/aptitude.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/aptitude.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/aptitude.po 2021-08-03 09:04:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/aptitude.po 2022-02-11 23:13:55.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 15:59+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:50+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" # TODO: diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt-listchanges.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt-listchanges.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt-listchanges.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt-listchanges.po 2022-02-11 23:13: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: 2021-08-02 15:59+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../apt-listchanges.py:70 #, python-format diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt.po 2022-02-11 23:13:50.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' #: apt-private/acqprogress.cc:77 @@ -93,12 +93,12 @@ msgid " Done" msgstr " Završeno" -#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:721 +#: apt-private/private-cachefile.cc:111 apt-private/private-install.cc:709 msgid "You might want to run 'apt --fix-broken install' to correct these." msgstr "" "Možda želite pokrenuti 'apt --fix-broken install' za ispravljanje problema." -#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:723 +#: apt-private/private-cachefile.cc:113 apt-private/private-install.cc:711 msgid "" "Unmet dependencies. Try 'apt --fix-broken install' with no packages (or " "specify a solution)." @@ -106,43 +106,43 @@ "Nerazrješive zavisnosti. Pokušajte 'apt --fix-broken install' bez paketa " "(ili navedite rješenje)." -#: apt-private/private-cacheset.cc:36 apt-private/private-search.cc:89 +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:89 msgid "Sorting" msgstr "Razvrstavanje" -#: apt-private/private-cacheset.cc:212 +#: apt-private/private-cacheset.cc:226 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "Napomena, odabir '%s' za zadatak '%s'\n" -#: apt-private/private-cacheset.cc:218 +#: apt-private/private-cacheset.cc:232 #, c-format msgid "Note, selecting '%s' for glob '%s'\n" msgstr "Napomena, odabiranje '%s' za glob '%s'\n" -#: apt-private/private-cacheset.cc:224 +#: apt-private/private-cacheset.cc:238 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "Napomena, odabir '%s' za uobičajeni izraz '%s'\n" -#: apt-private/private-cacheset.cc:251 +#: apt-private/private-cacheset.cc:266 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je virtualan paket pružen od:\n" -#: apt-private/private-cacheset.cc:263 +#: apt-private/private-cacheset.cc:280 msgid " [Installed]" msgstr " [Instalirano]" -#: apt-private/private-cacheset.cc:272 +#: apt-private/private-cacheset.cc:292 msgid " [Not candidate version]" msgstr " [Nije inačica kandidata]" -#: apt-private/private-cacheset.cc:274 +#: apt-private/private-cacheset.cc:295 msgid "You should explicitly select one to install." msgstr "Trebali bi obavezno odabrati jedan za instalaciju." -#: apt-private/private-cacheset.cc:277 +#: apt-private/private-cacheset.cc:298 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -153,48 +153,48 @@ "To može značiti kako paket nedostaje, zastario je ili je\n" "samo dostupan iz drugog izvora.\n" -#: apt-private/private-cacheset.cc:293 +#: apt-private/private-cacheset.cc:314 msgid "However the following packages replace it:" msgstr "Ipak sljedeći paketi ga zamjenjuju:" -#: apt-private/private-cacheset.cc:333 +#: apt-private/private-cacheset.cc:386 #, c-format msgid "Package '%s' has no installation candidate" msgstr "Paket '%s' nema kandidata za instalaciju" -#: apt-private/private-cacheset.cc:346 +#: apt-private/private-cacheset.cc:399 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "Virtualan paket poput '%s' se ne može ukloniti\n" #. TRANSLATORS: Note, this is not an interactive question -#: apt-private/private-cacheset.cc:358 apt-private/private-install.cc:1144 +#: apt-private/private-cacheset.cc:411 apt-private/private-install.cc:1132 #, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "" "Paket '%s' nije instaliran, stoga se ne može ukloniti. Jeste li mislili " "'%s'?\n" -#: apt-private/private-cacheset.cc:364 apt-private/private-install.cc:1150 +#: apt-private/private-cacheset.cc:417 apt-private/private-install.cc:1138 #, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Paket '%s' nije instaliran, stoga se ne može ukloniti.\n" -#: apt-private/private-cacheset.cc:409 +#: apt-private/private-cacheset.cc:487 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "Napomena, odabir '%s' umjesto '%s'\n" -#: apt-private/private-cmndline.cc:417 +#: apt-private/private-cmndline.cc:418 msgid "Most used commands:" msgstr "Najčešće korištene naredbe:" -#: apt-private/private-cmndline.cc:457 +#: apt-private/private-cmndline.cc:458 #, c-format msgid "See %s for more information about the available commands." msgstr "Pogledajte %s za više informacija o dostupnim naredbama." -#: apt-private/private-cmndline.cc:461 +#: apt-private/private-cmndline.cc:462 msgid "" "Configuration options and syntax is detailed in apt.conf(5).\n" "Information about how to configure sources can be found in sources.list(5).\n" @@ -206,15 +206,15 @@ "Izbori paketa i inačice su dostupne putem apt_preferences(5).\n" "Sigurnosne pojedinosti su dostupne u apt-secure(8).\n" -#: apt-private/private-cmndline.cc:466 +#: apt-private/private-cmndline.cc:467 msgid "This APT has Super Cow Powers." msgstr "Ovaj APT ima moći Super krave." -#: apt-private/private-cmndline.cc:468 +#: apt-private/private-cmndline.cc:469 msgid "This APT helper has Super Meep Powers." msgstr "Ovaj APT pomagać ima moći Super Meepa." -#: apt-private/private-cmndline.cc:565 +#: apt-private/private-cmndline.cc:567 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -223,9 +223,9 @@ "--allow." #: apt-private/private-depends.cc:35 apt-private/private-download.cc:255 -#: apt-private/private-show.cc:408 apt-private/private-show.cc:410 -#: apt-private/private-show.cc:465 cmdline/apt-mark.cc:56 -#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310 +#: apt-private/private-show.cc:411 apt-private/private-show.cc:413 +#: apt-private/private-show.cc:468 cmdline/apt-mark.cc:57 +#: cmdline/apt-mark.cc:116 cmdline/apt-mark.cc:314 msgid "No packages found" msgstr "Nema pronađenih paketa" @@ -293,7 +293,7 @@ #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:70 apt-private/private-install.cc:563 +#: apt-private/private-install.cc:70 apt-private/private-install.cc:551 msgid "The following information may help to resolve the situation:" msgstr "Sljedeće informacije mogu pomoći u rješavanju ovog problema:" @@ -301,7 +301,7 @@ msgid "Broken packages" msgstr "Slomljeni paketi" -#: apt-private/private-install.cc:174 apt-private/private-install.cc:366 +#: apt-private/private-install.cc:174 apt-private/private-install.cc:354 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -377,7 +377,7 @@ msgstr "" "Nakon ove radnje, %sB dodatnog prostora na disku će biti oslobođeno.\n" -#: apt-private/private-install.cc:305 apt-private/private-install.cc:327 +#: apt-private/private-install.cc:305 apt-private/private-install.cc:315 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Obični samo određeni, ali ovo nije obična radnja." @@ -398,35 +398,35 @@ "Za nastavk utipkajte izraz '%s'\n" " ?] " -#: apt-private/private-install.cc:317 apt-private/private-install.cc:334 +#: apt-private/private-install.cc:322 msgid "Abort." msgstr "Prekinuto." -#: apt-private/private-install.cc:332 cmdline/apt-mark.cc:251 +#: apt-private/private-install.cc:320 cmdline/apt-mark.cc:253 msgid "Do you want to continue?" msgstr "Želite li nastaviti?" -#: apt-private/private-install.cc:360 +#: apt-private/private-install.cc:348 msgid "Some files failed to download" msgstr "Neke datoteke se nisu preuzele" -#: apt-private/private-install.cc:361 apt-private/private-source.cc:495 +#: apt-private/private-install.cc:349 apt-private/private-source.cc:492 msgid "Download complete and in download only mode" msgstr "Preuzimanje je završeno u načinu rada samo preuzimanja" -#: apt-private/private-install.cc:369 +#: apt-private/private-install.cc:357 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamjena medija trenutno nisu podržani" -#: apt-private/private-install.cc:374 +#: apt-private/private-install.cc:362 msgid "Unable to correct missing packages." msgstr "Nemoguć ispravak nedostajućih paketa." -#: apt-private/private-install.cc:375 +#: apt-private/private-install.cc:363 msgid "Aborting install." msgstr "Prekidanje instalacije." -#: apt-private/private-install.cc:403 +#: apt-private/private-install.cc:391 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -443,16 +443,16 @@ "Sljedeći paketi su nestali s vašeg sustava jer su\n" "sve datoteke zamijenjene drugim paketima:" -#: apt-private/private-install.cc:410 +#: apt-private/private-install.cc:398 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "Napomena: ovo je učinjeno automatski kao potreba dpkg-a." -#: apt-private/private-install.cc:453 +#: apt-private/private-install.cc:441 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Ne podržavamo brisanje stvari, nemoguće pokretanje automatskog uklanjatelja" -#: apt-private/private-install.cc:560 +#: apt-private/private-install.cc:548 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -460,11 +460,11 @@ "Hm, izgleda kako je automatski uklanjatelj uništio nešto što zapravo\n" "nije trebao. Prijavite izvještaj greške za apt." -#: apt-private/private-install.cc:567 +#: apt-private/private-install.cc:555 msgid "Internal Error, AutoRemover broke stuff" msgstr "Unutrašnja greška, automatski uklanjatelj je slomio postupak" -#: apt-private/private-install.cc:578 +#: apt-private/private-install.cc:566 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -474,7 +474,7 @@ msgstr[1] "Sljedeći paketi su automatski instalirani i više nisu potrebni:" msgstr[2] "Sljedeći paketi su automatski instalirani i više nisu potrebni:" -#: apt-private/private-install.cc:585 +#: apt-private/private-install.cc:573 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -483,7 +483,7 @@ msgstr[1] "%lu paketa su automatski instalirana i više nisu potrebna.\n" msgstr[2] "%lu paketa je automatski instalirano i više nisu potrebni.\n" -#: apt-private/private-install.cc:595 +#: apt-private/private-install.cc:583 #, c-format msgid "Use '%s' to remove it." msgid_plural "Use '%s' to remove them." @@ -491,57 +491,57 @@ msgstr[1] "Koristi '%s' kako bi ih uklonili." msgstr[2] "Koristi '%s' kako bi ih uklonili." -#: apt-private/private-install.cc:802 apt-private/private-install.cc:809 -#: apt-private/private-install.cc:817 +#: apt-private/private-install.cc:790 apt-private/private-install.cc:797 +#: apt-private/private-install.cc:805 #, c-format msgid "Unsupported file %s given on commandline" msgstr "Nepodržana datoteka %s zadana u naredbenom redku" -#: apt-private/private-install.cc:886 +#: apt-private/private-install.cc:874 msgid "The following additional packages will be installed:" msgstr "Sljedeći dodatni paketi će biti instalirani:" -#: apt-private/private-install.cc:975 +#: apt-private/private-install.cc:963 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: apt-private/private-install.cc:977 +#: apt-private/private-install.cc:965 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: apt-private/private-install.cc:1019 +#: apt-private/private-install.cc:1007 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Preskačem %s, već je instaliran a nadogradnja nije postavljena.\n" -#: apt-private/private-install.cc:1023 +#: apt-private/private-install.cc:1011 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Preskačem %s, nije instaliran a samo nadogradnje su zahtjevane.\n" -#: apt-private/private-install.cc:1035 +#: apt-private/private-install.cc:1023 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna instalacija %s nije moguća, ne može se preuzeti.\n" #. TRANSLATORS: First string is package name, second is version -#: apt-private/private-install.cc:1041 +#: apt-private/private-install.cc:1029 #, c-format msgid "%s is already the newest version (%s).\n" msgstr "%s je već najnovije inačice (%s).\n" -#: apt-private/private-install.cc:1060 cmdline/apt-get.cc:121 -#: cmdline/apt-mark.cc:94 +#: apt-private/private-install.cc:1048 cmdline/apt-get.cc:121 +#: cmdline/apt-mark.cc:95 #, c-format msgid "%s set to manually installed.\n" msgstr "%s je postavljen za ručnu instalaciju.\n" -#: apt-private/private-install.cc:1093 +#: apt-private/private-install.cc:1081 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Odabrana inačica '%s' (%s) za '%s'\n" -#: apt-private/private-install.cc:1102 +#: apt-private/private-install.cc:1090 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Odabrana inačica '%s' (%s) za '%s' zbog '%s'\n" @@ -746,7 +746,7 @@ msgid "Full Text Search" msgstr "Potpuni tekst pretrage" -#: apt-private/private-show.cc:392 +#: apt-private/private-show.cc:395 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" @@ -758,48 +758,48 @@ msgstr[2] "" "Postoji %i dodatnih snimaka. Koristite '-a' zamjenjivač kako bi ih vidjeli" -#: apt-private/private-show.cc:400 +#: apt-private/private-show.cc:403 msgid "not a real package (virtual)" msgstr "nije stvaran paket (virtualan)" -#: apt-private/private-show.cc:460 +#: apt-private/private-show.cc:463 #, c-format msgid "Unable to locate package %s" msgstr "Nemoguće je locirati paket %s" -#: apt-private/private-show.cc:486 +#: apt-private/private-show.cc:489 msgid "Package files:" msgstr "Datoteke paketa:" -#: apt-private/private-show.cc:495 apt-private/private-show.cc:579 +#: apt-private/private-show.cc:498 apt-private/private-show.cc:582 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Predmemorija nije usklađena, nemoguće x-ref datoteku paketa" #. Show any packages have explicit pins -#: apt-private/private-show.cc:509 +#: apt-private/private-show.cc:512 msgid "Pinned packages:" msgstr "Prikačeni paketi:" #. Print the package name and the version we are forcing to -#: apt-private/private-show.cc:520 +#: apt-private/private-show.cc:523 #, c-format msgid "%s -> %s with priority %d\n" msgstr "%s -> %s s prioritetom %d\n" -#: apt-private/private-show.cc:526 +#: apt-private/private-show.cc:529 msgid " Installed: " msgstr " Instalirano: " -#: apt-private/private-show.cc:527 +#: apt-private/private-show.cc:530 msgid " Candidate: " msgstr " Kandidat: " -#: apt-private/private-show.cc:545 apt-private/private-show.cc:553 +#: apt-private/private-show.cc:548 apt-private/private-show.cc:556 msgid "(none)" msgstr "(nema)" #. Show the priority tables -#: apt-private/private-show.cc:558 +#: apt-private/private-show.cc:561 msgid " Version table:" msgstr " Tablica inačice:" @@ -823,22 +823,22 @@ msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Odabir '%s' kao paketa izvora umjesto '%s'\n" -#: apt-private/private-source.cc:292 +#: apt-private/private-source.cc:289 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "Nemoguć pronalazak inačice '%s' paketa '%s'" -#: apt-private/private-source.cc:314 +#: apt-private/private-source.cc:311 msgid "Must specify at least one package to fetch source for" msgstr "Treba biti određen bar jedan paket za koji se preuzima izvor" -#: apt-private/private-source.cc:348 apt-private/private-source.cc:764 -#: apt-private/private-source.cc:774 apt-private/private-source.cc:801 +#: apt-private/private-source.cc:345 apt-private/private-source.cc:760 +#: apt-private/private-source.cc:770 apt-private/private-source.cc:797 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemoguć pronalazak paketa izvora za %s" -#: apt-private/private-source.cc:368 +#: apt-private/private-source.cc:365 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" @@ -847,7 +847,7 @@ "NAPOMENA: '%s' pakiranje se održava u inačici '%s' sustava upravljanja pri:\n" "%s\n" -#: apt-private/private-source.cc:379 +#: apt-private/private-source.cc:376 #, c-format msgid "" "Please use:\n" @@ -858,64 +858,64 @@ "%s\n" "kako bi preuzeli najnovije (po mogućnosti neobjavljene) nadopune za paket.\n" -#: apt-private/private-source.cc:427 +#: apt-private/private-source.cc:424 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Preskačem već preuzete pakete '%s'\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-source.cc:459 +#: apt-private/private-source.cc:456 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je preuzeti %sB/%sB izvora arhiva.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-source.cc:464 +#: apt-private/private-source.cc:461 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je preuzeti %sB izvora arhiva.\n" -#: apt-private/private-source.cc:470 +#: apt-private/private-source.cc:467 #, c-format msgid "Fetch source %s\n" msgstr "Preuzmi izvor %s\n" -#: apt-private/private-source.cc:491 +#: apt-private/private-source.cc:488 msgid "Failed to fetch some archives." msgstr "Neuspjelo preuzimanje nekih arhiva" -#: apt-private/private-source.cc:512 +#: apt-private/private-source.cc:509 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Preskakanje raspakiravanja već raspakiranih izvora u %s\n" -#: apt-private/private-source.cc:525 +#: apt-private/private-source.cc:522 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Naredba raspakiravanja '%s' neuspjela.\n" -#: apt-private/private-source.cc:528 +#: apt-private/private-source.cc:525 msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Provjerite je li 'dpkg-dev' paket instaliran.\n" -#: apt-private/private-source.cc:558 +#: apt-private/private-source.cc:555 #, c-format msgid "Build command '%s' failed.\n" msgstr "Naredba izgradnje '%s' neuspjela.\n" -#: apt-private/private-source.cc:583 apt-private/private-source.cc:589 +#: apt-private/private-source.cc:580 apt-private/private-source.cc:586 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemoguće preuzimanje informacije zavisnosti izgradnje za %s" -#: apt-private/private-source.cc:594 +#: apt-private/private-source.cc:591 #, c-format msgid "%s has no build depends.\n" msgstr "%s nema zavisnosti izgradnje.\n" -#: apt-private/private-source.cc:646 +#: apt-private/private-source.cc:644 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) " @@ -924,11 +924,11 @@ "Nema dostupne informacije arhitekture za %s. Pogledajte apt.conf(5) " "APT::Architectures za postavljanje" -#: apt-private/private-source.cc:663 +#: apt-private/private-source.cc:659 msgid "Must specify at least one package to check builddeps for" msgstr "Morate odrediti bar jedan paket provjere zavisnosti izgradnje za" -#: apt-private/private-source.cc:706 +#: apt-private/private-source.cc:702 #, c-format msgid "" "Invalid operator '%c' at offset %d, did you mean '%c%c' or '%c='? - in: %s" @@ -936,19 +936,19 @@ "Neispravan operator '%c' na pomaku %d, jeste li mislili '%c%c' ili '%c='? - " "u: %s" -#: apt-private/private-source.cc:768 +#: apt-private/private-source.cc:764 #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" msgstr "" "Napomena, koristi se direktorij '%s'za preuzimanje zavisnosti izgradnje\n" -#: apt-private/private-source.cc:770 +#: apt-private/private-source.cc:766 #, c-format msgid "Note, using file '%s' to get the build dependencies\n" msgstr "" "Napomena, koristi se datoteka '%s'za preuzimanje zavisnosti izgradnje\n" -#: apt-private/private-source.cc:900 +#: apt-private/private-source.cc:896 msgid "Failed to process build dependencies" msgstr "Neuspjela obrada zavisnosti izgradnje" @@ -1001,7 +1001,7 @@ msgid "All packages are up to date." msgstr "Svi paketi su nadopunjeni." -#: cmdline/apt-cache.cc:184 cmdline/apt-mark.cc:173 +#: cmdline/apt-cache.cc:184 cmdline/apt-mark.cc:175 #, c-format msgid "%s does not take any arguments" msgstr "%s ne sadrži nikakve argumente" @@ -1200,12 +1200,12 @@ msgid "Couldn't find package %s" msgstr "Nemoguć pronalazak paketa %s" -#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96 +#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:97 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s je postavljen za automatsku instalaciju.\n" -#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135 +#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:137 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -1369,69 +1369,69 @@ msgid "analyse a pattern" msgstr "analiza uzorka" -#: cmdline/apt-mark.cc:66 +#: cmdline/apt-mark.cc:67 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s ne može biti označen da nije instaliran.\n" -#: cmdline/apt-mark.cc:72 +#: cmdline/apt-mark.cc:73 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s je već postavljen na ručnu instalaciju.\n" -#: cmdline/apt-mark.cc:74 +#: cmdline/apt-mark.cc:75 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s je već postavljen na automatsku instalaciju.\n" -#: cmdline/apt-mark.cc:240 +#: cmdline/apt-mark.cc:242 msgid "No changes necessary" msgstr "Promjene nisu potrebne" -#: cmdline/apt-mark.cc:244 +#: cmdline/apt-mark.cc:246 msgid "The following packages will be marked as automatically installed:" msgstr "Sljedeći paketi će biti označeni kao automatski instalirani:" -#: cmdline/apt-mark.cc:323 +#: cmdline/apt-mark.cc:327 #, c-format msgid "%s was already set on hold.\n" msgstr "%s je već postavljen na čekanje.\n" -#: cmdline/apt-mark.cc:325 +#: cmdline/apt-mark.cc:329 #, c-format msgid "%s was already not hold.\n" msgstr "%s još nije na čekanju.\n" -#: cmdline/apt-mark.cc:352 +#: cmdline/apt-mark.cc:356 msgid "Executing dpkg failed. Are you root?" msgstr "Pokretanje dpkg-a neuspjelo. Imate li korijenske ovlati?" -#: cmdline/apt-mark.cc:355 +#: cmdline/apt-mark.cc:359 #, c-format msgid "%s set on hold.\n" msgstr "%s je postavljen na čekanje.\n" -#: cmdline/apt-mark.cc:357 +#: cmdline/apt-mark.cc:361 #, c-format msgid "Canceled hold on %s.\n" msgstr "Prekinuto čekanje na %s.\n" -#: cmdline/apt-mark.cc:359 +#: cmdline/apt-mark.cc:363 #, c-format msgid "Selected %s for purge.\n" msgstr "Odaberi %s za uklanjanje paketa i datoteke podešavanja.\n" -#: cmdline/apt-mark.cc:361 +#: cmdline/apt-mark.cc:365 #, c-format msgid "Selected %s for removal.\n" msgstr "Odaberi %s za uklanjanje.\n" -#: cmdline/apt-mark.cc:363 +#: cmdline/apt-mark.cc:367 #, c-format msgid "Selected %s for installation.\n" msgstr "Odaberi %s za instalaciju.\n" -#: cmdline/apt-mark.cc:415 +#: cmdline/apt-mark.cc:419 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1447,35 +1447,35 @@ "manipulaciju dpkg(1) stanja odabira paketa, i za ispis\n" "svih paketa s ili bez određenog odabira.\n" -#: cmdline/apt-mark.cc:427 +#: cmdline/apt-mark.cc:431 msgid "Mark the given packages as automatically installed" msgstr "Označi zadane pakete kao automatski instalirane" -#: cmdline/apt-mark.cc:428 +#: cmdline/apt-mark.cc:432 msgid "Mark the given packages as manually installed" msgstr "Označi zadane pakete kao ručno instalirane" -#: cmdline/apt-mark.cc:429 +#: cmdline/apt-mark.cc:433 msgid "Mark all dependencies of meta packages as automatically installed." msgstr "Označi sve zavisnosti meta paketa kao automatski instalirane." -#: cmdline/apt-mark.cc:430 +#: cmdline/apt-mark.cc:434 msgid "Mark a package as held back" msgstr "Označi paket kao zadržan" -#: cmdline/apt-mark.cc:431 +#: cmdline/apt-mark.cc:435 msgid "Unset a package set as held back" msgstr "Odznači paket kao zadržan" -#: cmdline/apt-mark.cc:436 +#: cmdline/apt-mark.cc:440 msgid "Print the list of automatically installed packages" msgstr "Prikaži popis automatski instaliranih paketa" -#: cmdline/apt-mark.cc:437 +#: cmdline/apt-mark.cc:441 msgid "Print the list of manually installed packages" msgstr "Prikaži popis ručno instaliranih paketa" -#: cmdline/apt-mark.cc:438 +#: cmdline/apt-mark.cc:442 msgid "Print the list of packages on hold" msgstr "Prikaži popis paketa na čekanju" @@ -1581,51 +1581,51 @@ msgid "Merging available information" msgstr "Spajanje dostupnih informacija" -#: methods/basehttp.cc:53 +#: methods/basehttp.cc:55 msgid "Waiting for headers" msgstr "Čekanje zaglavlja" -#: methods/basehttp.cc:104 methods/basehttp.cc:111 +#: methods/basehttp.cc:106 methods/basehttp.cc:113 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP poslužitelj je poslao neispravan odgovor zaglavlja" -#: methods/basehttp.cc:142 +#: methods/basehttp.cc:144 msgid "Bad header line" msgstr "Nevaljani redak zaglavlja" -#: methods/basehttp.cc:168 +#: methods/basehttp.cc:173 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP poslužitelj je poslao neispravno zaglavlje Sadržaja-Duljine" -#: methods/basehttp.cc:199 +#: methods/basehttp.cc:206 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP poslužitelj je poslao neispravno zaglavlje Sadržaja-Opsega" -#: methods/basehttp.cc:201 +#: methods/basehttp.cc:208 msgid "This HTTP server has broken range support" msgstr "Ovaj HTTP poslužitelj ima slomljen opseg podrške" -#: methods/basehttp.cc:239 +#: methods/basehttp.cc:247 msgid "Unknown date format" msgstr "Nepoznati format datuma" -#: methods/basehttp.cc:655 +#: methods/basehttp.cc:688 msgid "Bad header data" msgstr "Nevaljali podatak zaglavlja" -#: methods/basehttp.cc:674 +#: methods/basehttp.cc:707 msgid "Connection failed" msgstr "Neuspjelo povezivanje" -#: methods/basehttp.cc:727 methods/ftp.cc:970 methods/http.cc:620 -#: methods/http.cc:858 +#: methods/basehttp.cc:760 methods/ftp.cc:970 methods/http.cc:622 +#: methods/http.cc:860 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "" "Datoteka ima neočekivanu veličinu (%llu != %llu). Možda je usklađivanje " "zrcalnog poslužitelja u tijeku?" -#: methods/basehttp.cc:769 +#: methods/basehttp.cc:802 #, c-format msgid "" "Automatically disabled %s due to incorrect response from server/proxy. (man " @@ -1634,7 +1634,7 @@ "Automatski onemogućen %s uslijed neispravnog odgovora s poslužitelja/proxya. " "(man 5 apt.conf)" -#: methods/basehttp.cc:871 +#: methods/basehttp.cc:904 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1878,7 +1878,7 @@ msgid "Unable to accept connection" msgstr "Nemoguće primanje povezivanja" -#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334 +#: methods/ftp.cc:918 methods/http.cc:1017 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "Problem jednistvene vrijednosti datoteke" @@ -1943,16 +1943,16 @@ msgstr "Nepoznata greška pokretanja apt-key" #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners. -#: methods/gpgv.cc:448 +#: methods/gpgv.cc:472 #, c-format msgid "Signature by key %s uses weak digest algorithm (%s)" msgstr "Potpis ključem %s koristi slab algoritam (%s)" -#: methods/gpgv.cc:464 methods/gpgv.cc:470 +#: methods/gpgv.cc:488 methods/gpgv.cc:494 msgid "The following signatures were invalid:\n" msgstr "Sljedeći potpisi su neispravni:\n" -#: methods/gpgv.cc:476 +#: methods/gpgv.cc:500 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1963,23 +1963,23 @@ msgid "Error writing to the file" msgstr "Greška zapisivanja u datoteku" -#: methods/http.cc:724 +#: methods/http.cc:726 msgid "Error reading from server. Remote end closed connection" msgstr "Greška čitanja s poslužitelja. Udaljeno povezivanje prekinuto." -#: methods/http.cc:728 +#: methods/http.cc:730 msgid "Error reading from server" msgstr "Greška čitanja s poslužitelja" -#: methods/http.cc:747 +#: methods/http.cc:749 msgid "Error writing to file" msgstr "Greška zapisivanja u datoteku" -#: methods/http.cc:815 +#: methods/http.cc:817 msgid "Select failed" msgstr "Odabir neuspio" -#: methods/http.cc:821 +#: methods/http.cc:823 msgid "Connection timed out" msgstr "Istek povezivanja" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt.sh.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt.sh.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt.sh.po 2021-08-03 09:03:53.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt.sh.po 2022-02-11 23:13: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: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: dselect/install:33 msgid "Bad default setting!" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apturl.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apturl.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apturl.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apturl.po 2022-02-11 23:13:50.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: 2021-08-02 17:43+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:39+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt-utils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt-utils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/apt-utils.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/apt-utils.po 2022-02-11 23:13:50.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: 2021-08-02 15:58+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: cmdline/apt-dump-solver.cc:37 msgid "" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/aspell.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/aspell.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/aspell.po 2021-08-03 09:03:53.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/aspell.po 2022-02-11 23:13:48.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:00+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:50+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/at-spi2-core.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/at-spi2-core.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/at-spi2-core.po 2021-08-03 09:03:50.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/at-spi2-core.po 2022-02-11 23:13:44.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:02+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:58+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" #: atspi/atspi-component.c:326 atspi/atspi-misc.c:1073 atspi/atspi-value.c:111 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/attr.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/attr.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/attr.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/attr.po 2022-02-11 23:13:52.000000000 +0000 @@ -0,0 +1,223 @@ +# Croatian translation for attr +# Copyright (c) 2021 Rosetta Contributors and Canonical Ltd 2021 +# This file is distributed under the same license as the attr package. +# FIRST AUTHOR , 2021. +# +msgid "" +msgstr "" +"Project-Id-Version: attr\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2018-06-18 22:17-0400\n" +"PO-Revision-Date: 2021-11-22 17:20+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2022-02-11 14:50+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" + +#: libattr/attr_copy_fd.c:80 libattr/attr_copy_fd.c:95 +#: libattr/attr_copy_file.c:78 libattr/attr_copy_file.c:93 +#, c-format +msgid "listing attributes of %s" +msgstr "prikazivanje svojstva za %s" + +#: libattr/attr_copy_fd.c:115 libattr/attr_copy_fd.c:132 +#: libattr/attr_copy_file.c:113 libattr/attr_copy_file.c:130 +#, c-format +msgid "getting attribute %s of %s" +msgstr "dobivanje svojstva %s od %s" + +#: libattr/attr_copy_fd.c:145 libattr/attr_copy_fd.c:164 +#: libattr/attr_copy_file.c:143 libattr/attr_copy_file.c:162 +#, c-format +msgid "setting attributes for %s" +msgstr "postavljanje svojstva za %s" + +#: libattr/attr_copy_fd.c:152 libattr/attr_copy_file.c:150 +#, c-format +msgid "setting attribute %s for %s" +msgstr "postavljanje svojstva %s za %s" + +#: tools/attr.c:49 +#, c-format +msgid "" +"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRSq] -g attrname pathname # get value\n" +" %s [-LRSq] -r attrname pathname # remove attr\n" +" %s [-LRq] -l pathname # list attrs \n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" +"Upotreba: %s [-LRSq] -s naziv_svojstva [-V vrijednost_svojstva] " +"naziv_putanje #postavi vrijednost\n" +" %s [-LRSq] -g naziv_svojstva naziv_putanje # nabavi " +"vrijednost\n" +" %s [-LRSq] -r naziv_svojstva naziv_putanje # ukloni " +"svojstvo\n" +" %s [-LRq] -l naziv_putanje # prikaži " +"svojstva \n" +" -s čita vrijednost iz stdina i -g zapisuje vrijednost u stdout\n" + +#: tools/attr.c:87 tools/attr.c:104 tools/attr.c:113 tools/attr.c:122 +#, c-format +msgid "Only one of -s, -g, -r, or -l allowed\n" +msgstr "Samo jedno od -s, -g, -r, ili -l je dopušteno\n" + +#: tools/attr.c:95 tools/attr.c:161 +#, c-format +msgid "-V only allowed with -s\n" +msgstr "-V je dopušteno samo sa -s\n" + +#: tools/attr.c:140 +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "Neprepoznata mogućnost: %c\n" + +#: tools/attr.c:147 +#, c-format +msgid "A filename to operate on is required\n" +msgstr "Potreban je naziv datoteke za rad\n" + +#: tools/attr.c:179 +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "Nemoguće je postaviti \"%s\" za %s\n" + +#: tools/attr.c:184 +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "Svojstvo \"%s\" je postavljeno na vrijednost %d bajta za %s:\n" + +#: tools/attr.c:202 +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "Nemoguće je dobiti \"%s\" za %s\n" + +#: tools/attr.c:207 +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "Svojstvo \"%s\" ima vrijednost %d bajta za %s:\n" + +#: tools/attr.c:220 +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "Nemoguće je ukloniti \"%s\" za %s\n" + +#: tools/attr.c:238 +#, c-format +msgid "Could not list %s\n" +msgstr "Nemoguće je prikazati %s\n" + +#: tools/attr.c:248 +#, c-format +msgid "Attribute \"%s\" has a %d byte value for %s\n" +msgstr "Svojstvo \"%s\" ima vrijednost %d bajta za %s\n" + +#: tools/attr.c:260 +#, c-format +msgid "At least one of -s, -g, -r, or -l is required\n" +msgstr "Najmanje jedan od -s, -g, -r, ili -l potreban\n" + +#: tools/setfattr.c:75 tools/getfattr.c:100 +msgid "No such attribute" +msgstr "Nema takvog svojstva" + +#: tools/setfattr.c:129 +#, c-format +msgid "%s: %s: No filename found in line %d, aborting\n" +msgstr "%s: %s: Naziv datoteke nije pronađen u redku %d, prekidanje\n" + +#: tools/setfattr.c:133 +#, c-format +msgid "%s: No filename found in line %d of standard input, aborting\n" +msgstr "" +"%s: Naziv datoteke nije pronađen u redku %d standardnog izlaza, prekidanje\n" + +#: tools/setfattr.c:180 +#, c-format +msgid "%s %s -- set extended attributes\n" +msgstr "%s %s -- postavi proširena svojstva\n" + +#: tools/setfattr.c:181 tools/getfattr.c:385 +#, c-format +msgid "Usage: %s %s\n" +msgstr "Upotreba: %s %s\n" + +#: tools/setfattr.c:182 +#, c-format +msgid " %s %s\n" +msgstr " %s %s\n" + +#: tools/setfattr.c:184 +#, c-format +msgid "" +" -n, --name=name set the value of the named extended attribute\n" +" -x, --remove=name remove the named extended attribute\n" +" -v, --value=value use value as the attribute value\n" +" -h, --no-dereference do not dereference symbolic links\n" +" --restore=file restore extended attributes\n" +" --raw attribute value is not encoded\n" +" --version print version and exit\n" +" --help this help text\n" +msgstr "" +" -n, --name=naziv postavi vrijednost navedenog proširenog svojstva\n" +" -x, --remove=naziv ukloni navedeno prošireno svojstvo\n" +" -v, --value=vrijednost koristi vrijednost kao vrijednost svojstva\n" +" -h, --no-dereference ne navodi simboličku poveznicu\n" +" --restore=datoteka obnovi proširena svojstva\n" +" --raw vrijednost svojstva nije kôdirana\n" +" --version prikaži inačicu i izađi\n" +" --help prikaži ovu pomoć\n" + +#: tools/setfattr.c:264 +#, c-format +msgid "" +"Usage: %s %s\n" +" %s %s\n" +"Try `%s --help' for more information.\n" +msgstr "" +"Upotreba: %s %s\n" +" %s %s\n" +"Pokušajte `%s --help' za više informacija.\n" + +#: tools/getfattr.c:265 +#, c-format +msgid "%s: Removing leading '/' from absolute path names\n" +msgstr "%s: Uklanjanje vodeće '/' iz apsolutnih naziva putanja\n" + +#: tools/getfattr.c:383 +#, c-format +msgid "%s %s -- get extended attributes\n" +msgstr "%s %s -- nabavi proširena svojstva\n" + +#: tools/getfattr.c:383 +#, c-format +msgid "" +" -n, --name=name get the named extended attribute value\n" +" -d, --dump get all extended attribute values\n" +" -e, --encoding=... encode values (as 'text', 'hex' or 'base64')\n" +" --match=pattern only get attributes with names matching pattern\n" +" --only-values print the bare values only\n" +" -h, --no-dereference do not dereference symbolic links\n" +" --absolute-names don't strip leading '/' in pathnames\n" +" -R, --recursive recurse into subdirectories\n" +" -L, --logical logical walk, follow symbolic links\n" +" -P --physical physical walk, do not follow symbolic links\n" +" --version print version and exit\n" +" --help this help text\n" +msgstr "" + +#: tools/getfattr.c:489 +#, c-format +msgid "%s: invalid regular expression \"%s\"\n" +msgstr "%s: nevaljani regularni izraz \"%s\"\n" + +#: tools/getfattr.c:503 +#, c-format +msgid "" +"Usage: %s %s\n" +"Try `%s --help' for more information.\n" +msgstr "" +"Upotreba: %s %s\n" +"Pokušajte `%s --help' za više informacija.\n" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bash.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bash.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bash.po 2021-08-03 09:03:54.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bash.po 2022-02-11 23:13:48.000000000 +0000 @@ -17,13 +17,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:01+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" -"X-Poedit-Basepath: ../sources\n" +"X-Launchpad-Export-Date: 2022-02-11 14:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Poedit-SearchPath-0: .\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Poedit-SearchPath-1: bash-5.0-beta2\n" +"X-Poedit-Basepath: ../sources\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: hr\n" "X-Poedit-SearchPath-2: bash-5.0-beta2/builtins\n" #: arrayfunc.c:66 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bfd.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bfd.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bfd.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bfd.po 2022-02-11 23:13:50.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: bfd 2.22.90\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" "POT-Creation-Date: 2019-01-19 16:33+0000\n" -"PO-Revision-Date: 2020-09-29 19:18+0000\n" +"PO-Revision-Date: 2022-01-19 01:46+0000\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:22+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:14+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -757,7 +757,7 @@ msgid "%pB: error: attribute section '%pA' too big: %#llx" msgstr "" -#: elf-attrs.c:490 +#: elf-attrs.c:487 #, c-format msgid "%pB: error: attribute section length too small: %" msgstr "" @@ -1041,7 +1041,7 @@ msgid "%pB: no group info for section '%pA'" msgstr "" -#: elf.c:859 elf.c:3955 +#: elf.c:868 elf.c:3886 elflink.c:11403 #, c-format msgid "%pB: warning: sh_link not set for section `%pA'" msgstr "" @@ -1871,7 +1871,7 @@ msgid " [FDPIC ABI supplement]" msgstr "" -#: elf32-arm.c:15190 elfnn-aarch64.c:7335 +#: elf32-arm.c:15000 /work/sources/binutils/current/bfd/elfnn-aarch64.c:7040 #, c-format msgid "" msgstr "" @@ -2245,7 +2245,7 @@ msgid "%pB: machine flag conflict with target" msgstr "" -#: elf32-csky.c:2875 +#: elf32-csky.c:2990 #, c-format msgid "" "warning: file %pB's arch flag ck%s conflicts with target ck%s, using ck%s" @@ -2887,7 +2887,7 @@ msgid "error: %pB: big-endian R2 is not supported" msgstr "" -#: elf32-nios2.c:3830 +#: elf32-nios2.c:3822 #, c-format msgid "" "global pointer relative relocation at address 0x%08x when _gp not defined\n" @@ -4594,7 +4594,7 @@ "section `%pA' is out of range" msgstr "" -#: elf64-x86-64.c:4101 +#: elf64-x86-64.c:3885 msgid "%F%P: failed to convert GOTPCREL relocation; relink with --no-relax\n" msgstr "" @@ -4613,7 +4613,7 @@ msgid "%F%pB: PC-relative offset overflow in GOT PLT entry for `%s'\n" msgstr "" -#: elfcode.h:326 +#: elfcode.h:323 msgid "warning: %pB has a corrupt section with a size (%" msgstr "" @@ -4832,13 +4832,13 @@ "non-existent global symbol" msgstr "" -#: elflink.c:11971 +#: elflink.c:11484 #, c-format msgid "" "%pA has both ordered [`%pA' in %pB] and unordered [`%pA' in %pB] sections" msgstr "" -#: elflink.c:11977 +#: elflink.c:11490 #, c-format msgid "%pA has both ordered and unordered sections" msgstr "" @@ -5258,7 +5258,7 @@ msgid "%P: %pB: warning: relocation in read-only section `%pA'\n" msgstr "" -#: elf32-i386.c:3683 elf64-x86-64.c:4091 +#: elfxx-x86.c:1383 msgid "" "%P%X: read-only segment has dynamic IFUNC relocations; recompile with -fPIC\n" msgstr "" @@ -5554,7 +5554,7 @@ "0x%x: setting to undefined" msgstr "" -#: mach-o.c:3789 +#: mach-o.c:3920 msgid "bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols" msgstr "" @@ -8126,17 +8126,17 @@ "got '%s'." msgstr "" -#: elfnn-riscv.c:2692 +#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2773 #, c-format msgid "error: %pB: Mis-matched ISA string to merge '%s' and '%s'." msgstr "" -#: elfnn-riscv.c:2893 +#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2921 #, c-format msgid "error: %pB: ISA string of input (%s) doesn't match output (%s)." msgstr "" -#: elfnn-riscv.c:2913 +#: /work/sources/binutils/current/bfd/elfnn-riscv.c:2946 #, c-format msgid "error: %pB: XLEN of input (%u) doesn't match output (%u)." msgstr "" @@ -8151,7 +8151,7 @@ msgid "error: %pB: conflicting priv spec version (major/minor/revision)." msgstr "" -#: elfnn-riscv.c:3081 +#: /work/sources/binutils/current/bfd/elfnn-riscv.c:3055 #, c-format msgid "" "error: %pB use %u-byte stack aligned but the output use %u-byte stack " @@ -8293,19 +8293,19 @@ "There is an import table in %s at 0x%lx\n" msgstr "" -#: peXXigen.c:1369 +#: peigen.c:1365 pepigen.c:1365 pex64igen.c:1365 #, c-format msgid "" "\n" "Function descriptor located at the start address: %04lx\n" msgstr "" -#: peXXigen.c:1373 +#: peigen.c:1369 pepigen.c:1369 pex64igen.c:1369 #, c-format msgid "\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n" msgstr "" -#: peXXigen.c:1380 +#: peigen.c:1377 pepigen.c:1377 pex64igen.c:1377 #, c-format msgid "" "\n" @@ -8524,17 +8524,17 @@ msgid "Virtual size of .pdata section (%ld) larger than real size (%ld)\n" msgstr "" -#: peXXigen.c:2002 +#: peigen.c:2001 pepigen.c:2001 pex64igen.c:2001 #, c-format msgid " Register save millicode" msgstr "" -#: peXXigen.c:2005 +#: peigen.c:2004 pepigen.c:2004 pex64igen.c:2004 #, c-format msgid " Register restore millicode" msgstr "" -#: peXXigen.c:2008 +#: peigen.c:2007 pepigen.c:2007 pex64igen.c:2007 #, c-format msgid " Glue code sequence" msgstr "" @@ -8697,7 +8697,7 @@ "Characteristics 0x%x\n" msgstr "" -#: peXXigen.c:3072 +#: peigen.c:2993 pepigen.c:2993 pex64igen.c:2993 #, c-format msgid "" "%pB: Data Directory size (%lx) exceeds space left in section (%)" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/binutils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/binutils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/binutils.po 2021-08-03 09:03:50.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/binutils.po 2022-02-11 23:13:44.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:02+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:52+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -62,9 +62,9 @@ "\n" msgstr "" -#: addr2line.c:109 ar.c:357 ar.c:394 coffdump.c:471 dlltool.c:3715 -#: dllwrap.c:518 elfedit.c:952 objcopy.c:697 objcopy.c:752 readelf.c:4842 -#: size.c:109 srconv.c:1704 strings.c:706 sysdump.c:649 windmc.c:227 +#: addr2line.c:109 ar.c:359 ar.c:396 coffdump.c:471 dlltool.c:3713 +#: dllwrap.c:518 elfedit.c:976 objcopy.c:697 objcopy.c:752 readelf.c:5165 +#: size.c:109 srconv.c:1704 strings.c:1343 sysdump.c:655 windmc.c:227 #: windres.c:690 #, c-format msgid "Report bugs to %s\n" @@ -101,169 +101,169 @@ msgid "%s: cannot find section %s" msgstr "" -#: addr2line.c:442 ar.c:756 dlltool.c:3239 nm.c:1807 objcopy.c:6029 -#: objdump.c:5211 size.c:151 strings.c:289 windmc.c:958 windres.c:816 +#: addr2line.c:442 ar.c:758 dlltool.c:3237 nm.c:2051 objcopy.c:6036 +#: objdump.c:5372 size.c:151 strings.c:340 windmc.c:958 windres.c:816 msgid "fatal error: libbfd ABI mismatch" msgstr "" -#: addr2line.c:469 nm.c:1833 objdump.c:5258 readelf.c:5115 +#: addr2line.c:469 nm.c:2077 objdump.c:5419 readelf.c:5438 #, c-format msgid "unknown demangling style `%s'" msgstr "" -#: ar.c:274 +#: ar.c:275 #, c-format msgid "no entry %s in archive\n" msgstr "nema unosa %s u arhivi\n" -#: ar.c:288 +#: ar.c:289 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin " "] [member-name] [count] archive-file file...\n" msgstr "" -#: ar.c:294 +#: ar.c:295 #, c-format msgid "" "Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [member-" "name] [count] archive-file file...\n" msgstr "" -#: ar.c:302 +#: ar.c:303 #, c-format msgid " %s -M [ - read options from \n" msgstr "" -#: ar.c:344 +#: ar.c:345 #, c-format msgid " --target=BFDNAME - specify the target object format as BFDNAME\n" msgstr "" -#: ar.c:345 +#: ar.c:346 #, c-format msgid "" " --output=DIRNAME - specify the output directory for extraction operations\n" msgstr "" -#: ar.c:348 +#: ar.c:350 #, c-format msgid " optional:\n" msgstr "" -#: ar.c:349 +#: ar.c:351 #, c-format msgid " --plugin

    - load the specified plugin\n" msgstr "" -#: ar.c:370 +#: ar.c:372 #, c-format msgid "Usage: %s [options] archive\n" msgstr "Uporaba: %s [opcije] arhiva\n" -#: ar.c:371 +#: ar.c:373 #, c-format msgid " Generate an index to speed access to archives\n" msgstr " Napravi indeks za ubrzavanje pristupa arhivama\n" -#: ar.c:372 +#: ar.c:374 #, c-format msgid "" " The options are:\n" " @ Read options from \n" msgstr "" -#: ar.c:375 +#: ar.c:377 #, c-format msgid " --plugin Load the specified plugin\n" msgstr "" -#: ar.c:379 +#: ar.c:381 #, c-format msgid "" " -D Use zero for symbol map timestamp (default)\n" " -U Use an actual symbol map timestamp\n" msgstr "" -#: ar.c:383 +#: ar.c:385 #, c-format msgid "" " -D Use zero for symbol map timestamp\n" " -U Use actual symbol map timestamp (default)\n" msgstr "" -#: ar.c:386 +#: ar.c:388 #, c-format msgid "" " -t Update the archive's symbol map timestamp\n" @@ -353,101 +353,101 @@ " -v --version Print version information\n" msgstr "" -#: ar.c:511 +#: ar.c:513 msgid "two different operation options specified" msgstr "navedene su opcije dvije različite operacije" -#: ar.c:608 ar.c:683 nm.c:1926 +#: ar.c:610 ar.c:685 nm.c:2188 #, c-format msgid "sorry - this program has been built without plugin support\n" msgstr "žao mi je - ovaj program je izgrađen bez podrške za priključke\n" -#: ar.c:812 +#: ar.c:814 msgid "no operation specified" msgstr "nije navedena operacija" -#: ar.c:815 +#: ar.c:817 msgid "`u' is only meaningful with the `r' option." msgstr "Opcija „u” je korisna samo uz opciju „r”." -#: ar.c:818 +#: ar.c:820 msgid "`u' is not meaningful with the `D' option." msgstr "Opcija „u” nema koristi uz opciju „D”." -#: ar.c:821 +#: ar.c:823 msgid "`u' modifier ignored since `D' is the default (see `U')" msgstr "" -#: ar.c:830 +#: ar.c:832 msgid "missing position arg." msgstr "" -#: ar.c:836 +#: ar.c:838 msgid "`N' is only meaningful with the `x' and `d' options." msgstr "Opcija „N” je korisna samo uz opcije „x” i „d”." -#: ar.c:838 +#: ar.c:840 msgid "`N' missing value." msgstr "" -#: ar.c:841 +#: ar.c:843 msgid "Value for `N' must be positive." msgstr "Vrijednost za „N” mora biti pozitivna." -#: ar.c:857 +#: ar.c:859 msgid "`x' cannot be used on thin archives." msgstr "„x” se ne može koristiti na tankim arhivama." -#: ar.c:950 +#: ar.c:952 #, c-format msgid "internal error -- this option not implemented" msgstr "interna greška -- ova opcija nije implementirana" -#: ar.c:1019 +#: ar.c:1021 #, c-format msgid "creating %s" msgstr "stvaram %s" -#: ar.c:1050 +#: ar.c:1052 #, c-format msgid "Cannot convert existing library %s to thin format" msgstr "" -#: ar.c:1056 +#: ar.c:1058 #, c-format msgid "Cannot convert existing thin library %s to normal format" msgstr "" -#: ar.c:1088 ar.c:1185 ar.c:1507 objcopy.c:3606 +#: ar.c:1090 ar.c:1190 ar.c:1512 objcopy.c:3612 #, c-format msgid "internal stat error on %s" msgstr "" -#: ar.c:1107 ar.c:1211 +#: ar.c:1109 ar.c:1216 #, c-format msgid "%s is not a valid archive" msgstr "%s nije ispravna arhiva" -#: ar.c:1135 +#: ar.c:1137 #, c-format msgid "illegal output pathname for archive member: %s, using '%s' instead" msgstr "" -#: ar.c:1259 +#: ar.c:1264 msgid "could not create temporary file whilst writing archive" msgstr "ne mogu napraviti privremenu datoteku za vrijeme pisanja arhive" -#: ar.c:1410 +#: ar.c:1415 #, c-format msgid "No member named `%s'\n" msgstr "Nema člana imena „%s”\n" -#: ar.c:1460 +#: ar.c:1465 #, c-format msgid "no entry %s in archive %s!" msgstr "nema unosa %s u arhivi %s!" -#: ar.c:1620 +#: ar.c:1625 #, c-format msgid "%s: no archive map to update" msgstr "%s: nema mape arhive za ažuriranje" @@ -523,7 +523,7 @@ msgid " emulation options: \n" msgstr " opcije emulacije: \n" -#: bucomm.c:43 bucomm.c:77 +#: bucomm.c:43 bucomm.c:76 msgid "cause of error unknown" msgstr "" @@ -591,17 +591,17 @@ msgid "%s: bad number: %s" msgstr "%s: neispravan broj: %s" -#: bucomm.c:607 strings.c:402 +#: bucomm.c:607 strings.c:453 #, c-format msgid "'%s': No such file" msgstr "„%s”: Nema takve datoteke" -#: bucomm.c:609 strings.c:404 +#: bucomm.c:609 strings.c:455 #, c-format msgid "Warning: could not locate '%s'. reason: %s" msgstr "Upozorenje: ne mogu pronaći „%s”. razlog: %s" -#: bucomm.c:613 strings.c:410 +#: bucomm.c:613 strings.c:461 #, c-format msgid "Warning: '%s' is a directory" msgstr "" @@ -721,7 +721,7 @@ msgid "Symbol %s, tag %d, number %d" msgstr "Simbol %s, oznaka %d, broj %d" -#: coffdump.c:345 readelf.c:18461 readelf.c:18552 +#: coffdump.c:345 readelf.c:18836 readelf.c:18927 #, c-format msgid "Type" msgstr "Vrsta" @@ -775,7 +775,7 @@ msgid "#sources %d" msgstr "#izvori %d" -#: coffdump.c:462 sysdump.c:642 +#: coffdump.c:462 sysdump.c:648 #, c-format msgid "Usage: %s [option(s)] in-file\n" msgstr "" @@ -795,7 +795,7 @@ "\n" msgstr "" -#: coffdump.c:532 srconv.c:1793 sysdump.c:705 +#: coffdump.c:532 srconv.c:1793 sysdump.c:711 msgid "no input file specified" msgstr "nije navedena ulazna datoteka" @@ -943,7 +943,7 @@ msgid "%s: is not a COFF format file" msgstr "" -#: cxxfilt.c:124 nm.c:324 objdump.c:390 +#: cxxfilt.c:124 nm.c:379 objdump.c:405 #, c-format msgid "Report bugs to %s.\n" msgstr "Prijavite greške na %s.\n" @@ -1037,7 +1037,7 @@ msgid "debug_get_real_type: circular debug information for %s\n" msgstr "" -#: debug.c:2484 +#: debug.c:2490 msgid "debug_write_type: illegal type encountered" msgstr "debug_write_type: primjećena nedozvoljena vrsta" @@ -1065,460 +1065,460 @@ msgid "Syntax error in def file %s:%d" msgstr "Sintaksna greška u datoteci definicija %s:%d" -#: dlltool.c:1034 +#: dlltool.c:1032 #, c-format msgid "%s: Path components stripped from image name, '%s'." msgstr "" -#: dlltool.c:1052 +#: dlltool.c:1050 #, c-format msgid "NAME: %s base: %x" msgstr "" -#: dlltool.c:1055 dlltool.c:1076 +#: dlltool.c:1053 dlltool.c:1074 msgid "Can't have LIBRARY and NAME" msgstr "" -#: dlltool.c:1073 +#: dlltool.c:1071 #, c-format msgid "LIBRARY: %s base: %x" msgstr "" -#: dlltool.c:1228 +#: dlltool.c:1226 #, c-format msgid "VERSION %d.%d\n" msgstr "INAČICA %d.%d\n" -#: dlltool.c:1276 +#: dlltool.c:1274 #, c-format msgid "run: %s %s" msgstr "prolaz: %s %s" -#: dlltool.c:1317 resrc.c:288 +#: dlltool.c:1315 resrc.c:288 #, c-format msgid "wait: %s" msgstr "čekanje: %s" -#: dlltool.c:1322 dllwrap.c:416 resrc.c:293 +#: dlltool.c:1320 dllwrap.c:416 resrc.c:293 #, c-format msgid "subprocess got fatal signal %d" msgstr "potproces je dobio fatalni signal %d" -#: dlltool.c:1328 dllwrap.c:423 resrc.c:300 +#: dlltool.c:1326 dllwrap.c:423 resrc.c:300 #, c-format msgid "%s exited with status %d" msgstr "%s je izašao sa stanjem %d" -#: dlltool.c:1359 +#: dlltool.c:1357 #, c-format msgid "Sucking in info from %s section in %s" msgstr "" -#: dlltool.c:1499 +#: dlltool.c:1497 #, c-format msgid "Excluding symbol: %s" msgstr "Izostavljam simbol: %s" -#: dlltool.c:1588 dlltool.c:1599 nm.c:1172 nm.c:1183 nm.c:1193 +#: dlltool.c:1586 dlltool.c:1597 nm.c:1416 nm.c:1427 nm.c:1437 #, c-format msgid "%s: no symbols" msgstr "%s: nema simbola" #. FIXME: we ought to read in and block out the base relocations. -#: dlltool.c:1625 +#: dlltool.c:1623 #, c-format msgid "Done reading %s" msgstr "Čitanje %s je gotovo" -#: dlltool.c:1635 +#: dlltool.c:1633 #, c-format msgid "Unable to open object file: %s: %s" msgstr "Ne mogu otvoriti datoteku objekta: %s: %s" -#: dlltool.c:1638 +#: dlltool.c:1636 #, c-format msgid "Scanning object file %s" msgstr "Pregledavam datoteku objekta %s" -#: dlltool.c:1658 +#: dlltool.c:1656 #, c-format msgid "Cannot produce mcore-elf dll from archive file: %s" msgstr "" -#: dlltool.c:1760 +#: dlltool.c:1758 msgid "Adding exports to output file" msgstr "" -#: dlltool.c:1812 +#: dlltool.c:1810 msgid "Added exports to output file" msgstr "" -#: dlltool.c:1980 +#: dlltool.c:1978 #, c-format msgid "Generating export file: %s" msgstr "" -#: dlltool.c:1985 +#: dlltool.c:1983 #, c-format msgid "Unable to open temporary assembler file: %s" msgstr "Ne mogu otvoriti privremenu datoteku asemblera: %s" -#: dlltool.c:1990 +#: dlltool.c:1988 #, c-format msgid "Opened temporary file: %s" msgstr "Privremena datoteka je otvorena: %s" -#: dlltool.c:2166 +#: dlltool.c:2164 msgid "failed to read the number of entries from base file" msgstr "" -#: dlltool.c:2217 +#: dlltool.c:2215 msgid "Generated exports file" msgstr "" -#: dlltool.c:2375 +#: dlltool.c:2373 #, c-format msgid "bfd_open failed open stub file: %s: %s" msgstr "" -#: dlltool.c:2379 +#: dlltool.c:2377 #, c-format msgid "Creating stub file: %s" msgstr "" -#: dlltool.c:2693 +#: dlltool.c:2691 #, c-format msgid "bfd_open failed reopen stub file: %s: %s" msgstr "" -#: dlltool.c:2707 dlltool.c:2786 +#: dlltool.c:2705 dlltool.c:2784 #, c-format msgid "failed to open temporary head file: %s" msgstr "" -#: dlltool.c:2771 dlltool.c:2861 +#: dlltool.c:2769 dlltool.c:2859 #, c-format msgid "failed to open temporary head file: %s: %s" msgstr "" -#: dlltool.c:2876 +#: dlltool.c:2874 #, c-format msgid "failed to open temporary tail file: %s" msgstr "" -#: dlltool.c:2912 +#: dlltool.c:2910 #, c-format msgid "failed to open temporary tail file: %s: %s" msgstr "" -#: dlltool.c:2935 +#: dlltool.c:2933 #, c-format msgid "Can't create .lib file: %s: %s" msgstr "" -#: dlltool.c:2939 +#: dlltool.c:2937 #, c-format msgid "Creating library file: %s" msgstr "Stvaram biblioteku: %s" -#: dlltool.c:3026 dlltool.c:3032 +#: dlltool.c:3024 dlltool.c:3030 #, c-format msgid "cannot delete %s: %s" msgstr "ne mogu ukloniti %s: %s" -#: dlltool.c:3038 +#: dlltool.c:3036 msgid "Created lib file" msgstr "Biblioteka je stvorena" -#: dlltool.c:3244 +#: dlltool.c:3242 #, c-format msgid "Can't open .lib file: %s: %s" msgstr "Ne mogu otvoriti .lib datoteku: %s: %s" -#: dlltool.c:3252 dlltool.c:3274 +#: dlltool.c:3250 dlltool.c:3272 #, c-format msgid "%s is not a library" msgstr "%s nije biblioteka" -#: dlltool.c:3292 +#: dlltool.c:3290 #, c-format msgid "Import library `%s' specifies two or more dlls" msgstr "" -#: dlltool.c:3303 +#: dlltool.c:3301 #, c-format msgid "Unable to determine dll name for `%s' (not an import library?)" msgstr "" -#: dlltool.c:3529 +#: dlltool.c:3527 #, c-format msgid "Warning, ignoring duplicate EXPORT %s %d,%d" msgstr "" -#: dlltool.c:3535 +#: dlltool.c:3533 #, c-format msgid "Error, duplicate EXPORT with ordinals: %s" msgstr "" -#: dlltool.c:3638 +#: dlltool.c:3636 msgid "Processing definitions" msgstr "Obrađujem definicije" -#: dlltool.c:3665 +#: dlltool.c:3663 msgid "Processed definitions" msgstr "Definicije su obrađene" #. xgetext:c-format -#: dlltool.c:3672 dllwrap.c:477 +#: dlltool.c:3670 dllwrap.c:477 #, c-format msgid "Usage %s \n" msgstr "Uporaba %s \n" #. xgetext:c-format -#: dlltool.c:3674 +#: dlltool.c:3672 #, c-format msgid "" " -m --machine Create as DLL for . [default: %s]\n" msgstr "" -#: dlltool.c:3966 +#: dlltool.c:3949 #, c-format msgid "" " possible : arm[_interwork], i386, mcore[-elf]{-le|-be}, " "ppc, thumb\n" msgstr "" -#: dlltool.c:3676 +#: dlltool.c:3674 #, c-format msgid " -e --output-exp Generate an export file.\n" msgstr "" -#: dlltool.c:3677 +#: dlltool.c:3675 #, c-format msgid " -l --output-lib Generate an interface library.\n" msgstr "" -#: dlltool.c:3678 +#: dlltool.c:3676 #, c-format msgid " -y --output-delaylib Create a delay-import library.\n" msgstr "" -#: dlltool.c:3679 +#: dlltool.c:3677 #, c-format msgid " -a --add-indirect Add dll indirects to export file.\n" msgstr "" -#: dlltool.c:3680 +#: dlltool.c:3678 #, c-format msgid "" " -D --dllname Name of input dll to put into interface lib.\n" msgstr "" -#: dlltool.c:3681 +#: dlltool.c:3679 #, c-format msgid " -d --input-def Name of .def file to be read in.\n" msgstr "" -#: dlltool.c:3682 +#: dlltool.c:3680 #, c-format msgid " -z --output-def Name of .def file to be created.\n" msgstr "" -#: dlltool.c:3683 +#: dlltool.c:3681 #, c-format msgid " --export-all-symbols Export all symbols to .def\n" msgstr "" -#: dlltool.c:3684 +#: dlltool.c:3682 #, c-format msgid " --no-export-all-symbols Only export listed symbols\n" msgstr "" -#: dlltool.c:3685 +#: dlltool.c:3683 #, c-format msgid " --exclude-symbols Don't export \n" msgstr "" -#: dlltool.c:3686 +#: dlltool.c:3684 #, c-format msgid " --no-default-excludes Clear default exclude symbols\n" msgstr "" -#: dlltool.c:3687 +#: dlltool.c:3685 #, c-format msgid " -b --base-file Read linker generated base file.\n" msgstr "" -#: dlltool.c:3688 +#: dlltool.c:3686 #, c-format msgid " -x --no-idata4 Don't generate idata$4 section.\n" msgstr "" -#: dlltool.c:3689 +#: dlltool.c:3687 #, c-format msgid " -c --no-idata5 Don't generate idata$5 section.\n" msgstr "" -#: dlltool.c:3690 +#: dlltool.c:3688 #, c-format msgid "" " --use-nul-prefixed-import-tables Use zero prefixed idata$4 and " "idata$5.\n" msgstr "" -#: dlltool.c:3691 +#: dlltool.c:3689 #, c-format msgid "" " -U --add-underscore Add underscores to all symbols in interface " "library.\n" msgstr "" -#: dlltool.c:3692 +#: dlltool.c:3690 #, c-format msgid "" " --add-stdcall-underscore Add underscores to stdcall symbols in " "interface library.\n" msgstr "" -#: dlltool.c:3693 +#: dlltool.c:3691 #, c-format msgid "" " --no-leading-underscore All symbols shouldn't be prefixed by an " "underscore.\n" msgstr "" -#: dlltool.c:3694 +#: dlltool.c:3692 #, c-format msgid "" " --leading-underscore All symbols should be prefixed by an " "underscore.\n" msgstr "" -#: dlltool.c:3695 +#: dlltool.c:3693 #, c-format msgid " -k --kill-at Kill @ from exported names.\n" msgstr "" -#: dlltool.c:3696 +#: dlltool.c:3694 #, c-format msgid " -A --add-stdcall-alias Add aliases without @.\n" msgstr "" -#: dlltool.c:3697 +#: dlltool.c:3695 #, c-format msgid " -p --ext-prefix-alias Add aliases with .\n" msgstr "" -#: dlltool.c:3698 +#: dlltool.c:3696 #, c-format msgid " -S --as Use for assembler.\n" msgstr "" -#: dlltool.c:3699 +#: dlltool.c:3697 #, c-format msgid " -f --as-flags Pass to the assembler.\n" msgstr "" -#: dlltool.c:3700 +#: dlltool.c:3698 #, c-format msgid "" " -C --compat-implib Create backward compatible import library.\n" msgstr "" -#: dlltool.c:3701 +#: dlltool.c:3699 #, c-format msgid "" " -n --no-delete Keep temp files (repeat for extra " "preservation).\n" msgstr "" -#: dlltool.c:3702 +#: dlltool.c:3700 #, c-format msgid "" " -t --temp-prefix Use to construct temp file names.\n" msgstr "" -#: dlltool.c:3703 +#: dlltool.c:3701 #, c-format msgid "" " -I --identify Report the name of the DLL associated with " ".\n" msgstr "" -#: dlltool.c:3704 +#: dlltool.c:3702 #, c-format msgid "" " --identify-strict Causes --identify to report error when multiple " "DLLs.\n" msgstr "" -#: dlltool.c:3705 +#: dlltool.c:3703 #, c-format msgid " -v --verbose Be verbose.\n" msgstr "" -#: dlltool.c:3706 +#: dlltool.c:3704 #, c-format msgid " -V --version Display the program version.\n" msgstr "" -#: dlltool.c:3707 +#: dlltool.c:3705 #, c-format msgid " -h --help Display this information.\n" msgstr "" -#: dlltool.c:3708 +#: dlltool.c:3706 #, c-format msgid " @ Read options from .\n" msgstr "" -#: dlltool.c:3710 +#: dlltool.c:3708 #, c-format msgid "" " -M --mcore-elf Process mcore-elf object files into .\n" msgstr "" -#: dlltool.c:3711 +#: dlltool.c:3709 #, c-format msgid " -L --linker Use as the linker.\n" msgstr "" -#: dlltool.c:3712 +#: dlltool.c:3710 #, c-format msgid " -F --linker-flags Pass to the linker.\n" msgstr "" -#: dlltool.c:3856 +#: dlltool.c:3854 #, c-format msgid "Unable to open def-file: %s" msgstr "" -#: dlltool.c:3861 +#: dlltool.c:3859 #, c-format msgid "Path components stripped from dllname, '%s'." msgstr "" -#: dlltool.c:3909 +#: dlltool.c:3907 #, c-format msgid "Unable to open base-file: %s" msgstr "" -#: dlltool.c:3944 +#: dlltool.c:3939 #, c-format msgid "Machine '%s' not supported" msgstr "Stroj „%s” nije podržan" -#: dlltool.c:4024 +#: dlltool.c:4036 #, c-format msgid "Warning, machine type (%d) not supported for delayimport." msgstr "" -#: dlltool.c:4092 dllwrap.c:206 +#: dlltool.c:4104 dllwrap.c:206 #, c-format msgid "Tried file: %s" msgstr "" -#: dlltool.c:4099 dllwrap.c:213 +#: dlltool.c:4111 dllwrap.c:213 #, c-format msgid "Using file: %s" msgstr "Koristim datoteku: %s" @@ -1883,7 +1883,7 @@ msgid "" msgstr "" -#: dwarf.c:692 +#: dwarf.c:675 #, c-format msgid "DW_FORM_strp offset too big: %s\n" msgstr "" @@ -1900,7 +1900,7 @@ msgid "" msgstr "" -#: dwarf.c:720 +#: dwarf.c:703 #, c-format msgid "DW_FORM_line_strp offset too big: %s\n" msgstr "" @@ -1917,7 +1917,7 @@ msgid "" msgstr "" -#: dwarf.c:758 +#: dwarf.c:740 #, c-format msgid "DW_FORM_GNU_str_index offset too big: %s\n" msgstr "" @@ -1930,7 +1930,7 @@ msgid "" msgstr "" -#: dwarf.c:815 +#: dwarf.c:753 #, c-format msgid "DW_FORM_GNU_str_index indirect offset too big: %s\n" msgstr "" @@ -1947,7 +1947,7 @@ msgid "" msgstr "" -#: dwarf.c:841 +#: dwarf.c:779 #, c-format msgid "Offset into section %s too big: %s\n" msgstr "" @@ -2046,264 +2046,264 @@ msgid "Corrupt attribute block length: %lx\n" msgstr "" -#: dwarf.c:2310 +#: dwarf.c:2313 msgid "corrupt discr_list - not using a block form\n" msgstr "" -#: dwarf.c:2317 +#: dwarf.c:2320 msgid "corrupt discr_list - block not long enough\n" msgstr "" -#: dwarf.c:2388 +#: dwarf.c:2092 #, c-format msgid "corrupt discr_list - unrecognised discriminant byte %#x\n" msgstr "" -#: dwarf.c:2402 +#: dwarf.c:2396 msgid "Corrupt attribute\n" msgstr "" -#: dwarf.c:1786 +#: dwarf.c:2147 msgid "Internal error: DWARF version is not 2, 3 or 4.\n" msgstr "" -#: dwarf.c:2586 +#: dwarf.c:2274 msgid "DW_FORM_data8 is unsupported when sizeof (dwarf_vma) != 8\n" msgstr "" -#: dwarf.c:2610 +#: dwarf.c:2604 msgid "Block ends prematurely\n" msgstr "" -#: dwarf.c:2644 +#: dwarf.c:2638 #, c-format msgid "%c(indirect string, offset: 0x%s): %s" msgstr "" -#: dwarf.c:2659 +#: dwarf.c:2653 #, c-format msgid "%c(indirect line string, offset: 0x%s): %s" msgstr "" -#: dwarf.c:2682 +#: dwarf.c:2676 #, c-format msgid "%c(indexed string: 0x%s): %s" msgstr "" -#: dwarf.c:2697 +#: dwarf.c:2691 #, c-format msgid "%c(alt indirect string, offset: 0x%s) %s" msgstr "" -#: dwarf.c:2739 +#: dwarf.c:2733 #, c-format msgid "%c(addr_index: 0x%s): %s" msgstr "" -#: dwarf.c:2757 +#: dwarf.c:2404 #, c-format msgid "Unrecognized form: %lu\n" msgstr "Neprepoznati oblik: %lu\n" -#: dwarf.c:2812 +#: dwarf.c:2808 msgid "More location offset attributes than DW_AT_GNU_locview attributes\n" msgstr "" -#: dwarf.c:2824 +#: dwarf.c:2820 msgid "More DW_AT_GNU_locview attributes than location offset attributes\n" msgstr "" -#: dwarf.c:2893 dwarf.c:2925 dwarf.c:2940 +#: dwarf.c:2889 dwarf.c:2921 dwarf.c:2936 #, c-format msgid "Unsupported form (%s) for attribute %s\n" msgstr "" -#: dwarf.c:2985 +#: dwarf.c:2983 #, c-format msgid "(not inlined)" msgstr "" -#: dwarf.c:2988 +#: dwarf.c:2986 #, c-format msgid "(inlined)" msgstr "" -#: dwarf.c:2991 +#: dwarf.c:2989 #, c-format msgid "(declared as inline but ignored)" msgstr "" -#: dwarf.c:2994 +#: dwarf.c:2992 #, c-format msgid "(declared as inline and inlined)" msgstr "" -#: dwarf.c:2997 +#: dwarf.c:2995 #, c-format msgid " (Unknown inline attribute value: %s)" msgstr "" -#: dwarf.c:3054 +#: dwarf.c:3052 #, c-format msgid "(implementation defined: %s)" msgstr "" -#: dwarf.c:3057 +#: dwarf.c:3055 #, c-format msgid "(Unknown: %s)" msgstr "(Nepoznato: %s)" -#: dwarf.c:3102 +#: dwarf.c:3100 #, c-format msgid "(user defined type)" msgstr "(korisnički definirana vrsta)" -#: dwarf.c:3104 +#: dwarf.c:3102 #, c-format msgid "(unknown type)" msgstr "(nepoznata vrsta)" -#: dwarf.c:3117 +#: dwarf.c:3115 #, c-format msgid "(unknown accessibility)" msgstr "(nepoznata pristupačnost)" -#: dwarf.c:3129 +#: dwarf.c:3127 #, c-format msgid "(unknown visibility)" msgstr "(nepoznata vidljivost)" -#: dwarf.c:3142 +#: dwarf.c:3140 #, c-format msgid "(user specified)" msgstr "" -#: dwarf.c:3144 +#: dwarf.c:3142 #, c-format msgid "(unknown endianity)" msgstr "" -#: dwarf.c:3156 +#: dwarf.c:3154 #, c-format msgid "(unknown virtuality)" msgstr "(nepoznata virtualnost)" -#: dwarf.c:3168 +#: dwarf.c:3166 #, c-format msgid "(unknown case)" msgstr "(nepoznat slučaj)" -#: dwarf.c:3186 +#: dwarf.c:3184 #, c-format msgid "(user defined)" msgstr "(korisnički definirano)" -#: dwarf.c:3188 +#: dwarf.c:3186 #, c-format msgid "(unknown convention)" msgstr "(nepoznata konvencija)" -#: dwarf.c:3197 +#: dwarf.c:3195 #, c-format msgid "(undefined)" msgstr "(nedefinirano)" -#: dwarf.c:3207 +#: dwarf.c:3205 #, c-format msgid "(unsigned)" msgstr "" -#: dwarf.c:3208 +#: dwarf.c:3206 #, c-format msgid "(leading overpunch)" msgstr "" -#: dwarf.c:3209 +#: dwarf.c:3207 #, c-format msgid "(trailing overpunch)" msgstr "" -#: dwarf.c:3210 +#: dwarf.c:3208 #, c-format msgid "(leading separate)" msgstr "" -#: dwarf.c:3211 +#: dwarf.c:3209 #, c-format msgid "(trailing separate)" msgstr "" -#: dwarf.c:3212 dwarf.c:3223 +#: dwarf.c:3210 dwarf.c:3221 #, c-format msgid "(unrecognised)" msgstr "" -#: dwarf.c:3220 +#: dwarf.c:3218 #, c-format msgid "(no)" msgstr "" -#: dwarf.c:3221 +#: dwarf.c:3219 #, c-format msgid "(in class)" msgstr "" -#: dwarf.c:3222 +#: dwarf.c:3220 #, c-format msgid "(out of class)" msgstr "" -#: dwarf.c:3254 +#: dwarf.c:3252 #, c-format msgid " (location list)" msgstr "" -#: dwarf.c:3275 dwarf.c:6444 dwarf.c:6614 dwarf.c:6789 +#: dwarf.c:3273 dwarf.c:6449 dwarf.c:6620 dwarf.c:6796 #, c-format msgid " [without DW_AT_frame_base]" msgstr "" -#: dwarf.c:3305 +#: dwarf.c:3303 #, c-format msgid "" "Offset %s used as value for DW_AT_import attribute of DIE at offset 0x%lx is " "too big.\n" msgstr "" -#: dwarf.c:3311 +#: dwarf.c:3309 #, c-format msgid "\t[Abbrev Number: %ld" msgstr "" -#: dwarf.c:3406 +#: dwarf.c:3404 #, c-format msgid "" "Raw dump of debug contents of section %s (loaded from %s):\n" "\n" msgstr "" -#: dwarf.c:3409 +#: dwarf.c:3407 #, c-format msgid "" "Raw dump of debug contents of section %s:\n" "\n" msgstr "" -#: dwarf.c:3414 +#: dwarf.c:3412 #, c-format msgid "" "Contents of the %s section (loaded from %s):\n" "\n" msgstr "" -#: dwarf.c:3417 +#: dwarf.c:3415 #, c-format msgid "" "Contents of the %s section:\n" "\n" msgstr "" -#: dwarf.c:3460 +#: dwarf.c:3458 #, c-format msgid "Reserved length value (0x%s) found in section %s\n" msgstr "" @@ -2393,7 +2393,7 @@ msgid " .debug_str_offsets.dwo: 0x%s 0x%s\n" msgstr "" -#: dwarf.c:5637 dwarf.c:7210 dwarf.c:9605 +#: dwarf.c:5642 dwarf.c:7220 dwarf.c:9626 #, c-format msgid "Debug info is corrupted, %s header at %#lx has length %s\n" msgstr "" @@ -2468,7 +2468,7 @@ msgid "Only DWARF version 2, 3, 4 and 5 line info is currently supported.\n" msgstr "" -#: dwarf.c:4126 dwarf.c:6882 dwarf.c:7747 +#: dwarf.c:4126 dwarf.c:6889 dwarf.c:7763 #, c-format msgid "The %s section contains unsupported segment selector size: %d.\n" msgstr "" @@ -2477,7 +2477,7 @@ msgid "Invalid maximum operations per insn.\n" msgstr "" -#: dwarf.c:4181 +#: dwarf.c:3720 #, c-format msgid "Line length %s extends beyond end of section\n" msgstr "" @@ -2551,7 +2551,7 @@ msgid "\tSize" msgstr "" -#: dwarf.c:3467 +#: dwarf.c:3809 #, c-format msgid "\tMD5" msgstr "" @@ -2575,7 +2575,7 @@ "section\n" msgstr "" -#: dwarf.c:4412 dwarf.c:5962 +#: dwarf.c:4412 dwarf.c:5967 #, c-format msgid " Offset: 0x%lx\n" msgstr "" @@ -2756,7 +2756,7 @@ msgid " Set ISA to %s\n" msgstr "" -#: dwarf.c:4755 dwarf.c:5392 +#: dwarf.c:4755 dwarf.c:5394 #, c-format msgid " Unknown opcode %d with operands: " msgstr "" @@ -2783,22 +2783,22 @@ msgid "CU: %s:\n" msgstr "" -#: dwarf.c:5130 dwarf.c:5430 readelf.c:6373 readelf.c:6470 readelf.c:6488 -#: readelf.c:6506 readelf.c:7306 readelf.c:11504 readelf.c:12169 -#: readelf.c:12182 readelf.c:17545 readelf.c:17577 +#: dwarf.c:5130 dwarf.c:5435 readelf.c:6715 readelf.c:6812 readelf.c:6830 +#: readelf.c:6848 readelf.c:7652 readelf.c:11854 readelf.c:12519 +#: readelf.c:12532 readelf.c:17921 readelf.c:17953 msgid "" msgstr "" -#: dwarf.c:5133 dwarf.c:5322 +#: dwarf.c:5133 dwarf.c:5324 #, c-format msgid "directory index %u > number of directories %s\n" msgstr "" -#: dwarf.c:5135 dwarf.c:5424 elfcomm.c:777 readelf.c:356 readelf.c:745 -#: readelf.c:7483 readelf.c:8044 readelf.c:10075 readelf.c:12496 -#: readelf.c:12562 readelf.c:12566 readelf.c:12634 readelf.c:12639 -#: readelf.c:16278 readelf.c:16367 readelf.c:16960 readelf.c:16979 -#: readelf.c:17098 readelf.c:17554 readelf.c:18710 readelf.c:18713 +#: dwarf.c:5135 dwarf.c:5429 elfcomm.c:777 readelf.c:389 readelf.c:923 +#: readelf.c:7830 readelf.c:8393 readelf.c:10429 readelf.c:12871 +#: readelf.c:12937 readelf.c:12941 readelf.c:13013 readelf.c:13018 +#: readelf.c:16651 readelf.c:16740 readelf.c:17333 readelf.c:17352 +#: readelf.c:17471 readelf.c:17930 readelf.c:19085 readelf.c:19088 #, c-format msgid "" msgstr "" @@ -2820,409 +2820,409 @@ msgid "UNKNOWN (%u): length %ld\n" msgstr "" -#: dwarf.c:5306 +#: dwarf.c:5308 #, c-format msgid "" "\n" " [Use file table entry %d]\n" msgstr "" -#: dwarf.c:5310 +#: dwarf.c:5312 #, c-format msgid "file index %u > number of files %u\n" msgstr "" -#: dwarf.c:5311 +#: dwarf.c:5313 #, c-format msgid "" "\n" " " msgstr "" -#: dwarf.c:5317 +#: dwarf.c:5319 #, c-format msgid "" "\n" " [Use file %s in directory table entry %d]\n" msgstr "" -#: dwarf.c:5324 +#: dwarf.c:5326 #, c-format msgid "" "\n" " \n" msgstr "" -#: dwarf.c:5388 +#: dwarf.c:5390 #, c-format msgid " Set ISA to %lu\n" msgstr "" -#: dwarf.c:5423 +#: dwarf.c:5428 #, c-format msgid "corrupt file index %u encountered\n" msgstr "" -#: dwarf.c:5592 +#: dwarf.c:5597 msgid "no info" msgstr "" -#: dwarf.c:5593 +#: dwarf.c:5598 msgid "type" msgstr "" -#: dwarf.c:5594 +#: dwarf.c:5599 msgid "variable" msgstr "" -#: dwarf.c:5595 +#: dwarf.c:5600 msgid "function" msgstr "" -#: dwarf.c:5596 +#: dwarf.c:5601 msgid "other" msgstr "" -#: dwarf.c:5597 +#: dwarf.c:5602 msgid "unused5" msgstr "" -#: dwarf.c:5598 +#: dwarf.c:5603 msgid "unused6" msgstr "" -#: dwarf.c:5599 +#: dwarf.c:5604 msgid "unused7" msgstr "" -#: dwarf.c:5653 dwarf.c:7225 +#: dwarf.c:5658 dwarf.c:7235 #, c-format msgid "" ".debug_info offset of 0x%lx in %s section does not point to a CU header.\n" msgstr "" -#: dwarf.c:5658 +#: dwarf.c:5663 #, c-format msgid " Length: %ld\n" msgstr "" -#: dwarf.c:5660 +#: dwarf.c:5665 #, c-format msgid " Version: %d\n" msgstr "" -#: dwarf.c:5662 +#: dwarf.c:5667 #, c-format msgid " Offset into .debug_info section: 0x%lx\n" msgstr "" -#: dwarf.c:5664 +#: dwarf.c:5669 #, c-format msgid " Size of area in .debug_info section: %ld\n" msgstr "" -#: dwarf.c:5673 +#: dwarf.c:5678 msgid "Only DWARF 2 and 3 pubnames are currently supported\n" msgstr "" -#: dwarf.c:5681 +#: dwarf.c:5686 #, c-format msgid "" "\n" " Offset Kind Name\n" msgstr "" -#: dwarf.c:5683 +#: dwarf.c:5688 #, c-format msgid "" "\n" " Offset\tName\n" msgstr "" -#: dwarf.c:5717 +#: dwarf.c:5722 msgid "s" msgstr "" -#: dwarf.c:5717 +#: dwarf.c:5722 msgid "g" msgstr "" -#: dwarf.c:5775 +#: dwarf.c:5780 #, c-format msgid " DW_MACINFO_start_file - lineno: %d filenum: %d\n" msgstr "" -#: dwarf.c:5781 +#: dwarf.c:5786 #, c-format msgid " DW_MACINFO_end_file\n" msgstr "" -#: dwarf.c:5748 +#: dwarf.c:5227 #, c-format msgid " DW_MACINFO_define - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:5756 +#: dwarf.c:5235 #, c-format msgid " DW_MACINFO_undef - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:5767 +#: dwarf.c:5246 #, c-format msgid " DW_MACINFO_vendor_ext - constant : %d string : %s\n" msgstr "" -#: dwarf.c:5897 +#: dwarf.c:5375 #, c-format msgid "Only GNU extension to DWARF 4 or 5 of %s is currently supported.\n" msgstr "" -#: dwarf.c:5964 +#: dwarf.c:5969 #, c-format msgid " Version: %d\n" msgstr " Inačica: %d\n" -#: dwarf.c:5965 +#: dwarf.c:5970 #, c-format msgid " Offset size: %d\n" msgstr "" -#: dwarf.c:5969 +#: dwarf.c:5974 #, c-format msgid " Offset into .debug_line: 0x%lx\n" msgstr "" -#: dwarf.c:5983 +#: dwarf.c:5988 #, c-format msgid " Extension opcode arguments:\n" msgstr "" -#: dwarf.c:5990 +#: dwarf.c:5995 #, c-format msgid " DW_MACRO_%02x has no arguments\n" msgstr "" -#: dwarf.c:5993 +#: dwarf.c:5998 #, c-format msgid " DW_MACRO_%02x arguments: " msgstr "" -#: dwarf.c:6019 +#: dwarf.c:6024 #, c-format msgid "Invalid extension opcode form %s\n" msgstr "" -#: dwarf.c:6036 +#: dwarf.c:6041 msgid ".debug_macro section not zero terminated\n" msgstr "" -#: dwarf.c:6075 +#: dwarf.c:6080 msgid "DW_MACRO_start_file used, but no .debug_line offset provided.\n" msgstr "" -#: dwarf.c:6081 +#: dwarf.c:6086 #, c-format msgid " DW_MACRO_start_file - lineno: %d filenum: %d\n" msgstr "" -#: dwarf.c:6084 +#: dwarf.c:6089 #, c-format msgid " DW_MACRO_start_file - lineno: %d filenum: %d filename: %s%s%s\n" msgstr "" -#: dwarf.c:6092 +#: dwarf.c:6097 #, c-format msgid " DW_MACRO_end_file\n" msgstr "" -#: dwarf.c:5993 +#: dwarf.c:5500 #, c-format msgid " DW_MACRO_define - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6001 +#: dwarf.c:5508 #, c-format msgid " DW_MACRO_undef - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6102 +#: dwarf.c:6107 #, c-format msgid " DW_MACRO_define_strp - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6113 +#: dwarf.c:6118 #, c-format msgid " DW_MACRO_undef_strp - lineno : %d macro : %s\n" msgstr "" -#: dwarf.c:6119 +#: dwarf.c:6124 #, c-format msgid " DW_MACRO_import - offset : 0x%lx\n" msgstr "" -#: dwarf.c:6126 +#: dwarf.c:6131 #, c-format msgid " DW_MACRO_define_sup - lineno : %d macro offset : 0x%lx\n" msgstr "" -#: dwarf.c:6133 +#: dwarf.c:6138 #, c-format msgid " DW_MACRO_undef_sup - lineno : %d macro offset : 0x%lx\n" msgstr "" -#: dwarf.c:6139 +#: dwarf.c:6144 #, c-format msgid " DW_MACRO_import_sup - offset : 0x%lx\n" msgstr "" -#: dwarf.c:6168 +#: dwarf.c:6173 #, c-format msgid " Unknown macro opcode %02x seen\n" msgstr "" -#: dwarf.c:6179 +#: dwarf.c:6184 #, c-format msgid " DW_MACRO_%02x\n" msgstr "" -#: dwarf.c:6182 +#: dwarf.c:6187 #, c-format msgid " DW_MACRO_%02x -" msgstr "" -#: dwarf.c:6237 +#: dwarf.c:6242 #, c-format msgid " Number TAG (0x%lx)\n" msgstr "" -#: dwarf.c:6246 +#: dwarf.c:6251 msgid "has children" msgstr "ima djecu" -#: dwarf.c:6246 +#: dwarf.c:6251 msgid "no children" msgstr "nema djece" -#: dwarf.c:6308 +#: dwarf.c:6313 #, c-format msgid "location view pair\n" msgstr "" -#: dwarf.c:6340 +#: dwarf.c:6344 #, c-format msgid "No debug information available for loc lists of entry: %u\n" msgstr "" -#: dwarf.c:6352 dwarf.c:6499 dwarf.c:6682 +#: dwarf.c:6356 dwarf.c:6504 dwarf.c:6688 #, c-format msgid "Invalid pointer size (%d) in debug info for entry %d\n" msgstr "" -#: dwarf.c:6364 dwarf.c:6417 dwarf.c:6426 dwarf.c:6511 dwarf.c:6588 -#: dwarf.c:6596 dwarf.c:6693 dwarf.c:6766 dwarf.c:6774 +#: dwarf.c:6368 dwarf.c:6422 dwarf.c:6431 dwarf.c:6516 dwarf.c:6594 +#: dwarf.c:6602 dwarf.c:6700 dwarf.c:6773 dwarf.c:6781 #, c-format msgid "Location list starting at offset 0x%lx is not terminated.\n" msgstr "" -#: dwarf.c:6385 dwarf.c:6539 dwarf.c:6731 dwarf.c:7569 dwarf.c:7624 +#: dwarf.c:6390 dwarf.c:6545 dwarf.c:6738 dwarf.c:7582 dwarf.c:7640 #, c-format msgid "\n" msgstr "\n" -#: dwarf.c:6397 dwarf.c:6560 dwarf.c:7629 +#: dwarf.c:6402 dwarf.c:6566 dwarf.c:7645 #, c-format msgid "(base address)\n" msgstr "" -#: dwarf.c:6411 dwarf.c:6532 dwarf.c:6719 +#: dwarf.c:6416 dwarf.c:6538 dwarf.c:6726 #, c-format msgid "" "views at %8.8lx for:\n" " %*s " msgstr "" -#: dwarf.c:6447 dwarf.c:6617 +#: dwarf.c:6452 dwarf.c:6623 msgid " (start == end)" msgstr " (početak == kraj)" -#: dwarf.c:6449 dwarf.c:6619 +#: dwarf.c:6454 dwarf.c:6625 msgid " (start > end)" msgstr " (početak > kraj)" -#: dwarf.c:6486 +#: dwarf.c:6491 #, c-format msgid "No debug information available for loclists lists of entry: %u\n" msgstr "" -#: dwarf.c:6565 +#: dwarf.c:6571 #, c-format msgid "View pair entry in loclist with locviews attribute\n" msgstr "" -#: dwarf.c:6572 +#: dwarf.c:6578 #, c-format msgid "views for:\n" msgstr "" -#: dwarf.c:6576 +#: dwarf.c:6582 #, c-format msgid "Invalid location list entry type %d\n" msgstr "" -#: dwarf.c:6628 +#: dwarf.c:6634 #, c-format msgid "Trailing view pair not used in a range" msgstr "" -#: dwarf.c:6670 +#: dwarf.c:6676 #, c-format msgid "No debug information for loc lists of entry: %u\n" msgstr "" -#: dwarf.c:6737 +#: dwarf.c:6744 #, c-format msgid "(base address selection entry)\n" msgstr "" -#: dwarf.c:6758 +#: dwarf.c:6765 #, c-format msgid "Unknown location list entry type 0x%x.\n" msgstr "" -#: dwarf.c:6851 dwarf.c:7104 dwarf.c:7323 dwarf.c:7430 dwarf.c:7691 +#: dwarf.c:6858 dwarf.c:7115 dwarf.c:7333 dwarf.c:7440 dwarf.c:7708 #, c-format msgid "" "\n" "The %s section is empty.\n" msgstr "" -#: dwarf.c:6871 +#: dwarf.c:6878 #, c-format msgid "The %s section contains corrupt or unsupported version number: %d.\n" msgstr "" -#: dwarf.c:6891 +#: dwarf.c:6898 #, c-format msgid "The %s section contains unsupported offset entry count: %d.\n" msgstr "" -#: dwarf.c:6902 dwarf.c:7329 dwarf.c:7765 +#: dwarf.c:6909 dwarf.c:7339 dwarf.c:7781 #, c-format msgid "" "Unable to load/parse the .debug_info section, so cannot interpret the %s " "section.\n" msgstr "" -#: dwarf.c:6950 +#: dwarf.c:6957 msgid "No location lists in .debug_info section!\n" msgstr "" -#: dwarf.c:6955 +#: dwarf.c:6962 #, c-format msgid "Location lists in %s section start at 0x%s\n" msgstr "" -#: dwarf.c:6965 +#: dwarf.c:6972 #, c-format msgid "" " Warning: This section has relocations - addresses seen here may not be " @@ -3230,86 +3230,86 @@ "\n" msgstr "" -#: dwarf.c:6967 +#: dwarf.c:6974 #, c-format msgid " Offset Begin End Expression\n" msgstr "" -#: dwarf.c:7022 +#: dwarf.c:7020 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr "" -#: dwarf.c:7026 +#: dwarf.c:7024 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in .debug_loc section.\n" msgstr "" -#: dwarf.c:7035 +#: dwarf.c:7033 #, c-format msgid "Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "" -#: dwarf.c:7042 +#: dwarf.c:7040 #, c-format msgid "View Offset 0x%lx is bigger than .debug_loc section size.\n" msgstr "" -#: dwarf.c:7059 +#: dwarf.c:7070 msgid "DWO is not yet supported.\n" msgstr "" -#: dwarf.c:7076 +#: dwarf.c:7087 msgid "" "Hole and overlap detection requires adjacent view lists and loclists.\n" msgstr "" -#: dwarf.c:7085 +#: dwarf.c:7096 #, c-format msgid "There is %ld unused byte at the end of section %s\n" msgid_plural "There are %ld unused bytes at the end of section %s\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:7238 +#: dwarf.c:7248 msgid "Only DWARF 2 and 3 aranges are currently supported.\n" msgstr "" -#: dwarf.c:7242 +#: dwarf.c:7252 #, c-format msgid " Length: %ld\n" msgstr " Duljina: %ld\n" -#: dwarf.c:7244 +#: dwarf.c:7254 #, c-format msgid " Version: %d\n" msgstr " Inačica: %d\n" -#: dwarf.c:7245 +#: dwarf.c:7255 #, c-format msgid " Offset into .debug_info: 0x%lx\n" msgstr "" -#: dwarf.c:7247 +#: dwarf.c:7257 #, c-format msgid " Pointer Size: %d\n" msgstr "" -#: dwarf.c:7248 +#: dwarf.c:7258 #, c-format msgid " Segment Size: %d\n" msgstr " Veličina segmenta: %d\n" -#: dwarf.c:7255 +#: dwarf.c:7265 #, c-format msgid "Invalid address size in %s section!\n" msgstr "" -#: dwarf.c:7265 +#: dwarf.c:7275 msgid "Pointer size + Segment size is not a power of two.\n" msgstr "Veličina pokazivača + Veličina segmenta nije potencija broja dva.\n" -#: dwarf.c:7270 +#: dwarf.c:7280 #, c-format msgid "" "\n" @@ -3318,7 +3318,7 @@ "\n" " Adresa Duljina\n" -#: dwarf.c:7272 +#: dwarf.c:7282 #, c-format msgid "" "\n" @@ -3327,265 +3327,265 @@ "\n" " Adresa Duljina\n" -#: dwarf.c:7349 +#: dwarf.c:7359 #, c-format msgid "Corrupt address base (%lx) found in debug section %u\n" msgstr "" -#: dwarf.c:7366 +#: dwarf.c:7376 #, c-format msgid " For compilation unit at offset 0x%s:\n" msgstr "" -#: dwarf.c:7369 +#: dwarf.c:7379 #, c-format msgid "\tIndex\tAddress\n" msgstr "" -#: dwarf.c:7407 +#: dwarf.c:7417 #, c-format msgid "\t%d:\t" msgstr "" -#: dwarf.c:7588 dwarf.c:7665 +#: dwarf.c:7601 dwarf.c:7681 msgid "(start == end)" msgstr "(početak == kraj)" -#: dwarf.c:7590 dwarf.c:7667 +#: dwarf.c:7603 dwarf.c:7683 msgid "(start > end)" msgstr "(početak > kraj)" -#: dwarf.c:7612 +#: dwarf.c:7610 #, c-format msgid "Range list starting at offset 0x%lx is not terminated.\n" msgstr "" -#: dwarf.c:7645 +#: dwarf.c:7661 #, c-format msgid "Invalid range list entry type %d\n" msgstr "" -#: dwarf.c:7725 +#: dwarf.c:7742 #, c-format msgid "" "The length field (0x%lx) in the debug_rnglists header is wrong - the section " "is too small\n" msgstr "" -#: dwarf.c:7737 +#: dwarf.c:7753 msgid "Only DWARF version 5 debug_rnglists info is currently supported.\n" msgstr "" -#: dwarf.c:7756 +#: dwarf.c:7772 #, c-format msgid "The %s section contains unsupported offset entry count: %u.\n" msgstr "" #. This can happen when the file was compiled with -gsplit-debug #. which removes references to range lists from the primary .o file. -#: dwarf.c:7786 +#: dwarf.c:7802 #, c-format msgid "No range lists in .debug_info section.\n" msgstr "" -#: dwarf.c:7818 +#: dwarf.c:7834 #, c-format msgid "Range lists in %s section start at 0x%lx\n" msgstr "" -#: dwarf.c:7823 +#: dwarf.c:7839 #, c-format msgid " Offset Begin End\n" msgstr "" -#: dwarf.c:7841 +#: dwarf.c:7857 #, c-format msgid "Corrupt pointer size (%d) in debug entry at offset %8.8lx\n" msgstr "" -#: dwarf.c:7848 +#: dwarf.c:7864 #, c-format msgid "Corrupt offset (%#8.8lx) in range entry %u\n" msgstr "" -#: dwarf.c:7866 +#: dwarf.c:7029 dwarf.c:7882 #, c-format msgid "There is a hole [0x%lx - 0x%lx] in %s section.\n" msgstr "" -#: dwarf.c:7873 +#: dwarf.c:7034 dwarf.c:7889 #, c-format msgid "There is an overlap [0x%lx - 0x%lx] in %s section.\n" msgstr "" -#: dwarf.c:7949 +#: dwarf.c:7965 #, c-format msgid "Unfeasibly large register number: %u\n" msgstr "" -#: dwarf.c:7962 +#: dwarf.c:7978 #, c-format msgid "Out of memory allocating %u columns in dwarf frame arrays\n" msgstr "" -#: dwarf.c:8411 +#: dwarf.c:8427 msgid "No terminator for augmentation name\n" msgstr "" -#: dwarf.c:8429 +#: dwarf.c:8445 #, c-format msgid "Invalid pointer size (%d) in CIE data\n" msgstr "" -#: dwarf.c:8437 +#: dwarf.c:8453 #, c-format msgid "Invalid segment size (%d) in CIE data\n" msgstr "" -#: dwarf.c:8473 dwarf.c:8849 +#: dwarf.c:8489 dwarf.c:8862 #, c-format msgid "Augmentation data too long: 0x%s, expected at most %#lx\n" msgstr "" -#: dwarf.c:8560 +#: dwarf.c:8576 #, c-format msgid " Augmentation data: " msgstr "" -#: dwarf.c:8576 +#: dwarf.c:8592 msgid "bad register: " msgstr "neispravan registar: " -#: dwarf.c:8748 +#: dwarf.c:8764 msgid "Failed to read CIE information\n" msgstr "" -#: dwarf.c:8759 dwarf.c:8783 dwarf.c:8810 +#: dwarf.c:8775 dwarf.c:8796 dwarf.c:8823 msgid "Invalid max register\n" msgstr "" #. PR 17512: file: 9e196b3e. -#: dwarf.c:8825 +#: dwarf.c:8838 #, c-format msgid "Probably corrupt segment size: %d - using 4 instead\n" msgstr "" -#: dwarf.c:8830 +#: dwarf.c:8177 #, c-format msgid "Corrupt CFA_def expression value: %lu\n" msgstr "" #. PR 17512: file:306-192417-0.005. -#: dwarf.c:8844 +#: dwarf.c:8191 #, c-format msgid "Corrupt CFA expression value: %lu\n" msgstr "" -#: dwarf.c:9296 +#: dwarf.c:9317 msgid "Invalid column number in saved frame state\n" msgstr "" -#: dwarf.c:9343 +#: dwarf.c:9364 #, c-format msgid " DW_CFA_def_cfa_expression: \n" msgstr "" -#: dwarf.c:9366 +#: dwarf.c:9387 #, c-format msgid " DW_CFA_expression: \n" msgstr "" -#: dwarf.c:9499 +#: dwarf.c:9520 #, c-format msgid " DW_CFA_??? (User defined call frame op: %#x)\n" msgstr "" -#: dwarf.c:9501 +#: dwarf.c:9522 #, c-format msgid "Unsupported or unknown Dwarf Call Frame Instruction number: %#x\n" msgstr "" -#: dwarf.c:9615 dwarf.c:10032 +#: dwarf.c:9636 dwarf.c:10053 #, c-format msgid "Version %ld\n" msgstr "Inačica %ld\n" -#: dwarf.c:9621 +#: dwarf.c:9642 msgid "Only DWARF version 5 .debug_names is currently supported.\n" msgstr "" -#: dwarf.c:9628 +#: dwarf.c:9649 #, c-format msgid "Padding field of .debug_names must be 0 (found 0x%x)\n" msgstr "" -#: dwarf.c:9633 +#: dwarf.c:9654 msgid "Compilation unit count must be >= 1 in .debug_names\n" msgstr "" -#: dwarf.c:9644 +#: dwarf.c:9665 #, c-format msgid "" "Augmentation string length %u must be rounded up to a multiple of 4 in " ".debug_names.\n" msgstr "" -#: dwarf.c:9652 +#: dwarf.c:9673 #, c-format msgid "Augmentation string:" msgstr "" -#: dwarf.c:9679 +#: dwarf.c:9700 #, c-format msgid "CU table:\n" msgstr "" -#: dwarf.c:9688 dwarf.c:9701 +#: dwarf.c:9709 dwarf.c:9722 #, c-format msgid "[%3u] 0x%lx\n" msgstr "" -#: dwarf.c:9692 +#: dwarf.c:9713 #, c-format msgid "TU table:\n" msgstr "" -#: dwarf.c:9705 +#: dwarf.c:9726 #, c-format msgid "Foreign TU table:\n" msgstr "" -#: dwarf.c:9714 +#: dwarf.c:9735 #, c-format msgid "[%3u] " msgstr "" -#: dwarf.c:9725 +#: dwarf.c:9746 #, c-format msgid "" "Entry pool offset (0x%lx) exceeds unit size 0x%lx for unit 0x%lx in the " "debug_names\n" msgstr "" -#: dwarf.c:9754 +#: dwarf.c:9775 #, c-format msgid "Used %zu of %lu bucket.\n" msgid_plural "Used %zu of %lu buckets.\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:9781 +#: dwarf.c:9802 #, c-format msgid "" "Out of %lu items there are %zu bucket clashes (longest of %zu entries).\n" msgstr "" -#: dwarf.c:9818 +#: dwarf.c:9839 #, c-format msgid "Duplicate abbreviation tag %lu in unit 0x%lx in the debug_names\n" msgstr "" -#: dwarf.c:9840 dwarf.c:10158 +#: dwarf.c:9861 dwarf.c:10179 #, c-format msgid "" "\n" @@ -3594,129 +3594,129 @@ "\n" "Tablica simbola:\n" -#: dwarf.c:9892 +#: dwarf.c:9913 #, c-format msgid "Undefined abbreviation tag %lu in unit 0x%lx in the debug_names\n" msgstr "" -#: dwarf.c:9923 +#: dwarf.c:9944 #, c-format msgid " " msgstr "" -#: dwarf.c:9955 +#: dwarf.c:9976 msgid "The debuglink filename is corrupt/missing\n" msgstr "" -#: dwarf.c:9959 +#: dwarf.c:9980 #, c-format msgid " Separate debug info file: %s\n" msgstr "" -#: dwarf.c:9970 +#: dwarf.c:9991 msgid "CRC offset missing/truncated\n" msgstr "" -#: dwarf.c:9976 +#: dwarf.c:9997 #, c-format msgid " CRC value: %#x\n" msgstr "" -#: dwarf.c:9980 +#: dwarf.c:10001 #, c-format msgid "There are %#lx extraneous bytes at the end of the section\n" msgstr "" -#: dwarf.c:9994 +#: dwarf.c:10015 #, c-format msgid "Build-ID is too short (%#lx bytes)\n" msgstr "" -#: dwarf.c:9998 +#: dwarf.c:10019 #, c-format msgid " Build-ID (%#lx bytes):" msgstr "" -#: dwarf.c:10027 +#: dwarf.c:10048 #, c-format msgid "Truncated header in the %s section.\n" msgstr "" -#: dwarf.c:10038 +#: dwarf.c:10059 #, c-format msgid "Unsupported version %lu.\n" msgstr "Nepodržana inačica %lu.\n" -#: dwarf.c:10042 +#: dwarf.c:10063 msgid "The address table data in version 3 may be wrong.\n" msgstr "Podaci tablice adresa u inačici 3 mogu biti pogrešni.\n" -#: dwarf.c:10044 +#: dwarf.c:10065 msgid "Version 4 does not support case insensitive lookups.\n" msgstr "" -#: dwarf.c:10046 +#: dwarf.c:10067 msgid "Version 5 does not include inlined functions.\n" msgstr "" -#: dwarf.c:10048 +#: dwarf.c:10069 msgid "Version 6 does not include symbol attributes.\n" msgstr "" -#: dwarf.c:10066 +#: dwarf.c:10087 #, c-format msgid "Corrupt header in the %s section.\n" msgstr "" -#: dwarf.c:10073 +#: dwarf.c:10094 #, c-format msgid "TU offset (%x) is less than CU offset (%x)\n" msgstr "" -#: dwarf.c:10082 +#: dwarf.c:10103 #, c-format msgid "Address table offset (%x) is less than TU offset (%x)\n" msgstr "" -#: dwarf.c:10092 +#: dwarf.c:10113 #, c-format msgid "Symbol table offset (%x) is less then Address table offset (%x)\n" msgstr "" -#: dwarf.c:10101 +#: dwarf.c:10122 #, c-format msgid "Constant pool offset (%x) is less than symbol table offset (%x)\n" msgstr "" -#: dwarf.c:10116 +#: dwarf.c:10137 msgid "Address table extends beyond end of section.\n" msgstr "" -#: dwarf.c:10120 +#: dwarf.c:10141 #, c-format msgid "" "\n" "CU table:\n" msgstr "" -#: dwarf.c:10126 +#: dwarf.c:10147 #, c-format msgid "[%3u] 0x%lx - 0x%lx\n" msgstr "[%3u] 0x%lx - 0x%lx\n" -#: dwarf.c:10131 +#: dwarf.c:10152 #, c-format msgid "" "\n" "TU table:\n" msgstr "" -#: dwarf.c:10138 +#: dwarf.c:10159 #, c-format msgid "[%3u] 0x%lx 0x%lx " msgstr "[%3u] 0x%lx 0x%lx " -#: dwarf.c:10145 +#: dwarf.c:10166 #, c-format msgid "" "\n" @@ -3725,282 +3725,282 @@ "\n" "Tablica adresa:\n" -#: dwarf.c:10155 +#: dwarf.c:10176 #, c-format msgid "%lu\n" msgstr "%lu\n" -#: dwarf.c:10173 +#: dwarf.c:10194 #, c-format msgid "[%3u] " msgstr "" -#: dwarf.c:10174 +#: dwarf.c:10195 #, c-format msgid "Corrupt name offset of 0x%x found for symbol table slot %d\n" msgstr "" -#: dwarf.c:10185 +#: dwarf.c:10206 #, c-format msgid "\n" msgstr "" -#: dwarf.c:10186 +#: dwarf.c:10207 #, c-format msgid "Corrupt CU vector offset of 0x%x found for symbol table slot %d\n" msgstr "" -#: dwarf.c:10197 +#: dwarf.c:10218 #, c-format msgid "Invalid number of CUs (0x%x) for symbol table slot %d\n" msgstr "" -#: dwarf.c:10222 +#: dwarf.c:10243 msgid "static" msgstr "" -#: dwarf.c:10222 +#: dwarf.c:10243 msgid "global" msgstr "" -#: dwarf.c:10260 dwarf.c:10271 +#: dwarf.c:10281 dwarf.c:10292 msgid "Internal error: out of space in the shndx pool.\n" msgstr "" -#: dwarf.c:10334 +#: dwarf.c:10355 #, c-format msgid "Section %s is empty\n" msgstr "" -#: dwarf.c:10340 +#: dwarf.c:10361 #, c-format msgid "Section %s is too small to contain a CU/TU header\n" msgstr "" -#: dwarf.c:10359 +#: dwarf.c:10380 #, c-format msgid " Version: %u\n" msgstr "" -#: dwarf.c:10361 +#: dwarf.c:10382 #, c-format msgid " Number of columns: %u\n" msgstr "" -#: dwarf.c:10362 +#: dwarf.c:10383 #, c-format msgid " Number of used entries: %u\n" msgstr "" -#: dwarf.c:10363 +#: dwarf.c:10384 #, c-format msgid "" " Number of slots: %u\n" "\n" msgstr "" -#: dwarf.c:10370 +#: dwarf.c:10391 #, c-format msgid "Section %s is too small for %u slot\n" msgid_plural "Section %s is too small for %u slots\n" msgstr[0] "" msgstr[1] "" -#: dwarf.c:10394 +#: dwarf.c:10415 msgid "Section index pool located before start of section\n" msgstr "" -#: dwarf.c:10399 +#: dwarf.c:10420 #, c-format msgid " [%3d] Signature: 0x%s Sections: " msgstr "" -#: dwarf.c:10405 +#: dwarf.c:10426 #, c-format msgid "Section %s too small for shndx pool\n" msgstr "" -#: dwarf.c:10451 +#: dwarf.c:10472 #, c-format msgid "Section %s too small for offset and size tables\n" msgstr "" -#: dwarf.c:10458 +#: dwarf.c:10479 #, c-format msgid " Offset table\n" msgstr "" -#: dwarf.c:10460 dwarf.c:10548 +#: dwarf.c:10481 dwarf.c:10569 msgid "signature" msgstr "" -#: dwarf.c:10460 dwarf.c:10548 +#: dwarf.c:10481 dwarf.c:10569 msgid "dwo_id" msgstr "" -#: dwarf.c:10499 +#: dwarf.c:10520 #, c-format msgid "Row index (%u) is larger than number of used entries (%u)\n" msgstr "" -#: dwarf.c:10360 +#: dwarf.c:9707 #, c-format msgid "Signature (%p) extends beyond end of space in section\n" msgstr "" -#: dwarf.c:10369 +#: dwarf.c:9716 #, c-format msgid "Row index (%u) * num columns (%u) > space remaining in section\n" msgstr "" -#: dwarf.c:10513 dwarf.c:10572 +#: dwarf.c:10534 dwarf.c:10593 #, c-format msgid " [%3d] 0x%s" msgstr "" -#: dwarf.c:10528 dwarf.c:10586 +#: dwarf.c:10549 dwarf.c:10621 #, c-format msgid "Overlarge Dwarf section index detected: %u\n" msgstr "" -#: dwarf.c:10546 +#: dwarf.c:10567 #, c-format msgid " Size table\n" msgstr "" -#: dwarf.c:10601 +#: dwarf.c:10636 #, c-format msgid " Unsupported version (%d)\n" msgstr "" -#: dwarf.c:10673 +#: dwarf.c:10708 #, c-format msgid "Displaying the debug contents of section %s is not yet supported.\n" msgstr "" -#: dwarf.c:10704 +#: dwarf.c:10739 #, c-format msgid "" "Attempt to allocate an array with an excessive number of elements: 0x%lx\n" msgstr "" -#: dwarf.c:10722 +#: dwarf.c:10757 #, c-format msgid "" "Attempt to re-allocate an array with an excessive number of elements: 0x%lx\n" msgstr "" -#: dwarf.c:10738 +#: dwarf.c:10773 #, c-format msgid "" "Attempt to allocate a zero'ed array with an excessive number of elements: " "0x%lx\n" msgstr "" -#: dwarf.c:10836 +#: dwarf.c:10871 #, c-format msgid "Unable to reopen separate debug info file: %s\n" msgstr "" -#: dwarf.c:10848 +#: dwarf.c:10883 #, c-format msgid "" "Separate debug info file %s found, but CRC does not match - ignoring\n" msgstr "" -#: dwarf.c:11024 +#: dwarf.c:11062 #, c-format msgid "Corrupt debuglink section: %s\n" msgstr "" -#: dwarf.c:11062 +#: dwarf.c:11101 msgid "Out of memory" msgstr "" #. Failed to find the file. -#: dwarf.c:11136 +#: dwarf.c:11176 #, c-format msgid "could not find separate debug file '%s'\n" msgstr "" -#: dwarf.c:11138 dwarf.c:11143 dwarf.c:11149 dwarf.c:11153 dwarf.c:11158 -#: dwarf.c:11161 dwarf.c:11164 dwarf.c:11167 +#: dwarf.c:11178 dwarf.c:11183 dwarf.c:11189 dwarf.c:11193 dwarf.c:11198 +#: dwarf.c:11201 dwarf.c:11204 dwarf.c:11207 #, c-format msgid "tried: %s\n" msgstr "" -#: dwarf.c:11175 +#: dwarf.c:11215 #, c-format msgid "tried: DEBUGINFOD_URLS=%s\n" msgstr "" -#: dwarf.c:11192 +#: dwarf.c:11243 #, c-format msgid "failed to open separate debug file: %s\n" msgstr "" #. FIXME: We do not check to see if there are any other separate debug info #. files that would also match. -#: dwarf.c:11047 +#: dwarf.c:10400 #, c-format msgid "" "%s: Found separate debug info file: %s\n" "\n" msgstr "" -#: dwarf.c:11224 +#: dwarf.c:11275 msgid "Out of memory allocating dwo filename\n" msgstr "" -#: dwarf.c:11230 +#: dwarf.c:11281 #, c-format msgid "Unable to load dwo file: %s\n" msgstr "" #. FIXME: We should check the dwo_id. -#: dwarf.c:11237 +#: dwarf.c:11288 #, c-format msgid "" "%s: Found separate debug object file: %s\n" "\n" msgstr "" -#: dwarf.c:11430 +#: dwarf.c:11590 #, c-format msgid "" "The %s section contains link(s) to dwo file(s):\n" "\n" msgstr "" -#: dwarf.c:11435 +#: dwarf.c:11595 #, c-format msgid " Name: %s\n" msgstr "" -#: dwarf.c:11436 +#: dwarf.c:11596 #, c-format msgid " Directory: %s\n" msgstr "" -#: dwarf.c:11436 +#: dwarf.c:11596 msgid "" msgstr "" -#: dwarf.c:11438 +#: dwarf.c:11598 #, c-format msgid " ID: " msgstr "" -#: dwarf.c:9876 +#: dwarf.c:10484 #, c-format msgid " ID: \n" msgstr "" -#: dwarf.c:11415 +#: dwarf.c:11575 msgid "Unexpected DWO INFO type" msgstr "" -#: dwarf.c:11604 dwarf.c:11648 +#: dwarf.c:11764 dwarf.c:11808 #, c-format msgid "Unrecognized debug option '%s'\n" msgstr "Neprepoznata opcija debugiranja „%s”\n" @@ -4098,7 +4098,7 @@ #. PR 24049 - we cannot use filedata->file_name as this will #. have already been freed. -#: elfcomm.c:519 elfcomm.c:753 elfedit.c:595 readelf.c:21730 +#: elfcomm.c:519 elfcomm.c:753 elfedit.c:613 readelf.c:22187 #, c-format msgid "%s: failed to read archive header\n" msgstr "%s: nisam uspio pročitati zaglavlje arhive\n" @@ -4145,72 +4145,72 @@ msgid "%s: failed to seek to next file name\n" msgstr "" -#: elfcomm.c:758 elfedit.c:602 readelf.c:21737 +#: elfcomm.c:758 elfedit.c:620 readelf.c:22194 #, c-format msgid "%s: did not find a valid archive header\n" msgstr "%s: nisam pronašao ispravno zaglavlje arhive\n" -#: elfedit.c:91 +#: elfedit.c:93 #, c-format msgid "%s: Not an i386 nor x86-64 ELF file\n" msgstr "" -#: elfedit.c:97 +#: elfedit.c:99 #, c-format msgid "%s: stat () failed\n" msgstr "" -#: elfedit.c:105 +#: elfedit.c:107 #, c-format msgid "%s: mmap () failed\n" msgstr "" -#: elfedit.c:244 +#: elfedit.c:246 #, c-format msgid "%s: Invalid PT_NOTE segment\n" msgstr "" -#: elfedit.c:269 +#: elfedit.c:271 #, c-format msgid "Unknown x86 feature: %s\n" msgstr "" -#: elfedit.c:317 +#: elfedit.c:319 #, c-format msgid "%s: Unsupported EI_VERSION: %d is not %d\n" msgstr "%s: Nepodržana EI_VERSION: %d nije %d\n" -#: elfedit.c:338 +#: elfedit.c:340 #, c-format msgid "%s: Unmatched input EI_CLASS: %d is not %d\n" msgstr "" -#: elfedit.c:347 +#: elfedit.c:349 #, c-format msgid "%s: Unmatched output EI_CLASS: %d is not %d\n" msgstr "" -#: elfedit.c:356 +#: elfedit.c:358 #, c-format msgid "%s: Unmatched e_machine: %d is not %d\n" msgstr "%s: Neodgovarajuća e_machine: %d nije %d\n" -#: elfedit.c:367 +#: elfedit.c:369 #, c-format msgid "%s: Unmatched e_type: %d is not %d\n" msgstr "%s: Neodgovarajuća e_type: %d nije %d\n" -#: elfedit.c:378 +#: elfedit.c:380 #, c-format msgid "%s: Unmatched EI_OSABI: %d is not %d\n" msgstr "%s: Neodgovarajuća EI_OSABI: %d nije %d\n" -#: elfedit.c:411 +#: elfedit.c:429 #, c-format msgid "%s: Failed to update ELF header: %s\n" msgstr "%s: Nisam uspio ažurirati ELF zaglavlje: %s\n" -#: elfedit.c:481 +#: elfedit.c:499 msgid "" "This executable has been built without support for a\n" "64 bit data type and so it cannot process 64 bit ELF files.\n" @@ -4218,82 +4218,82 @@ "Ova izvršna datoteka je izgrađena bez podrške za 64-bitne\n" "vrste podataka i ne može obraditi 64-bitne ELF datoteke.\n" -#: elfedit.c:522 +#: elfedit.c:540 #, c-format msgid "%s: Failed to read ELF header\n" msgstr "%s: Nisam uspio pročitati ELF zaglavlje\n" -#: elfedit.c:529 +#: elfedit.c:547 #, c-format msgid "%s: Failed to seek to ELF header\n" msgstr "" -#: elfedit.c:586 readelf.c:21718 +#: elfedit.c:604 readelf.c:22175 #, c-format msgid "%s: failed to seek to next archive header\n" msgstr "" -#: elfedit.c:617 elfedit.c:626 readelf.c:21752 readelf.c:21761 +#: elfedit.c:635 elfedit.c:644 readelf.c:22207 readelf.c:22216 #, c-format msgid "%s: bad archive file name\n" msgstr "%s: neispravno ime arhive\n" -#: elfedit.c:649 elfedit.c:760 +#: elfedit.c:667 elfedit.c:778 #, c-format msgid "Input file '%s' is not readable\n" msgstr "Ulazna datoteka „%s” nije čitljiva\n" -#: elfedit.c:676 +#: elfedit.c:694 #, c-format msgid "%s: failed to seek to archive member\n" msgstr "" -#: elfedit.c:717 readelf.c:21880 +#: elfedit.c:735 readelf.c:22335 #, c-format msgid "'%s': No such file\n" msgstr "„%s”: Nema takve datoteke\n" -#: elfedit.c:719 readelf.c:21882 +#: elfedit.c:737 readelf.c:22337 #, c-format msgid "Could not locate '%s'. System error message: %s\n" msgstr "Ne mogu pronaći „%s”. Poruka greške sustava: %s\n" -#: elfedit.c:740 readelf.c:21889 +#: elfedit.c:758 readelf.c:22344 #, c-format msgid "'%s' is not an ordinary file\n" msgstr "„%s” nije obična datoteka\n" -#: elfedit.c:766 readelf.c:21911 +#: elfedit.c:784 readelf.c:22366 #, c-format msgid "%s: Failed to read file's magic number\n" msgstr "" -#: elfedit.c:830 +#: elfedit.c:848 #, c-format msgid "Unknown OSABI: %s\n" msgstr "Nepoznati OSABI: %s\n" -#: elfedit.c:855 +#: elfedit.c:873 #, c-format msgid "Unknown machine type: %s\n" msgstr "Nepoznata vrsta stroja: %s\n" -#: elfedit.c:874 +#: elfedit.c:892 #, c-format msgid "Unknown type: %s\n" msgstr "Nepoznata vrsta: %s\n" -#: elfedit.c:921 +#: elfedit.c:943 #, c-format msgid "Usage: %s elffile(s)\n" msgstr "Uporaba: %s elfdatoteke\n" -#: elfedit.c:923 +#: elfedit.c:945 #, c-format msgid " Update the ELF header of ELF files\n" msgstr " Ažuriraj ELF zaglavlje ELF datoteka\n" -#: elfedit.c:924 objcopy.c:565 objcopy.c:706 strings.c:679 +#: elfedit.c:946 nm.c:295 objcopy.c:565 objcopy.c:706 strings.c:1314 #, c-format msgid " The options are:\n" msgstr " Opcije su:\n" @@ -4318,7 +4318,7 @@ " Disable x86 feature \n" msgstr "" -#: elfedit.c:946 +#: elfedit.c:970 #, c-format msgid "" " -h --help Display this information\n" @@ -4345,16 +4345,16 @@ msgid " [-X32_64] - accepts 32 and 64 bit objects\n" msgstr "" -#: mclex.c:240 +#: mclex.c:245 msgid "Duplicate symbol entered into keyword list." msgstr "" -#: nm.c:274 size.c:88 strings.c:677 +#: nm.c:293 size.c:88 strings.c:1312 #, c-format msgid "Usage: %s [option(s)] [file(s)]\n" msgstr "Uporaba: %s [opcije] [datoteke]\n" -#: nm.c:275 +#: nm.c:294 #, c-format msgid " List symbols in [file(s)] (a.out by default).\n" msgstr " Ispiši simbole u [datotekama] (zadano a.out).\n" @@ -4393,12 +4393,12 @@ " -r, --reverse-sort Reverse the sense of the sort\n" msgstr "" -#: nm.c:303 +#: nm.c:342 #, c-format msgid " --plugin NAME Load the specified plugin\n" msgstr "" -#: nm.c:279 +#: nm.c:269 #, c-format msgid "" " -S, --print-size Print size of defined symbols\n" @@ -4417,37 +4417,37 @@ "\n" msgstr "" -#: nm.c:340 +#: nm.c:395 #, c-format msgid "%s: invalid radix" msgstr "%s: neispravna baza" -#: nm.c:370 +#: nm.c:425 #, c-format msgid "%s: invalid output format" msgstr "%s: neispravan izlazni oblik" -#: nm.c:395 readelf.c:12090 readelf.c:12133 +#: nm.c:450 readelf.c:12440 readelf.c:12483 #, c-format msgid ": %d" msgstr "" -#: nm.c:397 readelf.c:12097 readelf.c:12150 +#: nm.c:452 readelf.c:12447 readelf.c:12500 #, c-format msgid ": %d" msgstr "" -#: nm.c:399 readelf.c:12100 readelf.c:12153 +#: nm.c:454 readelf.c:12450 readelf.c:12503 #, c-format msgid ": %d" msgstr ": %d" -#: nm.c:429 +#: nm.c:484 #, c-format msgid ": %d/%d" msgstr "" -#: nm.c:499 +#: nm.c:742 #, c-format msgid "" "\n" @@ -4456,12 +4456,12 @@ "\n" "Indeks arhive:\n" -#: nm.c:553 nm.c:1250 +#: nm.c:797 nm.c:1494 #, c-format msgid "%s: plugin needed to handle lto object" msgstr "" -#: nm.c:1487 +#: nm.c:1731 #, c-format msgid "" "\n" @@ -4474,7 +4474,7 @@ "Nedefinirani simboli iz %s:\n" "\n" -#: nm.c:1489 +#: nm.c:1733 #, c-format msgid "" "\n" @@ -4487,7 +4487,7 @@ "Simboli iz %s:\n" "\n" -#: nm.c:1491 nm.c:1552 +#: nm.c:1735 nm.c:1796 #, c-format msgid "" "Name Value Class Type Size Line " @@ -4495,7 +4495,7 @@ "\n" msgstr "" -#: nm.c:1494 nm.c:1555 +#: nm.c:1738 nm.c:1799 #, c-format msgid "" "Name Value Class Type Size " @@ -4503,7 +4503,7 @@ "\n" msgstr "" -#: nm.c:1548 +#: nm.c:1792 #, c-format msgid "" "\n" @@ -4516,7 +4516,7 @@ "Nedefinirani simboli iz %s[%s]:\n" "\n" -#: nm.c:1550 +#: nm.c:1794 #, c-format msgid "" "\n" @@ -4529,20 +4529,20 @@ "Simboli iz %s[%s]:\n" "\n" -#: nm.c:1656 +#: nm.c:1900 #, c-format msgid "Print width has not been initialized (%d)" msgstr "" -#: nm.c:1915 +#: nm.c:2177 msgid "Only -X 32_64 is supported" msgstr "Podržano je samo -X 32_64" -#: nm.c:1947 +#: nm.c:2209 msgid "Using the --size-sort and --undefined-only options together" msgstr "" -#: nm.c:1948 +#: nm.c:2210 msgid "will produce no output, since undefined symbols have no size." msgstr "" @@ -4591,7 +4591,7 @@ " Disable -D behavior (default)\n" msgstr "" -#: objcopy.c:581 +#: objcopy.c:580 #, c-format msgid "" " -j --only-section Only copy section into the output\n" @@ -4762,7 +4762,7 @@ "output\n" msgstr "" -#: objcopy.c:720 +#: objcopy.c:719 #, c-format msgid "" " -R --remove-section= Also remove section from the " @@ -4829,7 +4829,7 @@ msgid "cannot open '%s': %s" msgstr "" -#: objcopy.c:1094 objcopy.c:5055 +#: objcopy.c:1094 objcopy.c:5091 #, c-format msgid "%s: fread failed" msgstr "" @@ -4854,511 +4854,511 @@ msgid "Section %s not found" msgstr "" -#: objcopy.c:1654 +#: objcopy.c:1662 #, c-format msgid "not stripping symbol `%s' because it is named in a relocation" msgstr "" -#: objcopy.c:1715 +#: objcopy.c:1723 #, c-format msgid "'before=%s' not found" msgstr "" -#: objcopy.c:1754 +#: objcopy.c:1762 #, c-format msgid "%s: Multiple redefinition of symbol \"%s\"" msgstr "" -#: objcopy.c:1758 +#: objcopy.c:1766 #, c-format msgid "%s: Symbol \"%s\" is target of more than one redefinition" msgstr "" -#: objcopy.c:1785 +#: objcopy.c:1793 #, c-format msgid "couldn't open symbol redefinition file %s (error: %s)" msgstr "" -#: objcopy.c:1863 +#: objcopy.c:1871 #, c-format msgid "%s:%d: garbage found at end of line" msgstr "" -#: objcopy.c:1866 +#: objcopy.c:1874 #, c-format msgid "%s:%d: missing new symbol name" msgstr "" -#: objcopy.c:1876 +#: objcopy.c:1884 #, c-format msgid "%s:%d: premature end of file" msgstr "" -#: objcopy.c:1903 +#: objcopy.c:1910 #, c-format msgid "stat returns negative size for `%s'" msgstr "" -#: objcopy.c:1915 +#: objcopy.c:1922 #, c-format msgid "copy from `%s' [unknown] to `%s' [unknown]\n" msgstr "" -#: objcopy.c:2162 +#: objcopy.c:2167 #, c-format msgid "%s[%s]: Cannot merge - there are relocations against this section" msgstr "" -#: objcopy.c:2184 +#: objcopy.c:2189 msgid "corrupt GNU build attribute note: description size not a factor of 4" msgstr "" -#: objcopy.c:2191 +#: objcopy.c:2196 msgid "corrupt GNU build attribute note: wrong note type" msgstr "" -#: objcopy.c:2197 +#: objcopy.c:2202 msgid "corrupt GNU build attribute note: note too big" msgstr "" -#: objcopy.c:2203 +#: objcopy.c:2208 msgid "corrupt GNU build attribute note: name too small" msgstr "" -#: objcopy.c:2226 +#: objcopy.c:2231 msgid "corrupt GNU build attribute note: unsupported version" msgstr "" -#: objcopy.c:2260 +#: objcopy.c:2265 msgid "corrupt GNU build attribute note: bad description size" msgstr "" -#: objcopy.c:2296 +#: objcopy.c:2301 msgid "corrupt GNU build attribute note: name not NUL terminated" msgstr "" -#: objcopy.c:2308 +#: objcopy.c:2313 msgid "corrupt GNU build attribute notes: excess data at end" msgstr "" -#: objcopy.c:2315 +#: objcopy.c:2320 msgid "bad GNU build attribute notes: no known versions detected" msgstr "" #. This happens with glibc. No idea why. -#: objcopy.c:2319 +#: objcopy.c:2324 #, c-format msgid "%s[%s]: Warning: version note missing - assuming version 3" msgstr "" -#: objcopy.c:2329 +#: objcopy.c:2334 msgid "bad GNU build attribute notes: multiple different versions" msgstr "" #. PR 17636: Call non-fatal so that we return to our parent who #. may need to tidy temporary files. -#: objcopy.c:2428 +#: objcopy.c:2583 msgid "Unable to change endianness of input file(s)" msgstr "" -#: objcopy.c:2621 +#: objcopy.c:2626 #, c-format msgid "error: the input file '%s' has no sections" msgstr "" -#: objcopy.c:2631 +#: objcopy.c:2636 #, c-format msgid "" "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'" msgstr "" -#: objcopy.c:2638 +#: objcopy.c:2643 #, c-format msgid "--elf-stt-common=[yes|no] is unsupported on `%s'" msgstr "" -#: objcopy.c:2645 +#: objcopy.c:2650 #, c-format msgid "copy from `%s' [%s] to `%s' [%s]\n" msgstr "" -#: objcopy.c:2693 +#: objcopy.c:2698 #, c-format msgid "Input file `%s' ignores binary architecture parameter." msgstr "" -#: objcopy.c:2709 +#: objcopy.c:2714 #, c-format msgid "Unable to recognise the format of the input file `%s'" msgstr "" -#: objcopy.c:2712 +#: objcopy.c:2717 #, c-format msgid "Output file cannot represent architecture `%s'" msgstr "" -#: objcopy.c:2775 +#: objcopy.c:2780 #, c-format msgid "warning: file alignment (0x%s) > section alignment (0x%s)" msgstr "" -#: objcopy.c:2848 +#: objcopy.c:2853 #, c-format msgid "can't add section '%s'" msgstr "" -#: objcopy.c:2862 +#: objcopy.c:2867 #, c-format msgid "can't create section `%s'" msgstr "" -#: objcopy.c:2910 +#: objcopy.c:2915 #, c-format msgid "error: %s not found, can't be updated" msgstr "" -#: objcopy.c:2943 +#: objcopy.c:2948 msgid "warning: note section is empty" msgstr "" -#: objcopy.c:2952 +#: objcopy.c:2957 msgid "warning: could not load note section" msgstr "" -#: objcopy.c:2968 +#: objcopy.c:2973 msgid "warning: failed to set merged notes size" msgstr "" -#: objcopy.c:2994 +#: objcopy.c:2999 #, c-format msgid "can't dump section '%s' - it does not exist" msgstr "" -#: objcopy.c:3002 +#: objcopy.c:3007 msgid "can't dump section - it has no contents" msgstr "" -#: objcopy.c:2804 +#: objcopy.c:2974 msgid "can't dump section - it is empty" msgstr "" -#: objcopy.c:3014 +#: objcopy.c:3019 msgid "could not open section dump file" msgstr "" -#: objcopy.c:3022 +#: objcopy.c:3027 #, c-format msgid "error writing section contents to %s (error: %s)" msgstr "" -#: objcopy.c:3032 +#: objcopy.c:3037 msgid "could not retrieve section contents" msgstr "" -#: objcopy.c:3046 +#: objcopy.c:3051 #, c-format msgid "%s: debuglink section already exists" msgstr "" -#: objcopy.c:3058 +#: objcopy.c:3063 #, c-format msgid "cannot create debug link section `%s'" msgstr "" -#: objcopy.c:3152 +#: objcopy.c:3157 msgid "Can't fill gap after section" msgstr "" -#: objcopy.c:3177 +#: objcopy.c:3182 msgid "can't add padding" msgstr "" -#: objcopy.c:3354 +#: objcopy.c:3359 msgid "error: failed to locate merged notes" msgstr "" -#: objcopy.c:3363 +#: objcopy.c:3368 msgid "error: failed to merge notes" msgstr "" -#: objcopy.c:3372 +#: objcopy.c:3377 msgid "error: failed to copy merged notes into output" msgstr "" -#: objcopy.c:3389 +#: objcopy.c:3394 #, c-format msgid "%s: Could not find any mergeable note sections" msgstr "" -#: objcopy.c:3398 +#: objcopy.c:3403 #, c-format msgid "cannot fill debug link section `%s'" msgstr "" -#: objcopy.c:3459 +#: objcopy.c:3464 msgid "error copying private BFD data" msgstr "" -#: objcopy.c:3470 +#: objcopy.c:3475 #, c-format msgid "this target does not support %lu alternative machine codes" msgstr "" -#: objcopy.c:3474 +#: objcopy.c:3479 msgid "treating that number as an absolute e_machine value instead" msgstr "" -#: objcopy.c:3478 +#: objcopy.c:3483 msgid "ignoring the alternative value" msgstr "" -#: objcopy.c:3524 +#: objcopy.c:3529 msgid "sorry: copying thin archives is not currently supported" msgstr "" -#: objcopy.c:3531 objcopy.c:3586 +#: objcopy.c:3536 objcopy.c:3591 #, c-format msgid "cannot create tempdir for archive copying (error: %s)" msgstr "" -#: objcopy.c:3568 +#: objcopy.c:3573 #, c-format msgid "illegal pathname found in archive member: %s" msgstr "" -#: objcopy.c:3619 +#: objcopy.c:3625 msgid "Unable to recognise the format of file" msgstr "" -#: objcopy.c:3752 +#: objcopy.c:3758 #, c-format msgid "error: the input file '%s' is empty" msgstr "" -#: objcopy.c:3830 +#: objcopy.c:3836 #, c-format msgid "--add-gnu-debuglink ignored for archive %s" msgstr "" -#: objcopy.c:3939 +#: objcopy.c:3945 #, c-format msgid "Multiple renames of section %s" msgstr "" -#: objcopy.c:3985 +#: objcopy.c:3991 msgid "error in private header data" msgstr "" -#: objcopy.c:4078 +#: objcopy.c:4084 msgid "failed to create output section" msgstr "" -#: objcopy.c:4093 +#: objcopy.c:4096 msgid "failed to set size" msgstr "" -#: objcopy.c:4112 +#: objcopy.c:4115 msgid "failed to set vma" msgstr "" -#: objcopy.c:4142 +#: objcopy.c:4145 msgid "failed to set alignment" msgstr "" -#: objcopy.c:4174 +#: objcopy.c:4177 msgid "failed to copy private data" msgstr "" -#: objcopy.c:4331 +#: objcopy.c:4337 msgid "relocation count is negative" msgstr "" #. User must pad the section up in order to do this. -#: objcopy.c:4430 +#: objcopy.c:4436 #, c-format msgid "" "cannot reverse bytes: length of section %s must be evenly divisible by %d" msgstr "" -#: objcopy.c:4638 +#: objcopy.c:4644 msgid "can't create debugging section" msgstr "" -#: objcopy.c:4652 +#: objcopy.c:4658 msgid "can't set debugging section contents" msgstr "" -#: objcopy.c:4661 +#: objcopy.c:4667 #, c-format msgid "don't know how to write debugging information for %s" msgstr "" -#: objcopy.c:4850 +#: objcopy.c:4856 msgid "could not create temporary file to hold stripped copy" msgstr "" -#: objcopy.c:4924 +#: objcopy.c:4930 #, c-format msgid "%s: bad version in PE subsystem" msgstr "" -#: objcopy.c:4954 +#: objcopy.c:4960 #, c-format msgid "unknown PE subsystem: %s" msgstr "" -#: objcopy.c:5008 objcopy.c:5280 objcopy.c:5360 objcopy.c:5501 objcopy.c:5533 -#: objcopy.c:5596 objcopy.c:5600 objcopy.c:5620 +#: objcopy.c:5044 objcopy.c:5316 objcopy.c:5396 objcopy.c:5537 objcopy.c:5569 +#: objcopy.c:5632 objcopy.c:5636 objcopy.c:5656 #, c-format msgid "bad format for %s" msgstr "" -#: objcopy.c:5037 +#: objcopy.c:5073 #, c-format msgid "cannot open: %s: %s" msgstr "" -#: objcopy.c:5092 +#: objcopy.c:5128 msgid "byte number must be non-negative" msgstr "" -#: objcopy.c:5098 +#: objcopy.c:5134 #, c-format msgid "architecture %s unknown" msgstr "" -#: objcopy.c:5106 +#: objcopy.c:5142 msgid "interleave must be positive" msgstr "" -#: objcopy.c:5115 +#: objcopy.c:5151 msgid "interleave width must be positive" msgstr "" -#: objcopy.c:5433 +#: objcopy.c:5469 #, c-format msgid "unrecognized --compress-debug-sections type `%s'" msgstr "" -#: objcopy.c:5454 +#: objcopy.c:5490 #, c-format msgid "unrecognized --elf-stt-common= option `%s'" msgstr "" -#: objcopy.c:5470 +#: objcopy.c:5506 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "" -#: objcopy.c:5556 +#: objcopy.c:5592 msgid "bad format for --set-section-alignment: argument needed" msgstr "" -#: objcopy.c:5560 +#: objcopy.c:5596 msgid "bad format for --set-section-alignment: numeric argument needed" msgstr "" #. Number has more than on 1, i.e. wasn't a power of 2. -#: objcopy.c:5572 +#: objcopy.c:5608 msgid "" "bad format for --set-section-alignment: alignment is not a power of two" msgstr "" -#: objcopy.c:5679 +#: objcopy.c:5715 #, c-format msgid "unknown long section names option '%s'" msgstr "" -#: objcopy.c:5702 +#: objcopy.c:5738 msgid "unable to parse alternative machine code" msgstr "" -#: objcopy.c:5751 +#: objcopy.c:5787 msgid "number of bytes to reverse must be positive and even" msgstr "" -#: objcopy.c:5754 +#: objcopy.c:5790 #, c-format msgid "Warning: ignoring previous --reverse-bytes value of %d" msgstr "" -#: objcopy.c:5769 +#: objcopy.c:5805 #, c-format msgid "%s: invalid reserve value for --heap" msgstr "" -#: objcopy.c:5775 +#: objcopy.c:5811 #, c-format msgid "%s: invalid commit value for --heap" msgstr "" -#: objcopy.c:5800 +#: objcopy.c:5836 #, c-format msgid "%s: invalid reserve value for --stack" msgstr "" -#: objcopy.c:5806 +#: objcopy.c:5842 #, c-format msgid "%s: invalid commit value for --stack" msgstr "" -#: objcopy.c:5815 +#: objcopy.c:5851 msgid "verilog data width must be at least 1 byte" msgstr "" -#: objcopy.c:5832 +#: objcopy.c:5868 msgid "--globalize-symbol(s) is incompatible with -G/--keep-global-symbol(s)" msgstr "" -#: objcopy.c:5844 +#: objcopy.c:5880 msgid "interleave start byte must be set with --byte" msgstr "" -#: objcopy.c:5847 +#: objcopy.c:5883 msgid "byte number must be less than interleave" msgstr "" -#: objcopy.c:5850 +#: objcopy.c:5886 msgid "interleave width must be less than or equal to interleave - byte`" msgstr "" -#: objcopy.c:5879 +#: objcopy.c:5909 #, c-format msgid "unknown input EFI target: %s" msgstr "" -#: objcopy.c:5910 +#: objcopy.c:5919 #, c-format msgid "unknown output EFI target: %s" msgstr "" -#: objcopy.c:5463 +#: objcopy.c:5835 #, c-format msgid "warning: could not locate '%s'. System error message: %s" msgstr "" -#: objcopy.c:5936 +#: objcopy.c:5943 #, c-format msgid "" "warning: could not create temporary file whilst copying '%s', (error: %s)" msgstr "" -#: objcopy.c:5973 objcopy.c:5987 +#: objcopy.c:5980 objcopy.c:5994 #, c-format msgid "%s %s%c0x%s never used" msgstr "" -#: objdump.c:212 +#: objdump.c:225 #, c-format msgid "Usage: %s \n" msgstr "" -#: objdump.c:213 +#: objdump.c:226 #, c-format msgid " Display information from object .\n" msgstr "" -#: objdump.c:214 +#: objdump.c:227 #, c-format msgid " At least one of the following switches must be given:\n" msgstr "" @@ -5404,7 +5404,7 @@ " -H, --help Display this information\n" msgstr "" -#: objdump.c:299 +#: objdump.c:312 #, c-format msgid "" "\n" @@ -5476,264 +5476,264 @@ "\n" msgstr "" -#: objdump.c:384 +#: objdump.c:399 #, c-format msgid "" "\n" "Options supported for -P/--private switch:\n" msgstr "" -#: objdump.c:621 +#: objdump.c:759 #, c-format msgid "" "section '%s' mentioned in a -j option, but not found in any input file" msgstr "" -#: objdump.c:776 +#: objdump.c:914 #, c-format msgid "Sections:\n" msgstr "" -#: objdump.c:782 +#: objdump.c:920 #, c-format msgid "Idx %-*s Size %-*s%-*sFile off Algn" msgstr "" -#: objdump.c:788 +#: objdump.c:926 #, c-format msgid " Flags" msgstr "" -#: objdump.c:810 +#: objdump.c:948 #, c-format msgid "failed to read symbol table from: %s" msgstr "" -#: objdump.c:811 objdump.c:4753 +#: objdump.c:949 objdump.c:4907 msgid "error message was" msgstr "" -#: objdump.c:826 +#: objdump.c:964 #, c-format msgid "error: symbol table size (%#lx) is larger than filesize (%#lx)" msgstr "" -#: objdump.c:856 +#: objdump.c:994 #, c-format msgid "%s: not a dynamic object" msgstr "" -#: objdump.c:1455 objdump.c:1482 +#: objdump.c:1593 objdump.c:1620 #, c-format msgid " (File Offset: 0x%lx)" msgstr "" -#: objdump.c:1727 +#: objdump.c:1865 #, c-format msgid "source file %s is more recent than object file\n" msgstr "" -#: objdump.c:2887 +#: objdump.c:3025 #, c-format msgid "disassemble_fn returned length %d" msgstr "" -#: objdump.c:3215 objdump.c:4391 +#: objdump.c:3353 objdump.c:4527 #, c-format msgid "Reading section %s failed because: %s" msgstr "" -#: objdump.c:3236 +#: objdump.c:3374 #, c-format msgid "" "\n" "Disassembly of section %s:\n" msgstr "" -#: objdump.c:3527 +#: objdump.c:3665 #, c-format msgid "can't use supplied machine %s" msgstr "" -#: objdump.c:3548 +#: objdump.c:3686 #, c-format msgid "can't disassemble for architecture %s\n" msgstr "" -#: objdump.c:3637 +#: objdump.c:3775 #, c-format msgid "" "\n" "Section '%s' has an invalid size: %#llx.\n" msgstr "" -#: objdump.c:3682 +#: objdump.c:3820 #, c-format msgid "" "\n" "Can't get contents for section '%s'.\n" msgstr "" -#: objdump.c:3844 +#: objdump.c:3999 #, c-format msgid "File %s does not contain any dwarf debug information\n" msgstr "" -#: objdump.c:3881 +#: objdump.c:4036 #, c-format msgid "" "No %s section present\n" "\n" msgstr "" -#: objdump.c:3888 +#: objdump.c:4043 #, c-format msgid "reading %s section of %s failed: %s" msgstr "" -#: objdump.c:3934 +#: objdump.c:4089 #, c-format msgid "" "Contents of %s section:\n" "\n" msgstr "" -#: objdump.c:4068 +#: objdump.c:4223 #, c-format msgid "architecture: %s, " msgstr "" -#: objdump.c:4071 +#: objdump.c:4226 #, c-format msgid "flags 0x%08x:\n" msgstr "" -#: objdump.c:4084 +#: objdump.c:4239 #, c-format msgid "" "\n" "start address 0x" msgstr "" -#: objdump.c:4167 readelf.c:15125 +#: objdump.c:4319 readelf.c:15505 #, c-format msgid "" "\n" "CTF archive member: %s:\n" msgstr "" -#: readelf.c:15144 +#: readelf.c:15525 #, c-format msgid "Iteration failed: %s, %s\n" msgstr "" -#: readelf.c:15242 readelf.c:15255 readelf.c:15269 +#: readelf.c:15605 readelf.c:15617 #, c-format msgid "CTF open failure: %s\n" msgstr "" -#: objdump.c:4252 +#: objdump.c:4388 #, c-format msgid "Contents of CTF section %s:\n" msgstr "" -#: objdump.c:4277 +#: objdump.c:4413 #, c-format msgid "warning: private headers incomplete: %s" msgstr "" -#: objdump.c:4295 +#: objdump.c:4431 msgid "option -P/--private not supported by this file" msgstr "" -#: objdump.c:4319 +#: objdump.c:4455 #, c-format msgid "target specific dump '%s' not supported" msgstr "" -#: objdump.c:4383 +#: objdump.c:4519 #, c-format msgid "Contents of section %s:" msgstr "" -#: objdump.c:4385 +#: objdump.c:4521 #, c-format msgid " (Starting at file offset: 0x%lx)" msgstr "" -#: objdump.c:4495 +#: objdump.c:4631 #, c-format msgid "no symbols\n" msgstr "" -#: objdump.c:4502 +#: objdump.c:4638 #, c-format msgid "no information for symbol number %ld\n" msgstr "" -#: objdump.c:4505 +#: objdump.c:4641 #, c-format msgid "could not determine the type of symbol number %ld\n" msgstr "" -#: objdump.c:4751 +#: objdump.c:4905 #, c-format msgid "failed to read relocs in: %s" msgstr "" -#: objdump.c:4911 +#: objdump.c:5064 #, c-format msgid "" "\n" "%s: file format %s\n" msgstr "" -#: objdump.c:5011 +#: objdump.c:5172 #, c-format msgid "%s: printing debugging information failed" msgstr "" -#: objdump.c:5107 +#: objdump.c:5268 #, c-format msgid "In archive %s:\n" msgstr "" #. Prevent corrupted files from spinning us into an #. infinite loop. 100 is an arbitrary heuristic. -#: objdump.c:5112 +#: objdump.c:5273 msgid "Archive nesting is too deep" msgstr "" -#: objdump.c:5116 +#: objdump.c:5277 #, c-format msgid "In nested archive %s:\n" msgstr "" -#: objdump.c:5279 +#: objdump.c:5440 msgid "error: the start address should be before the end address" msgstr "" -#: objdump.c:5284 +#: objdump.c:5445 msgid "error: the stop address should be after the start address" msgstr "" -#: objdump.c:5296 +#: objdump.c:5457 msgid "error: prefix strip must be non-negative" msgstr "" -#: objdump.c:5301 +#: objdump.c:5462 msgid "error: instruction width must be positive" msgstr "" -#: objdump.c:5322 +#: objdump.c:5483 msgid "unrecognized argument to --visualize-option" msgstr "" -#: objdump.c:5332 +#: objdump.c:5493 msgid "unrecognized -E option" msgstr "" -#: objdump.c:5343 +#: objdump.c:5504 #, c-format msgid "unrecognized --endian type `%s'" msgstr "" @@ -6010,7 +6010,7 @@ msgid " time and date: 0x%08x - " msgstr "" -#: od-xcoff.c:421 readelf.c:19706 +#: od-xcoff.c:421 readelf.c:20126 #, c-format msgid "not set\n" msgstr "" @@ -6473,296 +6473,297 @@ msgid "Last stabs entries before error:\n" msgstr "" -#: readelf.c:354 +#: readelf.c:385 msgid "" msgstr "" -#: readelf.c:355 +#: readelf.c:387 msgid "" msgstr "" -#: readelf.c:437 +#: readelf.c:482 #, c-format msgid "Size truncation prevents reading %s elements of size %s for %s\n" msgstr "" -#: readelf.c:447 +#: readelf.c:492 #, c-format msgid "Size overflow prevents reading %s elements of size %s for %s\n" msgstr "" -#: readelf.c:460 +#: readelf.c:505 #, c-format msgid "Reading %s bytes extends past end of file for %s\n" msgstr "" -#: readelf.c:469 +#: readelf.c:514 #, c-format msgid "Unable to seek to 0x%lx for %s\n" msgstr "" -#: readelf.c:483 +#: readelf.c:528 #, c-format msgid "Out of memory allocating %s bytes for %s\n" msgstr "" -#: readelf.c:494 +#: readelf.c:539 #, c-format msgid "Unable to read in %s bytes of %s\n" msgstr "" -#: readelf.c:971 +#: readelf.c:1151 msgid "Don't know about relocations on this machine architecture\n" msgstr "" -#: readelf.c:998 readelf.c:1103 +#: readelf.c:1178 readelf.c:1283 msgid "32-bit relocation data" msgstr "" -#: readelf.c:1010 readelf.c:1040 readelf.c:1114 readelf.c:1143 +#: readelf.c:1190 readelf.c:1220 readelf.c:1294 readelf.c:1323 readelf.c:1402 msgid "out of memory parsing relocs\n" msgstr "" -#: readelf.c:1028 readelf.c:1132 +#: readelf.c:1208 readelf.c:1312 msgid "64-bit relocation data" msgstr "" -#: readelf.c:1262 +#: readelf.c:1528 #, c-format msgid "" " Offset Info Type Sym. Value Symbol's Name + Addend\n" msgstr "" -#: readelf.c:1264 +#: readelf.c:1530 #, c-format msgid " Offset Info Type Sym.Value Sym. Name + Addend\n" msgstr "" -#: readelf.c:1269 +#: readelf.c:1535 #, c-format msgid " Offset Info Type Sym. Value Symbol's Name\n" msgstr "" -#: readelf.c:1271 +#: readelf.c:1537 #, c-format msgid " Offset Info Type Sym.Value Sym. Name\n" msgstr "" -#: readelf.c:1279 +#: readelf.c:1545 #, c-format msgid "" " Offset Info Type Symbol's Value " "Symbol's Name + Addend\n" msgstr "" -#: readelf.c:1281 +#: readelf.c:1547 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name + " "Addend\n" msgstr "" -#: readelf.c:1286 +#: readelf.c:1552 #, c-format msgid "" " Offset Info Type Symbol's Value " "Symbol's Name\n" msgstr "" -#: readelf.c:1288 +#: readelf.c:1554 #, c-format msgid "" " Offset Info Type Sym. Value Sym. Name\n" msgstr "" -#: readelf.c:1659 readelf.c:1852 readelf.c:1860 +#: readelf.c:1930 readelf.c:2125 readelf.c:2133 #, c-format msgid "unrecognized: %-7lx" msgstr "" -#: readelf.c:1685 +#: readelf.c:1956 #, c-format msgid "" msgstr "" -#: readelf.c:1590 +#: readelf.c:1632 #, c-format msgid " bad symbol index: %08lx in reloc" msgstr "" -#: readelf.c:1797 +#: readelf.c:2070 #, c-format msgid "" msgstr "" -#: readelf.c:1694 +#: readelf.c:1736 #, c-format msgid "" msgstr "" -#: readelf.c:2305 +#: readelf.c:2595 #, c-format msgid "Processor Specific: %lx" msgstr "" -#: readelf.c:2332 +#: readelf.c:2622 #, c-format msgid "Operating System specific: %lx" msgstr "" -#: readelf.c:2336 readelf.c:4246 +#: readelf.c:2626 readelf.c:4563 #, c-format msgid ": %lx" msgstr "" -#: readelf.c:2436 +#: readelf.c:2726 msgid "NONE (None)" msgstr "" -#: readelf.c:2437 +#: readelf.c:2727 msgid "REL (Relocatable file)" msgstr "" -#: readelf.c:2438 +#: readelf.c:2728 msgid "EXEC (Executable file)" msgstr "" -#: readelf.c:2443 +#: readelf.c:2733 msgid "DYN (Shared object file)" msgstr "" -#: readelf.c:2444 +#: readelf.c:2734 msgid "CORE (Core file)" msgstr "" -#: readelf.c:2448 +#: readelf.c:2738 #, c-format msgid "Processor Specific: (%x)" msgstr "" -#: readelf.c:2450 +#: readelf.c:2740 #, c-format msgid "OS Specific: (%x)" msgstr "" -#: readelf.c:2452 +#: readelf.c:2742 #, c-format msgid ": %x" msgstr "" #. Please keep this switch table sorted by increasing EM_ value. #. 0 -#: readelf.c:2466 readelf.c:17634 readelf.c:17645 +#: readelf.c:2756 readelf.c:18010 readelf.c:18021 msgid "None" msgstr "" -#: readelf.c:2714 +#: readelf.c:3004 #, c-format msgid ": 0x%x" msgstr "" -#: readelf.c:3000 +#: readelf.c:3290 msgid ", " msgstr "" -#: readelf.c:3369 readelf.c:10401 +#: readelf.c:3659 readelf.c:10755 msgid "unknown" msgstr "" -#: readelf.c:3370 +#: readelf.c:3660 msgid "unknown mac" msgstr "" -#: readelf.c:3438 +#: readelf.c:3728 msgid ", " msgstr "" -#: readelf.c:3448 +#: readelf.c:3738 msgid "" msgstr "" -#: readelf.c:3459 +#: readelf.c:3749 #, c-format msgid ", unknown flags bits: %#x" msgstr "" -#: readelf.c:3468 +#: readelf.c:3758 msgid ", relocatable" msgstr "" -#: readelf.c:3471 +#: readelf.c:3761 msgid ", relocatable-lib" msgstr "" -#: readelf.c:3553 +#: readelf.c:3843 msgid ", unknown v850 architecture variant" msgstr "" -#: readelf.c:3621 +#: readelf.c:3911 msgid ", unknown CPU" msgstr "" -#: readelf.c:3636 +#: readelf.c:3926 msgid ", unknown ABI" msgstr "" -#: readelf.c:3661 readelf.c:3732 +#: readelf.c:3951 readelf.c:4022 msgid ", unknown ISA" msgstr "" -#: readelf.c:3842 +#: readelf.c:4132 #, c-format msgid "Unrecognised IA64 VMS Command Code: %x\n" msgstr "" -#: readelf.c:3908 +#: readelf.c:4198 msgid ": architecture variant: " msgstr "" -#: readelf.c:3927 +#: readelf.c:4217 msgid ": unknown" msgstr "" -#: readelf.c:3931 +#: readelf.c:4221 msgid ": unknown extra flag bits also present" msgstr "" -#: readelf.c:3945 +#: readelf.c:4235 msgid ", unknown" msgstr "" -#: readelf.c:3997 +#: readelf.c:4301 msgid "Standalone App" msgstr "" -#: readelf.c:4006 +#: readelf.c:4310 msgid "Bare-metal C6000" msgstr "" -#: readelf.c:4016 readelf.c:5193 readelf.c:5209 readelf.c:19058 readelf.c:19158 -#: readelf.c:19189 readelf.c:19226 readelf.c:19287 readelf.c:19314 +#: readelf.c:4320 readelf.c:5535 readelf.c:5551 readelf.c:19439 readelf.c:19539 +#: readelf.c:19570 readelf.c:19607 readelf.c:19668 readelf.c:19695 +#: readelf.c:19717 #, c-format msgid "" msgstr "" #. This message is probably going to be displayed in a 15 #. character wide field, so put the hex value first. -#: readelf.c:4615 +#: readelf.c:4933 #, c-format msgid "%08x: " msgstr "" -#: readelf.c:4702 +#: readelf.c:5021 #, c-format msgid "Usage: readelf elf-file(s)\n" msgstr "" -#: readelf.c:4703 +#: readelf.c:5022 #, c-format msgid " Display information about the contents of ELF format files\n" msgstr "" -#: readelf.c:4334 +#: readelf.c:4494 #, c-format msgid "" " Options are:\n" @@ -6806,7 +6807,7 @@ " Display the contents of DWARF debug sections\n" msgstr "" -#: readelf.c:4633 +#: readelf.c:4528 #, c-format msgid "" " --dwarf-depth=N Do not display DIEs at depth N or greater\n" @@ -6814,7 +6815,7 @@ " or deeper\n" msgstr "" -#: readelf.c:4638 +#: readelf.c:4532 #, c-format msgid "" " --ctf= Display CTF info from section \n" @@ -6831,14 +6832,14 @@ "\n" msgstr "" -#: readelf.c:4824 +#: readelf.c:5147 #, c-format msgid "" " -i --instruction-dump=\n" " Disassemble the contents of section \n" msgstr "" -#: readelf.c:4377 +#: readelf.c:4546 #, c-format msgid "" " -I --histogram Display histogram of bucket list lengths\n" @@ -6848,565 +6849,565 @@ " -v --version Display the version number of readelf\n" msgstr "" -#: readelf.c:4864 readelf.c:4895 readelf.c:4899 +#: readelf.c:5187 readelf.c:5218 readelf.c:5222 msgid "Out of memory allocating dump request table.\n" msgstr "" -#: readelf.c:5155 +#: readelf.c:5497 #, c-format msgid "Invalid option '-%c'\n" msgstr "" -#: readelf.c:5189 readelf.c:5205 readelf.c:11478 +#: readelf.c:5531 readelf.c:5547 readelf.c:11828 msgid "none" msgstr "" -#: readelf.c:5206 +#: readelf.c:5548 msgid "2's complement, little endian" msgstr "" -#: readelf.c:5207 +#: readelf.c:5549 msgid "2's complement, big endian" msgstr "" -#: readelf.c:5227 +#: readelf.c:5569 msgid "Not an ELF file - it has the wrong magic bytes at the start\n" msgstr "" -#: readelf.c:5241 +#: readelf.c:5583 #, c-format msgid "ELF Header:\n" msgstr "" -#: readelf.c:5242 +#: readelf.c:5584 #, c-format msgid " Magic: " msgstr "" -#: readelf.c:5246 +#: readelf.c:5588 #, c-format msgid " Class: %s\n" msgstr "" -#: readelf.c:5248 +#: readelf.c:5590 #, c-format msgid " Data: %s\n" msgstr "" -#: readelf.c:5250 +#: readelf.c:5592 #, c-format msgid " Version: %d%s\n" msgstr "" -#: readelf.c:5253 +#: readelf.c:5595 msgid " (current)" msgstr "" -#: readelf.c:5255 +#: readelf.c:5597 msgid " " msgstr "" -#: readelf.c:5257 +#: readelf.c:5599 #, c-format msgid " OS/ABI: %s\n" msgstr "" -#: readelf.c:5259 +#: readelf.c:5601 #, c-format msgid " ABI Version: %d\n" msgstr "" -#: readelf.c:5261 +#: readelf.c:5603 #, c-format msgid " Type: %s\n" msgstr "" -#: readelf.c:5263 +#: readelf.c:5605 #, c-format msgid " Machine: %s\n" msgstr "" -#: readelf.c:5265 +#: readelf.c:5607 #, c-format msgid " Version: 0x%lx\n" msgstr "" -#: readelf.c:5268 +#: readelf.c:5610 #, c-format msgid " Entry point address: " msgstr "" -#: readelf.c:5270 +#: readelf.c:5612 #, c-format msgid "" "\n" " Start of program headers: " msgstr "" -#: readelf.c:5272 +#: readelf.c:5614 #, c-format msgid "" " (bytes into file)\n" " Start of section headers: " msgstr "" -#: readelf.c:5274 +#: readelf.c:5616 #, c-format msgid " (bytes into file)\n" msgstr "" -#: readelf.c:5276 +#: readelf.c:5618 #, c-format msgid " Flags: 0x%lx%s\n" msgstr "" -#: readelf.c:5279 +#: readelf.c:5621 #, c-format msgid " Size of this header: %u (bytes)\n" msgstr "" -#: readelf.c:5281 +#: readelf.c:5623 #, c-format msgid " Size of program headers: %u (bytes)\n" msgstr "" -#: readelf.c:5283 +#: readelf.c:5625 #, c-format msgid " Number of program headers: %u" msgstr "" -#: readelf.c:5293 +#: readelf.c:5635 #, c-format msgid " Size of section headers: %u (bytes)\n" msgstr "" -#: readelf.c:5295 +#: readelf.c:5637 #, c-format msgid " Number of section headers: %u" msgstr "" -#: readelf.c:5303 +#: readelf.c:5645 #, c-format msgid " Section header string table index: %u" msgstr "" -#: readelf.c:5315 +#: readelf.c:5657 #, c-format msgid " " msgstr "" -#: readelf.c:5354 readelf.c:5401 +#: readelf.c:5696 readelf.c:5743 msgid "" "The e_phentsize field in the ELF header is less than the size of an ELF " "program header\n" msgstr "" -#: readelf.c:5358 readelf.c:5405 +#: readelf.c:5700 readelf.c:5747 msgid "" "The e_phentsize field in the ELF header is larger than the size of an ELF " "program header\n" msgstr "" -#: readelf.c:5361 readelf.c:5408 +#: readelf.c:5703 readelf.c:5750 msgid "program headers" msgstr "" -#: readelf.c:5447 +#: readelf.c:5789 #, c-format msgid "Too many program headers - %#x - the file is not that big\n" msgstr "" -#: readelf.c:5456 +#: readelf.c:5798 #, c-format msgid "Out of memory reading %u program headers\n" msgstr "" -#: readelf.c:5486 +#: readelf.c:5828 msgid "" "possibly corrupt ELF header - it has a non-zero program header offset, but " "no program headers\n" msgstr "" -#: readelf.c:5494 +#: readelf.c:5836 #, c-format msgid "" "\n" "There are no program headers in this file.\n" msgstr "" -#: readelf.c:5505 +#: readelf.c:5847 #, c-format msgid "" "\n" "Elf file type is %s\n" msgstr "" -#: readelf.c:5506 +#: readelf.c:5848 #, c-format msgid "Entry point 0x%s\n" msgstr "" -#: readelf.c:5507 +#: readelf.c:5849 #, c-format msgid "There is %d program header, starting at offset %s\n" msgid_plural "There are %d program headers, starting at offset %s\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:5520 readelf.c:5522 +#: readelf.c:5862 readelf.c:5864 #, c-format msgid "" "\n" "Program Headers:\n" msgstr "" -#: readelf.c:5526 +#: readelf.c:5868 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align\n" msgstr "" -#: readelf.c:5529 +#: readelf.c:5871 #, c-format msgid "" " Type Offset VirtAddr PhysAddr FileSiz " "MemSiz Flg Align\n" msgstr "" -#: readelf.c:5533 +#: readelf.c:5875 #, c-format msgid " Type Offset VirtAddr PhysAddr\n" msgstr "" -#: readelf.c:5535 +#: readelf.c:5877 #, c-format msgid "" " FileSiz MemSiz Flags Align\n" msgstr "" -#: readelf.c:5633 +#: readelf.c:5975 msgid "LOAD segments must be sorted in order of increasing VirtAddr\n" msgstr "" -#: readelf.c:5636 +#: readelf.c:5978 msgid "the segment's file size is larger than its memory size\n" msgstr "" -#: readelf.c:5643 +#: readelf.c:5985 msgid "the PHDR segment must occur before any LOAD segment\n" msgstr "" -#: readelf.c:5661 +#: readelf.c:6003 msgid "the PHDR segment is not covered by a LOAD segment\n" msgstr "" -#: readelf.c:5667 +#: readelf.c:6009 msgid "more than one dynamic segment\n" msgstr "" -#: readelf.c:5686 +#: readelf.c:6028 msgid "no .dynamic section in the dynamic segment\n" msgstr "" -#: readelf.c:5126 +#: readelf.c:5326 msgid "the .dynamic section is not contained within the dynamic segment\n" msgstr "" -#: readelf.c:5129 +#: readelf.c:5329 msgid "" "the .dynamic section is not the first section in the dynamic segment.\n" msgstr "" -#: readelf.c:5716 +#: readelf.c:6058 msgid "the dynamic segment offset + size exceeds the size of the file\n" msgstr "" -#: readelf.c:5729 +#: readelf.c:6071 msgid "Unable to find program interpreter name\n" msgstr "" -#: readelf.c:5517 +#: readelf.c:5355 msgid "" "Internal error: failed to create format string to display program " "interpreter\n" msgstr "" -#: readelf.c:5522 +#: readelf.c:5359 msgid "Unable to read program interpreter name\n" msgstr "" -#: readelf.c:5740 +#: readelf.c:6082 #, c-format msgid " [Requesting program interpreter: %s]\n" msgstr "" -#: readelf.c:5751 +#: readelf.c:6093 #, c-format msgid "" "\n" " Section to Segment mapping:\n" msgstr "" -#: readelf.c:5752 +#: readelf.c:6094 #, c-format msgid " Segment Sections...\n" msgstr "" -#: readelf.c:5794 readelf.c:10759 +#: readelf.c:6136 readelf.c:11113 msgid "Cannot interpret virtual addresses without program headers.\n" msgstr "" -#: readelf.c:5810 +#: readelf.c:6152 #, c-format msgid "Virtual address 0x%lx not located in any PT_LOAD segment.\n" msgstr "" -#: readelf.c:5835 readelf.c:5899 +#: readelf.c:6177 readelf.c:6241 msgid "" "The e_shentsize field in the ELF header is less than the size of an ELF " "section header\n" msgstr "" -#: readelf.c:5839 readelf.c:5904 +#: readelf.c:6181 readelf.c:6246 msgid "" "The e_shentsize field in the ELF header is larger than the size of an ELF " "section header\n" msgstr "" -#: readelf.c:5843 readelf.c:5909 +#: readelf.c:6185 readelf.c:6251 msgid "section headers" msgstr "" -#: readelf.c:5852 readelf.c:5918 +#: readelf.c:6194 readelf.c:6260 #, c-format msgid "Out of memory reading %u section headers\n" msgstr "" -#: readelf.c:5872 readelf.c:5938 +#: readelf.c:6214 readelf.c:6280 #, c-format msgid "Section %u has an out of range sh_link value of %u\n" msgstr "" -#: readelf.c:5874 readelf.c:5940 +#: readelf.c:6216 readelf.c:6282 #, c-format msgid "Section %u has an out of range sh_info value of %u\n" msgstr "" -#: readelf.c:5982 readelf.c:6099 +#: readelf.c:6324 readelf.c:6441 #, c-format msgid "Section %s has an invalid sh_entsize of 0x%lx\n" msgstr "" -#: readelf.c:5990 readelf.c:6107 readelf.c:12767 +#: readelf.c:6332 readelf.c:6449 readelf.c:13146 #, c-format msgid "Section %s has an invalid sh_size of 0x%lx\n" msgstr "" -#: readelf.c:6000 readelf.c:6117 +#: readelf.c:6342 readelf.c:6459 #, c-format msgid "" "Size (0x%lx) of section %s is not a multiple of its sh_entsize (0x%lx)\n" msgstr "" -#: readelf.c:6008 readelf.c:6125 readelf.c:15196 +#: readelf.c:6350 readelf.c:6467 readelf.c:15575 msgid "symbols" msgstr "" -#: readelf.c:6020 readelf.c:6137 +#: readelf.c:6362 readelf.c:6479 msgid "" "Multiple symbol table index sections associated with the same symbol " "section\n" msgstr "" -#: readelf.c:6027 readelf.c:6144 +#: readelf.c:6369 readelf.c:6486 msgid "symbol table section indices" msgstr "" -#: readelf.c:6034 readelf.c:6151 +#: readelf.c:6376 readelf.c:6493 #, c-format msgid "Index section %s has an sh_size of 0x%lx - expected 0x%lx\n" msgstr "" -#: readelf.c:6046 readelf.c:6163 +#: readelf.c:6388 readelf.c:6505 #, c-format msgid "Out of memory reading %lu symbols\n" msgstr "" -#: readelf.c:6372 readelf.c:6469 readelf.c:6487 readelf.c:6505 +#: readelf.c:6714 readelf.c:6811 readelf.c:6829 readelf.c:6847 msgid "Internal error: not enough buffer room for section flag info" msgstr "" -#: readelf.c:6512 +#: readelf.c:6854 #, c-format msgid "UNKNOWN (%*.*lx)" msgstr "" -#: readelf.c:6531 readelf.c:6546 +#: readelf.c:6873 readelf.c:6888 msgid "Compressed section is too small even for a compression header\n" msgstr "" -#: readelf.c:6568 +#: readelf.c:6910 msgid "" "possibly corrupt ELF file header - it has a non-zero section header offset, " "but no section headers\n" msgstr "" -#: readelf.c:6573 +#: readelf.c:6915 #, c-format msgid "" "\n" "There are no sections in this file.\n" msgstr "" -#: readelf.c:6583 +#: readelf.c:6925 #, c-format msgid "There is %d section header, starting at offset 0x%lx:\n" msgid_plural "There are %d section headers, starting at offset 0x%lx:\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:6605 readelf.c:7278 readelf.c:7479 readelf.c:13054 readelf.c:15585 +#: readelf.c:6947 readelf.c:7624 readelf.c:7826 readelf.c:13434 readelf.c:15933 msgid "string table" msgstr "" #. Note: coded this way so that there is a single string for translation. -#: readelf.c:6671 +#: readelf.c:7013 #, c-format msgid "Section %d has invalid sh_entsize of %s\n" msgstr "" -#: readelf.c:6672 +#: readelf.c:7014 #, c-format msgid "(Using the expected size of %u for the rest of this dump)\n" msgstr "" -#: readelf.c:6696 +#: readelf.c:7038 msgid "File contains multiple dynamic symbol tables\n" msgstr "" -#: readelf.c:6711 +#: readelf.c:7053 msgid "File contains multiple dynamic string tables\n" msgstr "" -#: readelf.c:6717 +#: readelf.c:7059 msgid "dynamic strings" msgstr "" -#: readelf.c:6846 +#: readelf.c:7192 #, c-format msgid "" "\n" "Section Headers:\n" msgstr "" -#: readelf.c:6848 +#: readelf.c:7194 #, c-format msgid "" "\n" "Section Header:\n" msgstr "" -#: readelf.c:6854 readelf.c:6865 readelf.c:6876 +#: readelf.c:7200 readelf.c:7211 readelf.c:7222 #, c-format msgid " [Nr] Name\n" msgstr "" -#: readelf.c:6855 +#: readelf.c:7201 #, c-format msgid " Type Addr Off Size ES Lk Inf Al\n" msgstr "" -#: readelf.c:6859 +#: readelf.c:7205 #, c-format msgid "" " [Nr] Name Type Addr Off Size ES Flg Lk " "Inf Al\n" msgstr "" -#: readelf.c:6866 +#: readelf.c:7212 #, c-format msgid "" " Type Address Off Size ES Lk Inf Al\n" msgstr "" -#: readelf.c:6870 +#: readelf.c:7216 #, c-format msgid "" " [Nr] Name Type Address Off Size ES " "Flg Lk Inf Al\n" msgstr "" -#: readelf.c:6877 +#: readelf.c:7223 #, c-format msgid " Type Address Offset Link\n" msgstr "" -#: readelf.c:6878 +#: readelf.c:7224 #, c-format msgid " Size EntSize Info Align\n" msgstr "" -#: readelf.c:6882 +#: readelf.c:7228 #, c-format msgid " [Nr] Name Type Address Offset\n" msgstr "" -#: readelf.c:6883 +#: readelf.c:7229 #, c-format msgid " Size EntSize Flags Link Info Align\n" msgstr "" -#: readelf.c:6888 +#: readelf.c:7234 #, c-format msgid " Flags\n" msgstr "" -#: readelf.c:6917 +#: readelf.c:7263 #, c-format msgid "[%2u]: Link field (%u) should index a symtab section.\n" msgstr "" -#: readelf.c:6930 +#: readelf.c:7276 #, c-format msgid "[%2u]: Link field (%u) should index a string section.\n" msgstr "" -#: readelf.c:6938 readelf.c:6949 +#: readelf.c:7284 readelf.c:7295 #, c-format msgid "[%2u]: Unexpected value (%u) in link field.\n" msgstr "" -#: readelf.c:6976 +#: readelf.c:7322 #, c-format msgid "[%2u]: Info field (%u) should index a relocatable section.\n" msgstr "" -#: readelf.c:6987 readelf.c:7014 +#: readelf.c:7333 readelf.c:7360 #, c-format msgid "[%2u]: Unexpected value (%u) in info field.\n" msgstr "" -#: readelf.c:7009 +#: readelf.c:7355 #, c-format msgid "[%2u]: Expected link to another section in info field" msgstr "" -#: readelf.c:7024 +#: readelf.c:7370 #, c-format msgid "Size of section %u is larger than the entire file!\n" msgstr "" -#: readelf.c:7093 +#: readelf.c:7439 #, c-format msgid "" "section %u: sh_link value of %u is larger than the number of sections\n" msgstr "" -#: readelf.c:7194 +#: readelf.c:7540 msgid "compression header" msgstr "" -#: readelf.c:7205 +#: readelf.c:7551 #, c-format msgid " [: 0x%x], " msgstr "" @@ -7414,7 +7415,7 @@ #. The ordering of the letters shown here matches the ordering of the #. corresponding SHF_xxx values, and hence the order in which these #. letters will be displayed to the user. -#: readelf.c:7220 +#: readelf.c:7566 #, c-format msgid "" "Key to Flags:\n" @@ -7424,282 +7425,282 @@ " " msgstr "" -#: readelf.c:7239 +#: readelf.c:7585 #, c-format msgid "l (large), " msgstr "" -#: readelf.c:7241 +#: readelf.c:7587 #, c-format msgid "y (purecode), " msgstr "" -#: readelf.c:7243 +#: readelf.c:7589 #, c-format msgid "v (VLE), " msgstr "" -#: readelf.c:6552 +#: readelf.c:6764 #, c-format msgid "[0x%x: " msgstr "" -#: readelf.c:7090 +#: readelf.c:6806 #, c-format msgid "" "\n" "There are no sections to group in this file.\n" msgstr "" -#: readelf.c:7343 +#: readelf.c:7689 msgid "Section headers are not available!\n" msgstr "" -#: readelf.c:7354 +#: readelf.c:7700 #, c-format msgid "Out of memory reading %u section group headers\n" msgstr "" -#: readelf.c:7336 readelf.c:7375 +#: readelf.c:7682 readelf.c:7721 #, c-format msgid "" "\n" "There are no section groups in this file.\n" msgstr "" -#: readelf.c:7386 +#: readelf.c:7732 #, c-format msgid "Out of memory reading %lu groups\n" msgstr "" -#: readelf.c:7420 +#: readelf.c:7766 #, c-format msgid "Bad sh_link in group section `%s'\n" msgstr "" -#: readelf.c:7433 +#: readelf.c:7779 #, c-format msgid "Corrupt header in group section `%s'\n" msgstr "" -#: readelf.c:7439 readelf.c:7450 +#: readelf.c:7785 readelf.c:7796 #, c-format msgid "Bad sh_info in group section `%s'\n" msgstr "" -#: readelf.c:7489 +#: readelf.c:7836 #, c-format msgid "" "Section %s has sh_entsize (0x%lx) which is larger than its size (0x%lx)\n" msgstr "" -#: readelf.c:7498 +#: readelf.c:7845 msgid "section data" msgstr "" -#: readelf.c:7509 +#: readelf.c:7856 #, c-format msgid "" "\n" "%sgroup section [%5u] `%s' [%s] contains %u sections:\n" msgstr "" -#: readelf.c:7512 +#: readelf.c:7859 #, c-format msgid " [Index] Name\n" msgstr "" -#: readelf.c:7530 +#: readelf.c:7877 #, c-format msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n" msgstr "" -#: readelf.c:7533 +#: readelf.c:7880 msgid "" "Further error messages about overlarge group section indices suppressed\n" msgstr "" -#: readelf.c:7546 +#: readelf.c:7893 #, c-format msgid "section [%5u] in group section [%5u] already in group section [%5u]\n" msgstr "" -#: readelf.c:7550 +#: readelf.c:7897 msgid "" "Further error messages about already contained group sections suppressed\n" msgstr "" -#: readelf.c:7562 +#: readelf.c:7909 #, c-format msgid "section 0 in group section [%5u]\n" msgstr "" -#: readelf.c:7629 +#: readelf.c:7976 msgid "dynamic section image fixups" msgstr "" -#: readelf.c:7637 +#: readelf.c:7984 #, c-format msgid "corrupt library name index of 0x%lx found in dynamic entry" msgstr "" -#: readelf.c:7642 +#: readelf.c:7989 #, c-format msgid "" "\n" "Image fixups for needed library #%d: %s - ident: %lx\n" msgstr "" -#: readelf.c:7645 +#: readelf.c:7992 #, c-format msgid "" "Seg Offset Type SymVec DataType\n" msgstr "" -#: readelf.c:7679 +#: readelf.c:8026 msgid "dynamic section image relocations" msgstr "" -#: readelf.c:7683 +#: readelf.c:8030 #, c-format msgid "" "\n" "Image relocs\n" msgstr "" -#: readelf.c:7685 +#: readelf.c:8032 #, c-format msgid "" "Seg Offset Type Addend Seg Sym Off\n" msgstr "" -#: readelf.c:7742 +#: readelf.c:8089 msgid "dynamic string section" msgstr "" -#: readelf.c:7849 +#: readelf.c:8197 #, c-format msgid "" "\n" "'%s' relocation section at offset 0x%lx contains %ld bytes:\n" msgstr "" -#: readelf.c:7873 +#: readelf.c:8221 #, c-format msgid "" "\n" "There are no dynamic relocations in this file.\n" msgstr "" -#: readelf.c:7902 +#: readelf.c:8251 #, c-format msgid "" "\n" "Relocation section " msgstr "" -#: readelf.c:7910 +#: readelf.c:8259 #, c-format msgid " at offset 0x%lx contains %lu entry:\n" msgid_plural " at offset 0x%lx contains %lu entries:\n" msgstr[0] "" msgstr[1] "" -#: readelf.c:7962 +#: readelf.c:8311 #, c-format msgid "" "\n" "There are no static relocations in this file." msgstr "" -#: readelf.c:7963 +#: readelf.c:8312 #, c-format msgid "" "\n" "To see the dynamic relocations add --use-dynamic to the command line.\n" msgstr "" -#: readelf.c:7974 +#: readelf.c:8323 #, c-format msgid "" "\n" "There are no relocations in this file.\n" msgstr "" -#: readelf.c:8142 +#: readelf.c:8491 #, c-format msgid "Invalid section %u in table entry %ld\n" msgstr "" -#: readelf.c:8154 +#: readelf.c:8503 #, c-format msgid "Invalid offset %lx in table entry %ld\n" msgstr "" -#: readelf.c:8172 +#: readelf.c:8521 #, c-format msgid "\tUnknown version.\n" msgstr "" -#: readelf.c:8235 readelf.c:8669 +#: readelf.c:8584 readelf.c:9021 msgid "unwind table" msgstr "" -#: readelf.c:8286 readelf.c:8752 +#: readelf.c:8635 readelf.c:9104 #, c-format msgid "Skipping unknown relocation type: %u\n" msgstr "" -#: readelf.c:8292 readelf.c:8759 +#: readelf.c:8641 readelf.c:9111 #, c-format msgid "Skipping unexpected relocation type: %s\n" msgstr "" -#: readelf.c:8301 readelf.c:8766 +#: readelf.c:8650 readelf.c:9118 #, c-format msgid "Skipping reloc with overlarge offset: %lx\n" msgstr "" -#: readelf.c:8308 readelf.c:8773 +#: readelf.c:8657 readelf.c:9125 #, c-format msgid "Skipping reloc with invalid symbol index: %u\n" msgstr "" -#: readelf.c:7577 readelf.c:8020 +#: readelf.c:7807 readelf.c:8271 msgid "Multiple auxillary string tables encountered\n" msgstr "" -#: readelf.c:8371 readelf.c:8836 readelf.c:9943 +#: readelf.c:8720 readelf.c:9188 readelf.c:10297 #, c-format msgid "" "\n" "There are no unwind sections in this file.\n" msgstr "" -#: readelf.c:8454 +#: readelf.c:8806 #, c-format msgid "" "\n" "Could not find unwind info section for " msgstr "" -#: readelf.c:8466 +#: readelf.c:8818 msgid "unwind info" msgstr "" -#: readelf.c:8469 +#: readelf.c:8821 #, c-format msgid "" "\n" "Unwind section " msgstr "" -#: readelf.c:8476 +#: readelf.c:8828 #, c-format msgid " at offset 0x%lx contains %lu entries:\n" msgstr "" -#: readelf.c:8845 readelf.c:9950 +#: readelf.c:9197 readelf.c:10304 #, c-format msgid "" "\n" @@ -7710,193 +7711,193 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:8978 +#: readelf.c:9330 msgid "unwind data" msgstr "" -#: readelf.c:9051 +#: readelf.c:9403 #, c-format msgid "Skipping unexpected relocation at offset 0x%lx\n" msgstr "" -#: readelf.c:9073 +#: readelf.c:9425 #, c-format msgid "Unknown section relocation type %d encountered\n" msgstr "" -#: readelf.c:9081 +#: readelf.c:9433 #, c-format msgid "Bad symbol index in unwind relocation (%lu > %lu)\n" msgstr "" -#: readelf.c:9096 +#: readelf.c:9448 #, c-format msgid "Skipping unknown ARM relocation type: %d\n" msgstr "" -#: readelf.c:9106 +#: readelf.c:9458 #, c-format msgid "Skipping unexpected ARM relocation type %s\n" msgstr "" -#: readelf.c:9115 +#: readelf.c:9467 #, c-format msgid "Skipping unknown C6000 relocation type: %d\n" msgstr "" -#: readelf.c:9125 +#: readelf.c:9477 #, c-format msgid "Skipping unexpected C6000 relocation type %s\n" msgstr "" #. This function currently only supports ARM and TI unwinders. -#: readelf.c:9134 +#: readelf.c:9486 msgid "Only TI and ARM unwinders are currently supported\n" msgstr "" -#: readelf.c:9197 +#: readelf.c:9549 #, c-format msgid "[Truncated opcode]\n" msgstr "" -#: readelf.c:9245 readelf.c:9461 +#: readelf.c:9597 readelf.c:9815 #, c-format msgid "Refuse to unwind" msgstr "" -#: readelf.c:9268 +#: readelf.c:9620 #, c-format msgid " [Reserved]" msgstr "" -#: readelf.c:9296 +#: readelf.c:9648 #, c-format msgid " finish" msgstr "" -#: readelf.c:9301 readelf.c:9394 +#: readelf.c:9653 readelf.c:9748 #, c-format msgid "[Spare]" msgstr "" -#: readelf.c:8538 +#: readelf.c:8789 msgid "corrupt change to vsp" msgstr "" -#: readelf.c:9416 readelf.c:9573 +#: readelf.c:9770 readelf.c:9927 #, c-format msgid " [unsupported opcode]" msgstr "" -#: readelf.c:9509 +#: readelf.c:9863 #, c-format msgid "pop frame {" msgstr "" -#: readelf.c:9512 +#: readelf.c:9866 #, c-format msgid "*corrupt* - no registers specified" msgstr "" -#: readelf.c:9526 +#: readelf.c:9880 msgid "[pad]" msgstr "" -#: readelf.c:9555 +#: readelf.c:9909 msgid "Corrupt stack pointer adjustment detected\n" msgstr "" -#: readelf.c:9562 +#: readelf.c:9916 #, c-format msgid "sp = sp + %ld" msgstr "" -#: readelf.c:9637 +#: readelf.c:9991 #, c-format msgid " Personality routine: " msgstr "" -#: readelf.c:9669 +#: readelf.c:10023 #, c-format msgid " [Truncated data]\n" msgstr "" -#: readelf.c:9693 +#: readelf.c:10047 #, c-format msgid "Corrupt ARM compact model table entry: %x \n" msgstr "" -#: readelf.c:9698 +#: readelf.c:10052 #, c-format msgid " Compact model index: %d\n" msgstr "" -#: readelf.c:9724 +#: readelf.c:10078 msgid "Unknown ARM compact model index encountered\n" msgstr "" -#: readelf.c:9725 +#: readelf.c:10079 #, c-format msgid " [reserved]\n" msgstr "" -#: readelf.c:9740 +#: readelf.c:10094 #, c-format msgid " Restore stack from frame pointer\n" msgstr "" -#: readelf.c:9742 +#: readelf.c:10096 #, c-format msgid " Stack increment %d\n" msgstr "" -#: readelf.c:9743 +#: readelf.c:10097 #, c-format msgid " Registers restored: " msgstr "" -#: readelf.c:9748 +#: readelf.c:10102 #, c-format msgid " Return register: %s\n" msgstr "" -#: readelf.c:9752 +#: readelf.c:10106 #, c-format msgid " [reserved (%d)]\n" msgstr "" -#: readelf.c:9756 +#: readelf.c:10110 #, c-format msgid "" "Unsupported architecture type %d encountered when decoding unwind table\n" msgstr "" -#: readelf.c:9811 +#: readelf.c:10165 #, c-format msgid "corrupt index table entry: %x\n" msgstr "" -#: readelf.c:9851 +#: readelf.c:10205 #, c-format msgid "Unwind entry contains corrupt offset (0x%lx) into section %s\n" msgstr "" -#: readelf.c:9867 +#: readelf.c:10221 #, c-format msgid "Could not locate .ARM.extab section containing 0x%lx.\n" msgstr "" -#: readelf.c:9911 +#: readelf.c:10265 #, c-format msgid "" "Unsupported architecture type %d encountered when processing unwind table\n" msgstr "" -#: readelf.c:9125 +#: readelf.c:9388 msgid "Multiple string tables found in file.\n" msgstr "" -#: readelf.c:10003 +#: readelf.c:10357 #, c-format msgid "" "\n" @@ -7904,37 +7905,37 @@ "supported.\n" msgstr "" -#: readelf.c:10030 +#: readelf.c:10384 #, c-format msgid "NONE" msgstr "" -#: readelf.c:10055 +#: readelf.c:10409 #, c-format msgid "Interface Version: %s" msgstr "" #. Note: coded this way so that there is a single string for translation. -#: readelf.c:10062 +#: readelf.c:10416 #, c-format msgid "" msgstr "" -#: readelf.c:10080 +#: readelf.c:10434 #, c-format msgid "Time Stamp: %s" msgstr "" -#: readelf.c:10274 readelf.c:10324 +#: readelf.c:10628 readelf.c:10678 msgid "dynamic section" msgstr "" -#: readelf.c:10294 readelf.c:10345 +#: readelf.c:10648 readelf.c:10699 #, c-format msgid "Out of memory allocating space for %lu dynamic entries\n" msgstr "" -#: readelf.c:10714 +#: readelf.c:11068 #, c-format msgid "" "\n" @@ -7942,7 +7943,7 @@ msgstr "" #. See PR 21379 for a reproducer. -#: readelf.c:9597 +#: readelf.c:9880 #, c-format msgid "Invalid DT_SYMTAB entry: %lx" msgstr "" @@ -7951,11 +7952,11 @@ msgid "Multiple dynamic symbol table sections found\n" msgstr "" -#: readelf.c:9615 +#: readelf.c:9903 msgid "Unable to determine the number of symbols to load\n" msgstr "" -#: readelf.c:9651 +#: readelf.c:9939 msgid "Unable to determine the length of the dynamic string table\n" msgstr "" @@ -7963,29 +7964,29 @@ msgid "Multiple dynamic string tables found\n" msgstr "" -#: readelf.c:10851 +#: readelf.c:11205 msgid "dynamic string table" msgstr "" -#: readelf.c:10879 +#: readelf.c:11233 #, c-format msgid "Bad value (%d) for SYMINENT entry\n" msgstr "" -#: readelf.c:10898 +#: readelf.c:11252 msgid "symbol information" msgstr "" -#: readelf.c:10904 +#: readelf.c:11258 msgid "Multiple dynamic symbol information sections found\n" msgstr "" -#: readelf.c:9705 +#: readelf.c:10003 #, c-format msgid "Out of memory allocating %lu byte for dynamic symbol info\n" msgstr "" -#: readelf.c:10632 +#: readelf.c:11295 #, c-format msgid "" "\n" @@ -7996,87 +7997,87 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:10957 +#: readelf.c:11302 #, c-format msgid " Tag Type Name/Value\n" msgstr "" -#: readelf.c:10991 +#: readelf.c:11336 #, c-format msgid "Auxiliary library" msgstr "" -#: readelf.c:10995 +#: readelf.c:11340 #, c-format msgid "Filter library" msgstr "" -#: readelf.c:10999 +#: readelf.c:11344 #, c-format msgid "Configuration file" msgstr "" -#: readelf.c:11003 +#: readelf.c:11348 #, c-format msgid "Dependency audit library" msgstr "" -#: readelf.c:11007 +#: readelf.c:11352 #, c-format msgid "Audit library" msgstr "" -#: readelf.c:11026 readelf.c:11054 readelf.c:11082 readelf.c:11417 +#: readelf.c:11371 readelf.c:11399 readelf.c:11427 readelf.c:11767 #, c-format msgid "Flags:" msgstr "" -#: readelf.c:11029 readelf.c:11057 readelf.c:11084 readelf.c:11419 +#: readelf.c:11374 readelf.c:11402 readelf.c:11429 readelf.c:11769 #, c-format msgid " None\n" msgstr "" -#: readelf.c:11290 +#: readelf.c:11636 #, c-format msgid "Shared library: [%s]" msgstr "" -#: readelf.c:11294 +#: readelf.c:11640 #, c-format msgid " program interpreter" msgstr "" -#: readelf.c:11298 +#: readelf.c:11644 #, c-format msgid "Library soname: [%s]" msgstr "" -#: readelf.c:11302 +#: readelf.c:11648 #, c-format msgid "Library rpath: [%s]" msgstr "" -#: readelf.c:11306 +#: readelf.c:11652 #, c-format msgid "Library runpath: [%s]" msgstr "" -#: readelf.c:11340 +#: readelf.c:11689 #, c-format msgid " (bytes)\n" msgstr "" -#: readelf.c:11370 +#: readelf.c:11720 #, c-format msgid "Not needed object: [%s]\n" msgstr "" -#: readelf.c:11395 +#: readelf.c:11745 #, c-format msgid ": %d" msgstr "" -#: readelf.c:12348 +#: readelf.c:12723 #, c-format msgid ": %x" msgstr "" -#: readelf.c:12388 +#: readelf.c:12763 #, c-format msgid "bad section index[%3d]" msgstr "" -#: readelf.c:10419 +#: readelf.c:10773 #, c-format msgid "Size truncation prevents reading %s elements of size %u\n" msgstr "" -#: readelf.c:10428 +#: readelf.c:10782 #, c-format msgid "Invalid number of dynamic entries: %s\n" msgstr "" -#: readelf.c:10436 +#: readelf.c:10790 #, c-format msgid "Out of memory reading %s dynamic entries\n" msgstr "" -#: readelf.c:10443 +#: readelf.c:10797 #, c-format msgid "Unable to read in %s bytes of dynamic data\n" msgstr "" -#: readelf.c:10452 +#: readelf.c:10806 #, c-format msgid "Out of memory allocating space for %s dynamic entries\n" msgstr "" -#: readelf.c:11127 +#: readelf.c:11479 #, c-format msgid "\n" msgstr "" -#: readelf.c:11159 +#: readelf.c:11511 #, c-format msgid " " msgstr "" -#: readelf.c:12421 +#: readelf.c:12796 msgid "version data" msgstr "" -#: readelf.c:12533 +#: readelf.c:12908 msgid "version need aux (3)" msgstr "" -#: readelf.c:10492 readelf.c:10546 readelf.c:10570 readelf.c:10603 -#: readelf.c:10629 readelf.c:10648 +#: readelf.c:10846 readelf.c:10900 readelf.c:10924 readelf.c:10957 +#: readelf.c:10983 readelf.c:11002 msgid "Unable to seek to start of dynamic information\n" msgstr "" -#: readelf.c:10498 readelf.c:10552 +#: readelf.c:10852 readelf.c:10906 msgid "Failed to read in number of buckets\n" msgstr "" -#: readelf.c:10504 +#: readelf.c:10858 msgid "Failed to read in number of chains\n" msgstr "" -#: readelf.c:10611 +#: readelf.c:10965 msgid "Failed to determine last chain length\n" msgstr "" -#: readelf.c:11526 +#: readelf.c:11914 #, c-format msgid "" "\n" "Symbol table for image:\n" msgstr "" -#: readelf.c:11528 readelf.c:11554 +#: readelf.c:11916 readelf.c:11943 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:11530 readelf.c:11556 +#: readelf.c:11918 readelf.c:11945 #, c-format msgid " Num Buc: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:13109 +#: readelf.c:13489 msgid "histogram chain is corrupt\n" msgstr "" @@ -8404,14 +8405,14 @@ "Symbol table of `%s' for image:\n" msgstr "" -#: readelf.c:13011 +#: readelf.c:13391 #, c-format msgid "" "\n" "Symbol table '%s' has a sh_entsize of zero!\n" msgstr "" -#: readelf.c:13026 +#: readelf.c:13406 #, c-format msgid "" "\n" @@ -8422,29 +8423,29 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:12980 readelf.c:13033 +#: readelf.c:13360 readelf.c:13413 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:12982 readelf.c:13035 +#: readelf.c:13362 readelf.c:13415 #, c-format msgid " Num: Value Size Type Bind Vis Ndx Name\n" msgstr "" -#: readelf.c:11687 +#: readelf.c:12079 #, c-format msgid "local symbol %u found at index >= %s's sh_info value of %u\n" msgstr "" -#: readelf.c:13069 +#: readelf.c:13449 #, c-format msgid "" "\n" "Dynamic symbol information is not available for displaying symbols.\n" msgstr "" -#: readelf.c:13082 +#: readelf.c:13462 #, c-format msgid "" "\n" @@ -8455,20 +8456,20 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:13093 +#: readelf.c:13473 msgid "Out of memory allocating space for histogram buckets\n" msgstr "" -#: readelf.c:13099 readelf.c:13177 +#: readelf.c:13479 readelf.c:13557 #, c-format msgid " Length Number %% of total Coverage\n" msgstr "" -#: readelf.c:13121 +#: readelf.c:13501 msgid "Out of memory allocating space for histogram counts\n" msgstr "" -#: readelf.c:13161 +#: readelf.c:13541 #, c-format msgid "" "\n" @@ -8479,15 +8480,15 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:13173 +#: readelf.c:13553 msgid "Out of memory allocating space for gnu histogram buckets\n" msgstr "" -#: readelf.c:13200 +#: readelf.c:13580 msgid "Out of memory allocating space for gnu histogram counts\n" msgstr "" -#: readelf.c:13273 +#: readelf.c:13653 #, c-format msgid "" "\n" @@ -8498,198 +8499,198 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:13281 +#: readelf.c:13661 #, c-format msgid " Num: Name BoundTo Flags\n" msgstr "" -#: readelf.c:13288 +#: readelf.c:13668 #, c-format msgid "" msgstr "" -#: readelf.c:13293 +#: readelf.c:13673 #, c-format msgid "" msgstr "" -#: readelf.c:13390 +#: readelf.c:13770 #, c-format msgid "MSP430 SYM_DIFF reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13441 +#: readelf.c:13821 #, c-format msgid "MSP430 reloc contains invalid symbol index %lu\n" msgstr "" #. PR 21137 -#: readelf.c:13452 +#: readelf.c:13832 #, c-format msgid "MSP430 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:13463 +#: readelf.c:13843 msgid "Unhandled MSP430 reloc type found after SYM_DIFF reloc\n" msgstr "" -#: readelf.c:13486 +#: readelf.c:13866 #, c-format msgid "MN10300_SYM_DIFF reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13500 +#: readelf.c:13880 #, c-format msgid "MN10300 reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13510 +#: readelf.c:13890 #, c-format msgid "MN10300 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:13520 +#: readelf.c:13900 msgid "Unhandled MN10300 reloc type found after SYM_DIFF reloc\n" msgstr "" -#: readelf.c:13543 +#: readelf.c:13923 #, c-format msgid "RL78_SYM reloc contains invalid symbol index %lu\n" msgstr "" -#: readelf.c:13562 readelf.c:13571 +#: readelf.c:13942 readelf.c:13951 #, c-format msgid "RL78 sym diff reloc contains invalid offset: 0x%lx\n" msgstr "" -#: readelf.c:13790 +#: readelf.c:14172 #, c-format msgid "" "Missing knowledge of 32-bit reloc types used in DWARF sections of machine " "number %d\n" msgstr "" -#: readelf.c:14473 +#: readelf.c:14857 #, c-format msgid "unable to apply unsupported reloc type %d to section %s\n" msgstr "" -#: readelf.c:14482 +#: readelf.c:14866 #, c-format msgid "skipping invalid relocation offset 0x%lx in section %s\n" msgstr "" -#: readelf.c:14491 +#: readelf.c:14875 #, c-format msgid "skipping invalid relocation symbol index 0x%lx in section %s\n" msgstr "" -#: readelf.c:14514 +#: readelf.c:14898 #, c-format msgid "skipping unexpected symbol type %s in section %s relocation %ld\n" msgstr "" -#: readelf.c:14591 +#: readelf.c:14975 #, c-format msgid "" "\n" "Assembly dump of section %s\n" msgstr "" -#: readelf.c:14609 +#: readelf.c:14993 #, c-format msgid "Section '%s' has no data to dump.\n" msgstr "" -#: readelf.c:14615 +#: readelf.c:14999 msgid "section contents" msgstr "" -#: readelf.c:14695 +#: readelf.c:15079 #, c-format msgid "" "\n" "String dump of section '%s':\n" msgstr "" -#: readelf.c:14716 readelf.c:14932 readelf.c:15355 +#: readelf.c:15100 readelf.c:15316 readelf.c:15703 #, c-format msgid "section '%s' has unsupported compress type: %d\n" msgstr "" -#: readelf.c:14748 readelf.c:14966 readelf.c:15392 +#: readelf.c:15132 readelf.c:15350 readelf.c:15740 #, c-format msgid "Unable to decompress section %s\n" msgstr "" -#: readelf.c:14773 +#: readelf.c:15157 #, c-format msgid "" " Note: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr "" -#: readelf.c:14866 readelf.c:16353 readelf.c:16393 readelf.c:16431 -#: readelf.c:16478 readelf.c:16509 readelf.c:18113 readelf.c:18145 +#: readelf.c:15250 readelf.c:16726 readelf.c:16766 readelf.c:16804 +#: readelf.c:16851 readelf.c:16882 readelf.c:18488 readelf.c:18520 #, c-format msgid "\n" msgstr "" -#: readelf.c:14874 +#: readelf.c:15258 #, c-format msgid " No strings found in this section." msgstr "" -#: readelf.c:14911 +#: readelf.c:15295 #, c-format msgid "" "\n" "Hex dump of section '%s':\n" msgstr "" -#: readelf.c:14999 +#: readelf.c:15383 #, c-format msgid "" " NOTE: This section has relocations against it, but these have NOT been " "applied to this dump.\n" msgstr "" -#: readelf.c:15190 +#: readelf.c:15569 #, c-format msgid "No symbol section named %s\n" msgstr "" -#: readelf.c:15206 +#: readelf.c:15585 #, c-format msgid "No string table section named %s\n" msgstr "" -#: readelf.c:15213 +#: readelf.c:15592 msgid "strings" msgstr "" -#: readelf.c:15223 +#: readelf.c:15227 #, c-format msgid "No CTF parent section named %s\n" msgstr "" -#: readelf.c:15229 +#: readelf.c:15233 msgid "CTF parent" msgstr "" -#: readelf.c:15280 +#: readelf.c:15628 #, c-format msgid "" "\n" "Dump of CTF section '%s':\n" msgstr "" -#: readelf.c:15319 +#: readelf.c:15667 #, c-format msgid "%s section data" msgstr "" -#: readelf.c:13490 +#: readelf.c:14125 #, c-format msgid "compressed section %s is too small to contain a compression header" msgstr "" @@ -8707,12 +8708,12 @@ msgid "debuginfod: note with invalid namesz and/or descsz found\n" msgstr "" -#: readelf.c:20906 +#: readelf.c:21363 #, c-format msgid " type: 0x%lx, namesize: 0x%08lx, descsize: 0x%08lx, alignment: %u\n" msgstr "" -#: readelf.c:15644 +#: readelf.c:15993 #, c-format msgid "" "\n" @@ -8723,533 +8724,533 @@ #. which has the NOBITS type - the bits in the file will be random. #. This can happen when a file containing a .eh_frame section is #. stripped with the --only-keep-debug command line option. -#: readelf.c:15653 +#: readelf.c:16002 #, c-format msgid "section '%s' has the NOBITS type - its contents are unreliable.\n" msgstr "" -#: readelf.c:15703 +#: readelf.c:16052 #, c-format msgid "Unrecognized debug section: %s\n" msgstr "" -#: readelf.c:15290 +#: readelf.c:14507 #, c-format msgid "Section '%s' was not dumped because it does not exist!\n" msgstr "" -#: readelf.c:15805 +#: readelf.c:16155 #, c-format msgid "Section %d was not dumped because it does not exist!\n" msgstr "" -#: readelf.c:15861 +#: readelf.c:16211 msgid "\n" msgstr "" -#: readelf.c:15876 +#: readelf.c:16226 #, c-format msgid "" msgstr "" -#: readelf.c:15910 +#: readelf.c:16260 #, c-format msgid "Absent/Non standard\n" msgstr "" -#: readelf.c:15913 +#: readelf.c:16263 #, c-format msgid "Bare metal/mwdt\n" msgstr "" -#: readelf.c:15916 +#: readelf.c:16266 #, c-format msgid "Bare metal/newlib\n" msgstr "" -#: readelf.c:15919 +#: readelf.c:16269 #, c-format msgid "Linux/uclibc\n" msgstr "" -#: readelf.c:15922 +#: readelf.c:16272 #, c-format msgid "Linux/glibc\n" msgstr "" -#: readelf.c:15925 readelf.c:16004 +#: readelf.c:16275 readelf.c:16354 #, c-format msgid "Unknown\n" msgstr "" -#: readelf.c:15937 readelf.c:15967 readelf.c:15995 +#: readelf.c:16287 readelf.c:16317 readelf.c:16345 #, c-format msgid "Absent\n" msgstr "" -#: readelf.c:15979 +#: readelf.c:16329 msgid "yes" msgstr "" -#: readelf.c:15979 +#: readelf.c:16329 msgid "no" msgstr "" -#: readelf.c:16016 readelf.c:16023 +#: readelf.c:16366 readelf.c:16373 msgid "default" msgstr "" -#: readelf.c:16017 +#: readelf.c:16367 msgid "smallest" msgstr "" -#: readelf.c:16022 +#: readelf.c:16372 msgid "OPTFP" msgstr "" -#: readelf.c:16220 readelf.c:16233 readelf.c:16251 readelf.c:16772 -#: readelf.c:17051 readelf.c:17063 readelf.c:17075 +#: readelf.c:16593 readelf.c:16606 readelf.c:16624 readelf.c:17145 +#: readelf.c:17424 readelf.c:17436 readelf.c:17448 #, c-format msgid "None\n" msgstr "" -#: readelf.c:16221 +#: readelf.c:16594 #, c-format msgid "Application\n" msgstr "" -#: readelf.c:16222 +#: readelf.c:16595 #, c-format msgid "Realtime\n" msgstr "" -#: readelf.c:16223 +#: readelf.c:16596 #, c-format msgid "Microcontroller\n" msgstr "" -#: readelf.c:16224 +#: readelf.c:16597 #, c-format msgid "Application or Realtime\n" msgstr "" -#: readelf.c:16234 readelf.c:16253 readelf.c:16824 readelf.c:16841 -#: readelf.c:16912 readelf.c:16932 readelf.c:19716 +#: readelf.c:16607 readelf.c:16626 readelf.c:17197 readelf.c:17214 +#: readelf.c:17285 readelf.c:17305 readelf.c:20136 #, c-format msgid "8-byte\n" msgstr "" -#: readelf.c:16235 readelf.c:16915 readelf.c:16935 readelf.c:19715 +#: readelf.c:16608 readelf.c:17288 readelf.c:17308 readelf.c:20135 #, c-format msgid "4-byte\n" msgstr "" -#: readelf.c:16239 readelf.c:16257 +#: readelf.c:16612 readelf.c:16630 #, c-format msgid "8-byte and up to %d-byte extended\n" msgstr "" -#: readelf.c:16252 +#: readelf.c:16625 #, c-format msgid "8-byte, except leaf SP\n" msgstr "" -#: readelf.c:16268 readelf.c:16350 readelf.c:16950 +#: readelf.c:16641 readelf.c:16723 readelf.c:17323 #, c-format msgid "flag = %d, vendor = " msgstr "" -#: readelf.c:16289 +#: readelf.c:16662 #, c-format msgid "True\n" msgstr "" -#: readelf.c:16309 +#: readelf.c:16682 #, c-format msgid "\n" msgstr "" -#: readelf.c:16354 +#: readelf.c:16727 msgid "corrupt vendor attribute\n" msgstr "" -#: readelf.c:16442 +#: readelf.c:16815 #, c-format msgid "unspecified hard/soft float, " msgstr "" -#: readelf.c:16445 +#: readelf.c:16818 #, c-format msgid "hard float, " msgstr "" -#: readelf.c:16448 +#: readelf.c:16821 #, c-format msgid "soft float, " msgstr "" -#: readelf.c:16451 +#: readelf.c:16824 #, c-format msgid "single-precision hard float, " msgstr "" -#: readelf.c:16458 +#: readelf.c:16831 #, c-format msgid "unspecified long double\n" msgstr "" -#: readelf.c:16461 +#: readelf.c:16834 #, c-format msgid "128-bit IBM long double\n" msgstr "" -#: readelf.c:16464 +#: readelf.c:16837 #, c-format msgid "64-bit long double\n" msgstr "" -#: readelf.c:16467 +#: readelf.c:16840 #, c-format msgid "128-bit IEEE long double\n" msgstr "" -#: readelf.c:16489 readelf.c:16520 +#: readelf.c:16862 readelf.c:16893 #, c-format msgid "unspecified\n" msgstr "" -#: readelf.c:16492 +#: readelf.c:16865 #, c-format msgid "generic\n" msgstr "" -#: readelf.c:16526 +#: readelf.c:16899 #, c-format msgid "memory\n" msgstr "" -#: readelf.c:16553 +#: readelf.c:16926 #, c-format msgid "any\n" msgstr "" -#: readelf.c:16556 +#: readelf.c:16929 #, c-format msgid "software\n" msgstr "" -#: readelf.c:16559 +#: readelf.c:16932 #, c-format msgid "hardware\n" msgstr "" -#: readelf.c:16682 +#: readelf.c:17055 #, c-format msgid "Hard or soft float\n" msgstr "" -#: readelf.c:16685 +#: readelf.c:17058 #, c-format msgid "Hard float (double precision)\n" msgstr "" -#: readelf.c:16688 +#: readelf.c:17061 #, c-format msgid "Hard float (single precision)\n" msgstr "" -#: readelf.c:16691 +#: readelf.c:17064 #, c-format msgid "Soft float\n" msgstr "" -#: readelf.c:16694 +#: readelf.c:17067 #, c-format msgid "Hard float (MIPS32r2 64-bit FPU 12 callee-saved)\n" msgstr "" -#: readelf.c:16697 +#: readelf.c:17070 #, c-format msgid "Hard float (32-bit CPU, Any FPU)\n" msgstr "" -#: readelf.c:16700 +#: readelf.c:17073 #, c-format msgid "Hard float (32-bit CPU, 64-bit FPU)\n" msgstr "" -#: readelf.c:16703 +#: readelf.c:17076 #, c-format msgid "Hard float compat (32-bit CPU, 64-bit FPU)\n" msgstr "" -#: readelf.c:16706 +#: readelf.c:17079 #, c-format msgid "NaN 2008 compatibility\n" msgstr "" -#: readelf.c:16739 +#: readelf.c:17112 #, c-format msgid "Any MSA or not\n" msgstr "" -#: readelf.c:16742 +#: readelf.c:17115 #, c-format msgid "128-bit MSA\n" msgstr "" -#: readelf.c:16804 +#: readelf.c:17177 #, c-format msgid "Not used\n" msgstr "" -#: readelf.c:16807 +#: readelf.c:17180 #, c-format msgid "2 bytes\n" msgstr "" -#: readelf.c:16810 +#: readelf.c:17183 #, c-format msgid "4 bytes\n" msgstr "" -#: readelf.c:16827 readelf.c:16844 readelf.c:16918 readelf.c:16938 +#: readelf.c:17200 readelf.c:17217 readelf.c:17291 readelf.c:17311 #, c-format msgid "16-byte\n" msgstr "" -#: readelf.c:16858 +#: readelf.c:17231 #, c-format msgid "DSBT addressing not used\n" msgstr "" -#: readelf.c:16861 +#: readelf.c:17234 #, c-format msgid "DSBT addressing used\n" msgstr "" -#: readelf.c:16875 +#: readelf.c:17248 #, c-format msgid "Data addressing position-dependent\n" msgstr "" -#: readelf.c:16878 +#: readelf.c:17251 #, c-format msgid "Data addressing position-independent, GOT near DP\n" msgstr "" -#: readelf.c:16881 +#: readelf.c:17254 #, c-format msgid "Data addressing position-independent, GOT far from DP\n" msgstr "" -#: readelf.c:16895 +#: readelf.c:17268 #, c-format msgid "Code addressing position-dependent\n" msgstr "" -#: readelf.c:16898 +#: readelf.c:17271 #, c-format msgid "Code addressing position-independent\n" msgstr "" -#: readelf.c:17052 +#: readelf.c:17425 #, c-format msgid "MSP430\n" msgstr "" -#: readelf.c:17053 +#: readelf.c:17426 #, c-format msgid "MSP430X\n" msgstr "" -#: readelf.c:17064 readelf.c:17076 +#: readelf.c:17437 readelf.c:17449 #, c-format msgid "Small\n" msgstr "" -#: readelf.c:17065 readelf.c:17077 +#: readelf.c:17438 readelf.c:17450 #, c-format msgid "Large\n" msgstr "" -#: readelf.c:17078 +#: readelf.c:17451 #, c-format msgid "Restricted Large\n" msgstr "" -#: readelf.c:17084 +#: readelf.c:17457 #, c-format msgid " : " msgstr "" -#: readelf.c:17130 +#: readelf.c:17503 #, c-format msgid "Any Region\n" msgstr "" -#: readelf.c:17133 +#: readelf.c:17506 #, c-format msgid "Lower Region Only\n" msgstr "" -#: readelf.c:17192 +#: readelf.c:17565 #, c-format msgid "%u\n" msgstr "" -#: readelf.c:17199 +#: readelf.c:17572 #, c-format msgid "No unaligned access\n" msgstr "" -#: readelf.c:17202 +#: readelf.c:17575 #, c-format msgid "Unaligned access\n" msgstr "" -#: readelf.c:17208 +#: readelf.c:17581 #, c-format msgid "%u-bytes\n" msgstr "" -#: readelf.c:17347 +#: readelf.c:17723 msgid "attributes" msgstr "" -#: readelf.c:17359 +#: readelf.c:17735 #, c-format msgid "Unknown attributes version '%c'(%d) - expecting 'A'\n" msgstr "" -#: readelf.c:17378 +#: readelf.c:17754 msgid "Tag section ends prematurely\n" msgstr "" -#: readelf.c:17387 +#: readelf.c:17763 #, c-format msgid "Bad attribute length (%u > %u)\n" msgstr "" -#: readelf.c:17395 +#: readelf.c:17771 #, c-format msgid "Attribute length of %u is too small\n" msgstr "" -#: readelf.c:17406 +#: readelf.c:17782 msgid "Corrupt attribute section name\n" msgstr "" -#: readelf.c:17411 +#: readelf.c:17787 #, c-format msgid "Attribute Section: " msgstr "" -#: readelf.c:17438 +#: readelf.c:17814 msgid "Unused bytes at end of section\n" msgstr "" -#: readelf.c:17448 +#: readelf.c:17824 #, c-format msgid "Bad subsection length (%u > %u)\n" msgstr "" -#: readelf.c:17456 +#: readelf.c:17832 #, c-format msgid "Bad subsection length (%u < 6)\n" msgstr "" -#: readelf.c:17471 +#: readelf.c:17847 #, c-format msgid "File Attributes\n" msgstr "" -#: readelf.c:17474 +#: readelf.c:17850 #, c-format msgid "Section Attributes:" msgstr "" -#: readelf.c:17477 +#: readelf.c:17853 #, c-format msgid "Symbol Attributes:" msgstr "" -#: readelf.c:17490 +#: readelf.c:17866 #, c-format msgid "Unknown tag: %d\n" msgstr "" -#: readelf.c:17511 +#: readelf.c:17887 #, c-format msgid " Unknown attribute:\n" msgstr "" -#: readelf.c:17553 +#: readelf.c:17929 msgid "MIPS GOT entry extends beyond the end of available data\n" msgstr "" -#: readelf.c:17636 readelf.c:17705 +#: readelf.c:18012 readelf.c:18081 msgid "Unknown" msgstr "" -#: readelf.c:17752 +#: readelf.c:18128 msgid "Corrupt MIPS ABI Flags section.\n" msgstr "" -#: readelf.c:17758 +#: readelf.c:18134 msgid "MIPS ABI Flags section" msgstr "" -#: readelf.c:17817 readelf.c:18400 +#: readelf.c:18193 readelf.c:18775 msgid "Global Offset Table data" msgstr "" -#: readelf.c:17821 +#: readelf.c:18197 #, c-format msgid "" "\n" "Static GOT:\n" msgstr "" -#: readelf.c:17822 readelf.c:18405 +#: readelf.c:18198 readelf.c:18780 #, c-format msgid " Canonical gp value: " msgstr "" -#: readelf.c:17836 readelf.c:18409 readelf.c:18539 +#: readelf.c:18212 readelf.c:18784 readelf.c:18914 #, c-format msgid " Reserved entries:\n" msgstr "" -#: readelf.c:17837 +#: readelf.c:18213 #, c-format msgid " %*s %10s %*s\n" msgstr "" -#: readelf.c:17838 readelf.c:17868 readelf.c:18411 readelf.c:18439 -#: readelf.c:18457 readelf.c:18541 readelf.c:18550 +#: readelf.c:18214 readelf.c:18244 readelf.c:18786 readelf.c:18814 +#: readelf.c:18832 readelf.c:18916 readelf.c:18925 msgid "Address" msgstr "" -#: readelf.c:17838 readelf.c:17868 readelf.c:18411 readelf.c:18439 -#: readelf.c:18458 +#: readelf.c:18214 readelf.c:18244 readelf.c:18786 readelf.c:18814 +#: readelf.c:18833 msgid "Access" msgstr "" -#: readelf.c:17839 readelf.c:17869 +#: readelf.c:18215 readelf.c:18245 msgid "Value" msgstr "" -#: readelf.c:17866 readelf.c:18437 +#: readelf.c:18242 readelf.c:18812 #, c-format msgid " Local entries:\n" msgstr "" -#: readelf.c:17948 readelf.c:18656 +#: readelf.c:18324 readelf.c:19031 msgid "liblist section data" msgstr "" -#: readelf.c:17951 +#: readelf.c:18327 #, c-format msgid "" "\n" @@ -9260,42 +9261,42 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:17955 +#: readelf.c:18331 msgid "" " Library Time Stamp Checksum Version Flags\n" msgstr "" -#: readelf.c:17981 +#: readelf.c:18357 #, c-format msgid "" msgstr "" -#: readelf.c:17986 +#: readelf.c:18362 msgid " NONE" msgstr "" -#: readelf.c:18037 +#: readelf.c:18412 msgid "No MIPS_OPTIONS header found\n" msgstr "" -#: readelf.c:18043 +#: readelf.c:18418 msgid "The MIPS options section is too small.\n" msgstr "" -#: readelf.c:18048 +#: readelf.c:18423 msgid "options" msgstr "" -#: readelf.c:15846 +#: readelf.c:16687 msgid "Out of memory allocating space for MIPS options\n" msgstr "" -#: readelf.c:18067 +#: readelf.c:18442 #, c-format msgid "Invalid size (%u) for MIPS option\n" msgstr "" -#: readelf.c:18076 +#: readelf.c:18451 #, c-format msgid "" "\n" @@ -9306,28 +9307,28 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:18114 readelf.c:18146 +#: readelf.c:18489 readelf.c:18521 msgid "Truncated MIPS REGINFO option\n" msgstr "" -#: readelf.c:18282 +#: readelf.c:18657 msgid "conflict list found without a dynamic symbol table\n" msgstr "" -#: readelf.c:18290 +#: readelf.c:18665 #, c-format msgid "Overlarge number of conflicts detected: %lx\n" msgstr "" -#: readelf.c:18298 +#: readelf.c:18673 msgid "Out of memory allocating space for dynamic conflicts\n" msgstr "" -#: readelf.c:18308 readelf.c:18326 +#: readelf.c:18683 readelf.c:18701 msgid "conflict" msgstr "" -#: readelf.c:18339 +#: readelf.c:18714 #, c-format msgid "" "\n" @@ -9338,124 +9339,124 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:18343 +#: readelf.c:18718 msgid " Num: Index Value Name" msgstr "" -#: readelf.c:18350 +#: readelf.c:18725 #, c-format msgid "" msgstr "" -#: readelf.c:18361 readelf.c:18487 readelf.c:18575 +#: readelf.c:18736 readelf.c:18862 readelf.c:18950 #, c-format msgid "" msgstr "" -#: readelf.c:18384 +#: readelf.c:18759 #, c-format msgid "" "The GOT symbol offset (%lu) is greater than the symbol table size (%lu)\n" msgstr "" -#: readelf.c:18393 +#: readelf.c:18768 #, c-format msgid "Too many GOT symbols: %lu\n" msgstr "" -#: readelf.c:18404 +#: readelf.c:18779 #, c-format msgid "" "\n" "Primary GOT:\n" msgstr "" -#: readelf.c:18410 +#: readelf.c:18785 #, c-format msgid " %*s %10s %*s Purpose\n" msgstr "" -#: readelf.c:18412 readelf.c:18440 readelf.c:18459 readelf.c:18541 -#: readelf.c:18551 +#: readelf.c:18787 readelf.c:18815 readelf.c:18834 readelf.c:18916 +#: readelf.c:18926 msgid "Initial" msgstr "" -#: readelf.c:18414 +#: readelf.c:18789 #, c-format msgid " Lazy resolver\n" msgstr "" -#: readelf.c:18429 +#: readelf.c:18804 #, c-format msgid " Module pointer (GNU extension)\n" msgstr "" -#: readelf.c:18455 +#: readelf.c:18830 #, c-format msgid " Global entries:\n" msgstr "" -#: readelf.c:18460 readelf.c:18552 +#: readelf.c:18835 readelf.c:18927 msgid "Sym.Val." msgstr "" #. Note for translators: "Ndx" = abbreviated form of "Index". -#: readelf.c:18463 readelf.c:18552 +#: readelf.c:18838 readelf.c:18927 msgid "Ndx" msgstr "" -#: readelf.c:18463 readelf.c:18552 +#: readelf.c:18838 readelf.c:18927 msgid "Name" msgstr "" -#: readelf.c:18473 +#: readelf.c:18848 #, c-format msgid "" msgstr "" -#: readelf.c:18490 +#: readelf.c:18865 #, c-format msgid "" msgstr "" -#: readelf.c:18531 +#: readelf.c:18906 msgid "Procedure Linkage Table data" msgstr "" -#: readelf.c:18540 +#: readelf.c:18915 #, c-format msgid " %*s %*s Purpose\n" msgstr "" -#: readelf.c:18543 +#: readelf.c:18918 #, c-format msgid " PLT lazy resolver\n" msgstr "" -#: readelf.c:18545 +#: readelf.c:18920 #, c-format msgid " Module pointer\n" msgstr "" -#: readelf.c:18548 +#: readelf.c:18923 #, c-format msgid " Entries:\n" msgstr "" -#: readelf.c:18562 +#: readelf.c:18937 #, c-format msgid "" msgstr "" -#: readelf.c:18601 +#: readelf.c:18976 msgid "NDS32 elf flags section" msgstr "" -#: readelf.c:18667 +#: readelf.c:19042 msgid "liblist string table" msgstr "" -#: readelf.c:18679 +#: readelf.c:19054 #, c-format msgid "" "\n" @@ -9466,391 +9467,391 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:18685 +#: readelf.c:19060 msgid "" " Library Time Stamp Checksum Version Flags" msgstr "" -#: readelf.c:18735 +#: readelf.c:19110 msgid "NT_AUXV (auxiliary vector)" msgstr "" -#: readelf.c:18737 +#: readelf.c:19112 msgid "NT_PRSTATUS (prstatus structure)" msgstr "" -#: readelf.c:18739 +#: readelf.c:19114 msgid "NT_FPREGSET (floating point registers)" msgstr "" -#: readelf.c:18741 +#: readelf.c:19116 msgid "NT_PRPSINFO (prpsinfo structure)" msgstr "" -#: readelf.c:18743 +#: readelf.c:19118 msgid "NT_TASKSTRUCT (task structure)" msgstr "" -#: readelf.c:18747 +#: readelf.c:19122 msgid "NT_PRXFPREG (user_xfpregs structure)" msgstr "" -#: readelf.c:18749 +#: readelf.c:19124 msgid "NT_PPC_VMX (ppc Altivec registers)" msgstr "" -#: readelf.c:18751 +#: readelf.c:19126 msgid "NT_PPC_VSX (ppc VSX registers)" msgstr "" -#: readelf.c:18753 +#: readelf.c:19128 msgid "NT_PPC_TAR (ppc TAR register)" msgstr "" -#: readelf.c:18755 +#: readelf.c:19130 msgid "NT_PPC_PPR (ppc PPR register)" msgstr "" -#: readelf.c:18757 +#: readelf.c:19132 msgid "NT_PPC_DSCR (ppc DSCR register)" msgstr "" -#: readelf.c:18759 +#: readelf.c:19134 msgid "NT_PPC_EBB (ppc EBB registers)" msgstr "" -#: readelf.c:18761 +#: readelf.c:19136 msgid "NT_PPC_PMU (ppc PMU registers)" msgstr "" -#: readelf.c:18763 +#: readelf.c:19138 msgid "NT_PPC_TM_CGPR (ppc checkpointed GPR registers)" msgstr "" -#: readelf.c:18765 +#: readelf.c:19140 msgid "NT_PPC_TM_CFPR (ppc checkpointed floating point registers)" msgstr "" -#: readelf.c:18767 +#: readelf.c:19142 msgid "NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)" msgstr "" -#: readelf.c:18769 +#: readelf.c:19144 msgid "NT_PPC_TM_CVSX (ppc checkpointed VSX registers)" msgstr "" -#: readelf.c:18771 +#: readelf.c:19146 msgid "NT_PPC_TM_SPR (ppc TM special purpose registers)" msgstr "" -#: readelf.c:18773 +#: readelf.c:19148 msgid "NT_PPC_TM_CTAR (ppc checkpointed TAR register)" msgstr "" -#: readelf.c:18775 +#: readelf.c:19150 msgid "NT_PPC_TM_CPPR (ppc checkpointed PPR register)" msgstr "" -#: readelf.c:18777 +#: readelf.c:19152 msgid "NT_PPC_TM_CDSCR (ppc checkpointed DSCR register)" msgstr "" -#: readelf.c:18779 +#: readelf.c:19154 msgid "NT_386_TLS (x86 TLS information)" msgstr "" -#: readelf.c:18781 +#: readelf.c:19156 msgid "NT_386_IOPERM (x86 I/O permissions)" msgstr "" -#: readelf.c:18783 +#: readelf.c:19158 msgid "NT_X86_XSTATE (x86 XSAVE extended state)" msgstr "" -#: readelf.c:18787 +#: readelf.c:19162 msgid "NT_S390_HIGH_GPRS (s390 upper register halves)" msgstr "" -#: readelf.c:18789 +#: readelf.c:19164 msgid "NT_S390_TIMER (s390 timer register)" msgstr "" -#: readelf.c:18791 +#: readelf.c:19166 msgid "NT_S390_TODCMP (s390 TOD comparator register)" msgstr "" -#: readelf.c:18793 +#: readelf.c:19168 msgid "NT_S390_TODPREG (s390 TOD programmable register)" msgstr "" -#: readelf.c:18795 +#: readelf.c:19170 msgid "NT_S390_CTRS (s390 control registers)" msgstr "" -#: readelf.c:18797 +#: readelf.c:19172 msgid "NT_S390_PREFIX (s390 prefix register)" msgstr "" -#: readelf.c:18799 +#: readelf.c:19174 msgid "NT_S390_LAST_BREAK (s390 last breaking event address)" msgstr "" -#: readelf.c:18801 +#: readelf.c:19176 msgid "NT_S390_SYSTEM_CALL (s390 system call restart data)" msgstr "" -#: readelf.c:18803 +#: readelf.c:19178 msgid "NT_S390_TDB (s390 transaction diagnostic block)" msgstr "" -#: readelf.c:18805 +#: readelf.c:19180 msgid "NT_S390_VXRS_LOW (s390 vector registers 0-15 upper half)" msgstr "" -#: readelf.c:18807 +#: readelf.c:19182 msgid "NT_S390_VXRS_HIGH (s390 vector registers 16-31)" msgstr "" -#: readelf.c:18809 +#: readelf.c:19184 msgid "NT_S390_GS_CB (s390 guarded-storage registers)" msgstr "" -#: readelf.c:18811 +#: readelf.c:19186 msgid "NT_S390_GS_BC (s390 guarded-storage broadcast control)" msgstr "" -#: readelf.c:18813 +#: readelf.c:19188 msgid "NT_ARM_VFP (arm VFP registers)" msgstr "" -#: readelf.c:18815 +#: readelf.c:19190 msgid "NT_ARM_TLS (AArch TLS registers)" msgstr "" -#: readelf.c:18817 +#: readelf.c:19192 msgid "NT_ARM_HW_BREAK (AArch hardware breakpoint registers)" msgstr "" -#: readelf.c:18819 +#: readelf.c:19194 msgid "NT_ARM_HW_WATCH (AArch hardware watchpoint registers)" msgstr "" -#: readelf.c:18831 +#: readelf.c:19212 msgid "NT_PSTATUS (pstatus structure)" msgstr "" -#: readelf.c:18833 +#: readelf.c:19214 msgid "NT_FPREGS (floating point registers)" msgstr "" -#: readelf.c:18835 +#: readelf.c:19216 msgid "NT_PSINFO (psinfo structure)" msgstr "" -#: readelf.c:18837 +#: readelf.c:19218 msgid "NT_LWPSTATUS (lwpstatus_t structure)" msgstr "" -#: readelf.c:18839 +#: readelf.c:19220 msgid "NT_LWPSINFO (lwpsinfo_t structure)" msgstr "" -#: readelf.c:18841 +#: readelf.c:19222 msgid "NT_WIN32PSTATUS (win32_pstatus structure)" msgstr "" -#: readelf.c:18843 +#: readelf.c:19224 msgid "NT_SIGINFO (siginfo_t data)" msgstr "" -#: readelf.c:18845 +#: readelf.c:19226 msgid "NT_FILE (mapped files)" msgstr "" -#: readelf.c:18855 +#: readelf.c:19234 msgid "NT_VERSION (version)" msgstr "" -#: readelf.c:18857 +#: readelf.c:19236 msgid "NT_ARCH (architecture)" msgstr "" -#: readelf.c:18859 +#: readelf.c:19238 msgid "OPEN" msgstr "" -#: readelf.c:18861 +#: readelf.c:19240 msgid "func" msgstr "" -#: readelf.c:18868 readelf.c:18987 readelf.c:19689 readelf.c:19857 -#: readelf.c:19934 readelf.c:20051 +#: readelf.c:19249 readelf.c:19368 readelf.c:20109 readelf.c:20277 +#: readelf.c:20374 readelf.c:20502 #, c-format msgid "Unknown note type: (0x%08x)" msgstr "" -#: readelf.c:18889 +#: readelf.c:19270 #, c-format msgid " Cannot decode 64-bit note in 32-bit build\n" msgstr "" -#: readelf.c:18897 +#: readelf.c:19278 msgid " Malformed note - too short for header\n" msgstr "" -#: readelf.c:18906 +#: readelf.c:19287 msgid " Malformed note - does not end with \\0\n" msgstr "" -#: readelf.c:18919 +#: readelf.c:19300 msgid " Malformed note - too short for supplied file count\n" msgstr "" -#: readelf.c:18923 +#: readelf.c:19304 #, c-format msgid " Page size: " msgstr "" -#: readelf.c:18927 +#: readelf.c:19308 #, c-format msgid " %*s%*s%*s\n" msgstr "" -#: readelf.c:18928 +#: readelf.c:19309 msgid "Start" msgstr "" -#: readelf.c:18929 +#: readelf.c:19310 msgid "End" msgstr "" -#: readelf.c:18930 +#: readelf.c:19311 msgid "Page Offset" msgstr "" -#: readelf.c:18938 +#: readelf.c:19319 msgid " Malformed note - filenames end too early\n" msgstr "" -#: readelf.c:18970 +#: readelf.c:19351 msgid "NT_GNU_ABI_TAG (ABI version tag)" msgstr "" -#: readelf.c:18972 +#: readelf.c:19353 msgid "NT_GNU_HWCAP (DSO-supplied software HWCAP info)" msgstr "" -#: readelf.c:18974 +#: readelf.c:19355 msgid "NT_GNU_BUILD_ID (unique build ID bitstring)" msgstr "" -#: readelf.c:18976 +#: readelf.c:19357 msgid "NT_GNU_GOLD_VERSION (gold version)" msgstr "" -#: readelf.c:18978 +#: readelf.c:19359 msgid "NT_GNU_PROPERTY_TYPE_0" msgstr "" -#: readelf.c:18980 +#: readelf.c:19361 msgid "NT_GNU_BUILD_ATTRIBUTE_OPEN" msgstr "" -#: readelf.c:18982 +#: readelf.c:19363 msgid "NT_GNU_BUILD_ATTRIBUTE_FUNC" msgstr "" -#: readelf.c:19071 readelf.c:19202 readelf.c:19239 +#: readelf.c:19452 readelf.c:19583 readelf.c:19620 #, c-format msgid "" msgstr "" -#: readelf.c:19329 +#: readelf.c:19732 #, c-format msgid " Properties: " msgstr "" -#: readelf.c:19333 +#: readelf.c:19736 #, c-format msgid "\n" msgstr "" -#: readelf.c:19345 +#: readelf.c:19748 #, c-format msgid "\n" msgstr "" -#: readelf.c:19356 +#: readelf.c:19759 #, c-format msgid "\n" msgstr "" -#: readelf.c:19378 readelf.c:19432 readelf.c:19454 +#: readelf.c:19781 readelf.c:19835 readelf.c:19857 #, c-format msgid "x86 ISA used: " msgstr "" -#: readelf.c:19389 readelf.c:19443 readelf.c:19465 +#: readelf.c:19792 readelf.c:19846 readelf.c:19868 #, c-format msgid "x86 ISA needed: " msgstr "" -#: readelf.c:19400 +#: readelf.c:19803 #, c-format msgid "x86 feature: " msgstr "" -#: readelf.c:19411 +#: readelf.c:19814 #, c-format msgid "x86 feature used: " msgstr "" -#: readelf.c:19422 +#: readelf.c:19825 #, c-format msgid "x86 feature needed: " msgstr "" -#: readelf.c:19484 readelf.c:19498 readelf.c:19506 readelf.c:19520 +#: readelf.c:19887 readelf.c:19901 readelf.c:19909 readelf.c:19940 #, c-format msgid " " msgstr "" -#: readelf.c:19496 +#: readelf.c:19899 #, c-format msgid "stack size: " msgstr "" -#: readelf.c:19530 +#: readelf.c:19950 #, c-format msgid "\n" msgstr "" -#: readelf.c:19615 +#: readelf.c:20035 #, c-format msgid " OS: %s, ABI: %ld.%ld.%ld\n" msgstr "" -#: readelf.c:19624 +#: readelf.c:20044 #, c-format msgid " Version: " msgstr "" @@ -9860,490 +9861,490 @@ #. is a series of entries, where each entry is a single byte followed #. by a nul terminated string. The byte gives the bit number to test #. if enabled in the bitmask. -#: readelf.c:19640 +#: readelf.c:20060 #, c-format msgid " Hardware Capabilities: " msgstr "" -#: readelf.c:19643 +#: readelf.c:20063 msgid "\n" msgstr "" -#: readelf.c:19648 +#: readelf.c:20068 #, c-format msgid "num entries: %ld, enabled mask: %lx\n" msgstr "" -#: readelf.c:19664 +#: readelf.c:20084 #, c-format msgid " Description data: " msgstr "" -#: readelf.c:19682 +#: readelf.c:20102 msgid "Alignment of 8-byte objects" msgstr "" -#: readelf.c:19683 +#: readelf.c:20103 msgid "Sizeof double and long double" msgstr "" -#: readelf.c:19684 +#: readelf.c:20104 msgid "Type of FPU support needed" msgstr "" -#: readelf.c:19685 +#: readelf.c:20105 msgid "Use of SIMD instructions" msgstr "" -#: readelf.c:19686 +#: readelf.c:20106 msgid "Use of cache" msgstr "" -#: readelf.c:19687 +#: readelf.c:20107 msgid "Use of MMU" msgstr "" -#: readelf.c:19723 +#: readelf.c:20143 #, c-format msgid "4-bytes\n" msgstr "" -#: readelf.c:19724 +#: readelf.c:20144 #, c-format msgid "8-bytes\n" msgstr "" -#: readelf.c:19731 +#: readelf.c:20151 #, c-format msgid "FPU-2.0\n" msgstr "" -#: readelf.c:19732 +#: readelf.c:20152 #, c-format msgid "FPU-3.0\n" msgstr "" -#: readelf.c:19741 +#: readelf.c:20161 #, c-format msgid "yes\n" msgstr "" -#: readelf.c:19751 +#: readelf.c:20171 #, c-format msgid "unknown value: %x\n" msgstr "" -#: readelf.c:19807 +#: readelf.c:20227 msgid "NT_THRMISC (thrmisc structure)" msgstr "" -#: readelf.c:19809 +#: readelf.c:20229 msgid "NT_PROCSTAT_PROC (proc data)" msgstr "" -#: readelf.c:19811 +#: readelf.c:20231 msgid "NT_PROCSTAT_FILES (files data)" msgstr "" -#: readelf.c:19813 +#: readelf.c:20233 msgid "NT_PROCSTAT_VMMAP (vmmap data)" msgstr "" -#: readelf.c:19815 +#: readelf.c:20235 msgid "NT_PROCSTAT_GROUPS (groups data)" msgstr "" -#: readelf.c:19817 +#: readelf.c:20237 msgid "NT_PROCSTAT_UMASK (umask data)" msgstr "" -#: readelf.c:19819 +#: readelf.c:20239 msgid "NT_PROCSTAT_RLIMIT (rlimit data)" msgstr "" -#: readelf.c:19821 +#: readelf.c:20241 msgid "NT_PROCSTAT_OSREL (osreldate data)" msgstr "" -#: readelf.c:19823 +#: readelf.c:20243 msgid "NT_PROCSTAT_PSSTRINGS (ps_strings data)" msgstr "" -#: readelf.c:19825 +#: readelf.c:20245 msgid "NT_PROCSTAT_AUXV (auxv data)" msgstr "" -#: readelf.c:19827 +#: readelf.c:20247 msgid "NT_PTLWPINFO (ptrace_lwpinfo structure)" msgstr "" #. NetBSD core "procinfo" structure. -#: readelf.c:19841 +#: readelf.c:20261 msgid "NetBSD procinfo structure" msgstr "" -#: readelf.c:19844 +#: readelf.c:20264 msgid "NetBSD ELF auxiliary vector data" msgstr "" -#: readelf.c:19876 readelf.c:19893 readelf.c:19907 +#: readelf.c:20296 readelf.c:20313 readelf.c:20327 msgid "PT_GETREGS (reg structure)" msgstr "" -#: readelf.c:19878 readelf.c:19895 readelf.c:19909 +#: readelf.c:20298 readelf.c:20315 readelf.c:20329 msgid "PT_GETFPREGS (fpreg structure)" msgstr "" -#: readelf.c:19891 +#: readelf.c:20311 msgid "PT___GETREGS40 (old reg structure)" msgstr "" -#: readelf.c:19928 +#: readelf.c:20368 msgid "NT_STAPSDT (SystemTap probe descriptors)" msgstr "" -#: readelf.c:19996 +#: readelf.c:20436 #, c-format msgid " Provider: %s\n" msgstr "" -#: readelf.c:19997 +#: readelf.c:20437 #, c-format msgid " Name: %s\n" msgstr "" -#: readelf.c:19998 +#: readelf.c:20438 #, c-format msgid " Location: " msgstr "" -#: readelf.c:20000 +#: readelf.c:20440 #, c-format msgid ", Base: " msgstr "" -#: readelf.c:20002 +#: readelf.c:20442 #, c-format msgid ", Semaphore: " msgstr "" -#: readelf.c:20005 +#: readelf.c:20445 #, c-format msgid " Arguments: %s\n" msgstr "" -#: readelf.c:20010 +#: readelf.c:20450 #, c-format msgid " \n" msgstr "" -#: readelf.c:20011 +#: readelf.c:20451 msgid "corrupt stapdt note - the data size is too small\n" msgstr "" -#: readelf.c:20023 +#: readelf.c:20474 msgid "NT_VMS_MHD (module header)" msgstr "" -#: readelf.c:20025 +#: readelf.c:20476 msgid "NT_VMS_LNM (language name)" msgstr "" -#: readelf.c:20027 +#: readelf.c:20478 msgid "NT_VMS_SRC (source files)" msgstr "" -#: readelf.c:20031 +#: readelf.c:20482 msgid "NT_VMS_EIDC (consistency check)" msgstr "" -#: readelf.c:20033 +#: readelf.c:20484 msgid "NT_VMS_FPMODE (FP mode)" msgstr "" -#: readelf.c:20037 +#: readelf.c:20488 msgid "NT_VMS_IMGNAM (image name)" msgstr "" -#: readelf.c:20039 +#: readelf.c:20490 msgid "NT_VMS_IMGID (image id)" msgstr "" -#: readelf.c:20041 +#: readelf.c:20492 msgid "NT_VMS_LINKID (link id)" msgstr "" -#: readelf.c:20043 +#: readelf.c:20494 msgid "NT_VMS_IMGBID (build id)" msgstr "" -#: readelf.c:20045 +#: readelf.c:20496 msgid "NT_VMS_GSTNAM (sym table name)" msgstr "" -#: readelf.c:20072 +#: readelf.c:20523 #, c-format msgid " Creation date : %.17s\n" msgstr "" -#: readelf.c:20073 +#: readelf.c:20524 #, c-format msgid " Last patch date: %.17s\n" msgstr "" -#: readelf.c:20076 +#: readelf.c:20527 #, c-format msgid " Module name : %s\n" msgstr "" -#: readelf.c:20078 +#: readelf.c:20529 #, c-format msgid " Module version : %s\n" msgstr "" -#: readelf.c:20080 readelf.c:20085 +#: readelf.c:20531 readelf.c:20536 #, c-format msgid " Module version : \n" msgstr "" -#: readelf.c:20084 +#: readelf.c:20535 #, c-format msgid " Module name : \n" msgstr "" -#: readelf.c:20090 +#: readelf.c:20541 #, c-format msgid " Language: %.*s\n" msgstr "" -#: readelf.c:20095 +#: readelf.c:20546 #, c-format msgid " Floating Point mode: " msgstr "" -#: readelf.c:20105 +#: readelf.c:20556 #, c-format msgid " Link time: " msgstr "" -#: readelf.c:20116 +#: readelf.c:20567 #, c-format msgid " Patch time: " msgstr "" -#: readelf.c:20130 +#: readelf.c:20581 #, c-format msgid " Major id: %u, minor id: %u\n" msgstr "" -#: readelf.c:20133 +#: readelf.c:20584 #, c-format msgid " Last modified : " msgstr "" -#: readelf.c:20136 +#: readelf.c:20587 #, c-format msgid "" "\n" " Link flags : " msgstr "" -#: readelf.c:20139 +#: readelf.c:20590 #, c-format msgid " Header flags: 0x%08x\n" msgstr "" -#: readelf.c:20141 +#: readelf.c:20592 #, c-format msgid " Image id : %.*s\n" msgstr "" -#: readelf.c:20146 +#: readelf.c:20597 #, c-format msgid " Image name: %.*s\n" msgstr "" -#: readelf.c:20150 +#: readelf.c:20601 #, c-format msgid " Global symbol table name: %.*s\n" msgstr "" -#: readelf.c:20154 +#: readelf.c:20605 #, c-format msgid " Image id: %.*s\n" msgstr "" -#: readelf.c:20158 +#: readelf.c:20609 #, c-format msgid " Linker id: %.*s\n" msgstr "" -#: readelf.c:20168 +#: readelf.c:20619 #, c-format msgid " \n" msgstr "" -#: readelf.c:20169 +#: readelf.c:20620 msgid "corrupt IA64 note: data size is too small\n" msgstr "" -#: readelf.c:20336 readelf.c:20344 +#: readelf.c:20787 readelf.c:20795 #, c-format msgid " Applies to region from %#lx to %#lx\n" msgstr "" -#: readelf.c:20339 readelf.c:20346 +#: readelf.c:20790 readelf.c:20797 #, c-format msgid " Applies to region from %#lx\n" msgstr "" -#: readelf.c:20366 +#: readelf.c:20817 #, c-format msgid " \n" msgstr "" -#: readelf.c:20367 +#: readelf.c:20818 #, c-format msgid " " msgstr "" -#: readelf.c:20393 +#: readelf.c:20844 #, c-format msgid "Gap in build notes detected from %#lx to %#lx\n" msgstr "" -#: readelf.c:20396 readelf.c:20407 +#: readelf.c:20847 readelf.c:20858 #, c-format msgid " Applies to region from %#lx" msgstr "" -#: readelf.c:20401 readelf.c:20412 +#: readelf.c:20852 readelf.c:20863 #, c-format msgid " to %#lx" msgstr "" -#: readelf.c:20418 +#: readelf.c:20869 #, c-format msgid " (%s)" msgstr "" -#: readelf.c:20439 readelf.c:20454 +#: readelf.c:20890 readelf.c:20905 #, c-format msgid "corrupt name field in GNU build attribute note: size = %ld\n" msgstr "" -#: readelf.c:20440 readelf.c:20455 +#: readelf.c:20891 readelf.c:20906 msgid " " msgstr "" -#: readelf.c:20474 +#: readelf.c:20925 #, c-format msgid "unrecognised attribute type in name field: %d\n" msgstr "" -#: readelf.c:20475 +#: readelf.c:20926 msgid "" msgstr "" -#: readelf.c:20485 +#: readelf.c:20936 msgid "" msgstr "" -#: readelf.c:20490 +#: readelf.c:20941 msgid "" msgstr "" -#: readelf.c:20495 +#: readelf.c:20946 msgid "" msgstr "" -#: readelf.c:20500 +#: readelf.c:20951 msgid "" msgstr "" -#: readelf.c:20505 +#: readelf.c:20956 msgid "" msgstr "" -#: readelf.c:20510 +#: readelf.c:20961 msgid "" msgstr "" -#: readelf.c:20515 +#: readelf.c:20966 msgid "" msgstr "" -#: readelf.c:20520 +#: readelf.c:20971 msgid "" msgstr "" -#: readelf.c:20539 +#: readelf.c:20990 #, c-format msgid "unrecognised byte in name field: %d\n" msgstr "" -#: readelf.c:20540 +#: readelf.c:20991 #, c-format msgid "" msgstr "" -#: readelf.c:20552 +#: readelf.c:21003 #, c-format msgid "attribute does not have an expected type (%c)\n" msgstr "" -#: readelf.c:20556 +#: readelf.c:21007 #, c-format msgid "corrupt name field: namesz: %lu but parsing gets to %ld\n" msgstr "" -#: readelf.c:20583 +#: readelf.c:21034 #, c-format msgid "corrupt numeric name field: too many bytes in the value: %x\n" msgstr "" -#: readelf.c:20755 +#: readelf.c:21212 #, c-format msgid " description data: " msgstr "" -#: readelf.c:20797 +#: readelf.c:21254 msgid "notes" msgstr "" -#: readelf.c:20346 +#: readelf.c:19336 #, c-format msgid "" "\n" "Displaying notes found in: %s\n" msgstr "" -#: readelf.c:20348 +#: readelf.c:19338 #, c-format msgid "" "\n" "Displaying notes found at file offset 0x%08lx with length 0x%08lx:\n" msgstr "" -#: readelf.c:20823 +#: readelf.c:21280 #, c-format msgid "Corrupt note: alignment %ld, expecting 4 or 8\n" msgstr "" -#: readelf.c:20829 +#: readelf.c:21286 #, c-format msgid " %-20s %-10s\tDescription\n" msgstr "" -#: readelf.c:20829 +#: readelf.c:21286 msgid "Owner" msgstr "" -#: readelf.c:20829 +#: readelf.c:21286 msgid "Data size" msgstr "" -#: readelf.c:20847 readelf.c:20876 +#: readelf.c:21304 readelf.c:21333 #, c-format msgid "Corrupt note: only %ld byte remains, not enough for a full note\n" msgid_plural "" @@ -10351,20 +10352,20 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:20904 +#: readelf.c:21361 #, c-format msgid "note with invalid namesz and/or descsz found at offset 0x%lx\n" msgstr "" -#: readelf.c:20924 +#: readelf.c:21381 msgid "Out of memory allocating space for inote name\n" msgstr "" -#: readelf.c:20984 +#: readelf.c:21441 msgid "v850 notes" msgstr "" -#: readelf.c:20991 +#: readelf.c:21448 #, c-format msgid "" "\n" @@ -10372,75 +10373,75 @@ "length 0x%lx:\n" msgstr "" -#: readelf.c:21008 +#: readelf.c:21465 #, c-format msgid "Corrupt note: name size is too big: %lx\n" msgstr "" -#: readelf.c:21018 +#: readelf.c:21475 #, c-format msgid "corrupt descsz found in note at offset 0x%lx\n" msgstr "" -#: readelf.c:21020 readelf.c:21033 +#: readelf.c:21477 readelf.c:21490 #, c-format msgid " type: 0x%lx, namesize: 0x%lx, descsize: 0x%lx\n" msgstr "" -#: readelf.c:21031 +#: readelf.c:21488 #, c-format msgid "corrupt namesz found in note at offset 0x%lx\n" msgstr "" -#: readelf.c:20646 +#: readelf.c:19639 #, c-format msgid "No note segments present in the core file.\n" msgstr "" -#: readelf.c:21122 +#: readelf.c:21579 #, c-format msgid " Unknown GNU attribute: %s\n" msgstr "" -#: readelf.c:21270 +#: readelf.c:21727 msgid "" "This instance of readelf has been built without support for a\n" "64 bit data type and so it cannot read 64 bit ELF files.\n" msgstr "" -#: readelf.c:21440 +#: readelf.c:21897 #, c-format msgid "%s: Failed to read file header\n" msgstr "" -#: readelf.c:21455 +#: readelf.c:21912 #, c-format msgid "" "\n" "File: %s\n" msgstr "" -#: readelf.c:21616 +#: readelf.c:22073 #, c-format msgid "%s: unable to dump the index as none was found\n" msgstr "" -#: readelf.c:21623 +#: readelf.c:22080 #, c-format msgid "Index of archive %s: (%lu entries, 0x%lx bytes in the symbol table)\n" msgstr "" -#: readelf.c:21647 +#: readelf.c:22104 #, c-format msgid "Contents of binary %s at offset " msgstr "" -#: readelf.c:21659 +#: readelf.c:22116 #, c-format msgid "%s: end of the symbol table reached before the end of the index\n" msgstr "" -#: readelf.c:21678 +#: readelf.c:22135 #, c-format msgid "" "%s: %ld byte remains in the symbol table, but without corresponding entries " @@ -10451,51 +10452,51 @@ msgstr[0] "" msgstr[1] "" -#: readelf.c:21691 +#: readelf.c:22148 #, c-format msgid "%s: failed to seek back to start of object files in the archive\n" msgstr "" -#: readelf.c:21785 readelf.c:21904 +#: readelf.c:22240 readelf.c:22359 #, c-format msgid "Input file '%s' is not readable.\n" msgstr "" -#: readelf.c:21813 +#: readelf.c:22268 #, c-format msgid "%s: contains corrupt thin archive: %s\n" msgstr "" -#: readelf.c:21831 +#: readelf.c:22286 #, c-format msgid "%s: failed to seek to archive member.\n" msgstr "" -#: readelf.c:21896 +#: readelf.c:22351 msgid "Out of memory allocating file data structure\n" msgstr "" -#: readelf.c:21933 +#: readelf.c:22388 #, c-format msgid "File %s is not an archive so its index cannot be displayed.\n" msgstr "" -#: readelf.c:22004 +#: readelf.c:22459 msgid "Nothing to do.\n" msgstr "" -#: rename.c:198 +#: rename.c:200 #, c-format msgid "%s: cannot set time: %s" msgstr "" #. We have to clean up here. -#: rename.c:195 rename.c:232 +#: rename.c:157 rename.c:195 #, c-format msgid "unable to rename '%s'; reason: %s" msgstr "" -#: rename.c:217 +#: rename.c:219 #, c-format msgid "unable to copy file '%s'; reason: %s" msgstr "" @@ -11093,77 +11094,77 @@ msgid "Type index number %d out of range\n" msgstr "" -#: stabs.c:3506 +#: stabs.c:3507 #, c-format msgid "Unrecognized XCOFF type %d\n" msgstr "" -#: stabs.c:3799 +#: stabs.c:3798 #, c-format msgid "bad mangled name `%s'\n" msgstr "" -#: stabs.c:3894 +#: stabs.c:3893 #, c-format msgid "no argument types in mangled string\n" msgstr "" -#: stabs.c:5242 +#: stabs.c:5241 #, c-format msgid "Demangled name is not a function\n" msgstr "" -#: stabs.c:5284 +#: stabs.c:5283 #, c-format msgid "Unexpected type in v3 arglist demangling\n" msgstr "" -#: stabs.c:5356 +#: stabs.c:5355 #, c-format msgid "Unrecognized demangle component %d\n" msgstr "" -#: stabs.c:5408 +#: stabs.c:5407 #, c-format msgid "Failed to print demangled template\n" msgstr "" -#: stabs.c:5488 +#: stabs.c:5487 #, c-format msgid "Couldn't get demangled builtin type\n" msgstr "" -#: stabs.c:5537 +#: stabs.c:5536 #, c-format msgid "Unexpected demangled varargs\n" msgstr "" -#: stabs.c:5544 +#: stabs.c:5543 #, c-format msgid "Unrecognized demangled builtin type\n" msgstr "" -#: strings.c:198 strings.c:265 +#: strings.c:229 strings.c:316 #, c-format msgid "invalid integer argument %s" msgstr "" -#: strings.c:268 +#: strings.c:319 #, c-format msgid "invalid minimum string length %d" msgstr "" -#: strings.c:339 +#: strings.c:390 #, c-format msgid "%s: Reading section %s failed: %s" msgstr "" -#: strings.c:678 +#: strings.c:1313 #, c-format msgid " Display printable strings in [file(s)] (stdin by default)\n" msgstr "" -#: strings.c:682 +#: strings.c:1317 #, c-format msgid "" " -a - --all Scan the entire file, not just the data section " @@ -11171,7 +11172,7 @@ " -d --data Only scan the data sections in the file\n" msgstr "" -#: strings.c:686 +#: strings.c:1321 #, c-format msgid "" " -a - --all Scan the entire file, not just the data section\n" @@ -11205,54 +11206,55 @@ msgid "*undefined*" msgstr "" -#: sysdump.c:57 +#. PR 28564 +#: sysdump.c:57 sysdump.c:66 msgid "*corrupt*" msgstr "" -#: sysdump.c:125 +#: sysdump.c:131 #, c-format msgid "SUM IS %x\n" msgstr "" #. PR 17512: file: id:000001,src:000002,op:flip1,pos:45. #. Prevent infinite loops re-reading beyond the end of the buffer. -#: sysdump.c:163 +#: sysdump.c:169 msgid "ICE: getINT: Out of buffer space" msgstr "" -#: sysdump.c:188 +#: sysdump.c:194 #, c-format msgid "Unsupported read size: %d" msgstr "" -#: sysdump.c:499 +#: sysdump.c:505 #, c-format msgid "GOT A %x\n" msgstr "" -#: sysdump.c:517 +#: sysdump.c:523 #, c-format msgid "WANTED %x!!\n" msgstr "" -#: sysdump.c:535 +#: sysdump.c:541 msgid "SYMBOL INFO" msgstr "" -#: sysdump.c:553 +#: sysdump.c:559 msgid "DERIVED TYPE" msgstr "" -#: sysdump.c:610 +#: sysdump.c:616 msgid "MODULE***\n" msgstr "" -#: sysdump.c:643 +#: sysdump.c:649 #, c-format msgid "Print a human readable interpretation of a SYSROFF object file\n" msgstr "" -#: sysdump.c:644 +#: sysdump.c:650 #, c-format msgid "" " The options are:\n" @@ -11260,7 +11262,7 @@ " -v --version Print the program's version number\n" msgstr "" -#: sysdump.c:710 +#: sysdump.c:716 #, c-format msgid "cannot open input file %s" msgstr "" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bison.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bison.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bison.po 2021-08-03 09:03:58.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bison.po 2022-02-11 23:13:53.000000000 +0000 @@ -17,10 +17,10 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" +"X-Launchpad-Export-Date: 2022-02-11 14:55+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: hr\n" #: src/complain.c:153 msgid "S/R conflicts (enabled by default)" @@ -111,8 +111,8 @@ msgid "duplicate directive: %s" msgstr "" -#: src/complain.c:619 src/complain.c:628 src/reader.c:135 src/symtab.c:327 -#: src/symtab.c:336 src/symtab.c:566 +#: src/complain.c:619 src/complain.c:628 src/reader.c:156 src/symtab.c:330 +#: src/symtab.c:339 src/symtab.c:569 msgid "previous declaration" msgstr "prethodna deklaracija" @@ -196,27 +196,27 @@ msgstr[0] "" msgstr[1] "" -#: src/files.c:139 +#: src/files.c:144 #, c-format msgid "%s: cannot open" msgstr "%s: ne mogu otvoriti" -#: src/files.c:155 +#: src/files.c:160 #, c-format msgid "input/output error" msgstr "ulazno/izlazna greška" -#: src/files.c:158 +#: src/files.c:163 #, c-format msgid "cannot close file" msgstr "ne mogu zatvoriti datoteku" -#: src/files.c:456 +#: src/files.c:510 #, c-format msgid "refusing to overwrite the input file %s" msgstr "odbijam pisati preko ulazne datoteke %s" -#: src/files.c:464 +#: src/files.c:518 #, c-format msgid "conflicting outputs to file %s" msgstr "konfliktni izlazi u datoteku %s" @@ -226,112 +226,112 @@ msgid "%s: cannot backup" msgstr "" -#: src/getargs.c:173 +#: src/getargs.c:186 msgid "colorize the output" msgstr "" -#: src/getargs.c:174 +#: src/getargs.c:187 msgid "don't colorize the output" msgstr "" -#: src/getargs.c:175 +#: src/getargs.c:188 msgid "colorize if the output device is a tty" msgstr "" #. TRANSLATORS: Use the same translation for WHEN as in the #. --color=WHEN help message. -#: src/getargs.c:196 +#: src/getargs.c:209 msgid "WHEN can be one of the following:" msgstr "" -#: src/getargs.c:209 +#: src/getargs.c:222 msgid "describe the states" msgstr "" -#: src/getargs.c:210 +#: src/getargs.c:223 msgid "complete the core item sets with their closure" msgstr "" -#: src/getargs.c:211 +#: src/getargs.c:224 msgid "explicitly associate lookahead tokens to items" msgstr "" -#: src/getargs.c:212 +#: src/getargs.c:225 msgid "describe shift/reduce conflicts solving" msgstr "" -#: src/getargs.c:214 +#: src/getargs.c:227 msgid "include all the above information" msgstr "" -#: src/getargs.c:215 +#: src/getargs.c:228 msgid "disable the report" msgstr "" #. TRANSLATORS: Use the same translation for THINGS as in the #. --report=THINGS help message. -#: src/getargs.c:238 +#: src/getargs.c:251 msgid "THINGS is a list of comma separated words that can include:" msgstr "" -#: src/getargs.c:301 +#: src/getargs.c:314 msgid "TRACES is a list of comma separated words that can include:" msgstr "" -#: src/getargs.c:313 +#: src/getargs.c:326 msgid "show errors with carets" msgstr "" -#: src/getargs.c:314 +#: src/getargs.c:327 msgid "show machine-readable fixes" msgstr "" -#: src/getargs.c:315 +#: src/getargs.c:328 msgid "do not generate any file" msgstr "" -#: src/getargs.c:316 +#: src/getargs.c:329 msgid "all of the above" msgstr "" -#: src/getargs.c:317 +#: src/getargs.c:330 msgid "disable all of the above" msgstr "" #. TRANSLATORS: Use the same translation for FEATURES as in the #. --feature=FEATURES help message. -#: src/getargs.c:339 +#: src/getargs.c:352 msgid "FEATURES is a list of comma separated words that can include:" msgstr "" -#: src/getargs.c:354 +#: src/getargs.c:367 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "" -#: src/getargs.c:363 +#: src/getargs.c:376 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Uporaba: %s [OPCIJA]... DATOTEKA\n" -#: src/getargs.c:364 +#: src/getargs.c:377 msgid "" "Generate a deterministic LR or generalized LR (GLR) parser employing\n" "LALR(1), IELR(1), or canonical LR(1) parser tables.\n" "\n" msgstr "" -#: src/getargs.c:370 +#: src/getargs.c:383 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obavezni argumenti dugačkih opcija također su obavezni za kratke opcije.\n" -#: src/getargs.c:373 +#: src/getargs.c:386 msgid "The same is true for optional arguments.\n" msgstr "Isto vrijedi i za opcionalne argumente.\n" -#: src/getargs.c:378 +#: src/getargs.c:391 msgid "" "Operation Modes:\n" " -h, --help display this help and exit\n" @@ -347,7 +347,7 @@ "\n" msgstr "" -#: src/getargs.c:394 +#: src/getargs.c:407 msgid "" "Diagnostics:\n" " -W, --warnings[=CATEGORY] report the warnings falling in CATEGORY\n" @@ -356,7 +356,7 @@ "\n" msgstr "" -#: src/getargs.c:408 +#: src/getargs.c:421 #, c-format msgid "" "Tuning the Parser:\n" @@ -389,12 +389,12 @@ " -x, --xml[=FILE] also output an XML report of the automaton\n" msgstr "" -#: src/getargs.c:446 +#: src/getargs.c:458 #, c-format msgid "Report bugs to <%s>.\n" msgstr "Prijavite greške na <%s>.\n" -#: src/getargs.c:447 +#: src/getargs.c:459 #, c-format msgid "%s home page: <%s>.\n" msgstr "%s početna stranica: <%s>.\n" @@ -414,7 +414,7 @@ msgstr "" "Prijavite greške prijevoda na .\n" -#: src/getargs.c:465 +#: src/getargs.c:477 msgid "For complete documentation, run: info bison.\n" msgstr "Za prikaz cjelokupne dokumentacije pokrenite „info bison”.\n" @@ -423,16 +423,16 @@ msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:483 +#: src/getargs.c:495 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Napisali Robert Corbett i Richard Stallman.\n" -#: src/getargs.c:487 +#: src/getargs.c:499 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Autorsko pravo (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:490 +#: src/getargs.c:502 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" @@ -441,36 +441,36 @@ "jamstava,\n" "čak ni za TRGOVINSKU PRIKLADNOST ili ODGOVARANJE ODREĐENOJ SVRSI.\n" -#: src/getargs.c:512 +#: src/getargs.c:524 #, c-format msgid "multiple skeleton declarations are invalid" msgstr "višestruke deklaracije predloška nisu ispravne" -#: src/getargs.c:529 +#: src/getargs.c:541 #, c-format msgid "%s: invalid language" msgstr "%s: neispravan jezik" -#: src/getargs.c:532 +#: src/getargs.c:544 msgid "multiple language declarations are invalid" msgstr "višestruke deklaracije jezika nisu ispravne" -#: src/getargs.c:843 +#: src/getargs.c:868 #, c-format msgid "deprecated option: %s, use %s" msgstr "" -#: src/getargs.c:877 +#: src/getargs.c:902 #, c-format msgid "missing operand" msgstr "" -#: src/getargs.c:879 +#: src/getargs.c:904 #, c-format msgid "extra operand %s" msgstr "operand viška %s" -#: src/gram.c:208 +#: src/gram.c:222 msgid "Grammar" msgstr "Gramatika" @@ -487,7 +487,7 @@ "// Početna stranica: <%s>.\n" "\n" -#: src/location.c:138 src/scan-gram.l:956 +#: src/location.c:138 src/scan-gram.l:957 #, c-format msgid "line number overflow" msgstr "preljev broja redaka" @@ -511,139 +511,139 @@ msgid "..." msgstr "" -#: src/main.c:162 +#: src/main.c:172 msgid "rule useless in parser due to conflicts" msgstr "pravilo beskorisno u analizatoru zbog konflikata" -#: src/main.c:256 +#: src/main.c:274 #, c-format msgid "fix-its can be applied. Rerun with option '--update'." msgstr "" -#: src/muscle-tab.c:527 +#: src/muscle-tab.c:528 #, c-format msgid "%%define variable %s redefined" msgstr "%%define varijabla %s je ponovo definirana" -#: src/muscle-tab.c:530 src/symtab.c:347 +#: src/muscle-tab.c:531 src/symtab.c:350 msgid "previous definition" msgstr "prethodna definicija" -#: src/muscle-tab.c:589 src/muscle-tab.c:690 src/muscle-tab.c:749 +#: src/muscle-tab.c:590 src/muscle-tab.c:691 src/muscle-tab.c:750 #, c-format msgid "%s: undefined %%define variable %s" msgstr "%s: nedefinirana %%define varijabla %s" -#: src/muscle-tab.c:623 +#: src/muscle-tab.c:624 #, c-format msgid "%%define variable '%s' requires '{...}' values" msgstr "" -#: src/muscle-tab.c:628 +#: src/muscle-tab.c:629 #, c-format msgid "%%define variable '%s' requires keyword values" msgstr "" -#: src/muscle-tab.c:633 +#: src/muscle-tab.c:634 #, c-format msgid "%%define variable '%s' requires '\"...\"' values" msgstr "" -#: src/muscle-tab.c:684 +#: src/muscle-tab.c:685 #, c-format msgid "invalid value for %%define Boolean variable %s" msgstr "neispravna vrijednost %%define logičke varijable %s" -#: src/muscle-tab.c:737 +#: src/muscle-tab.c:738 #, c-format msgid "invalid value for %%define variable %s: %s" msgstr "neispravna vrijednost %%define varijable %s: %s" -#: src/muscle-tab.c:741 +#: src/muscle-tab.c:742 #, c-format msgid "accepted value: %s" msgstr "prihvaćena vrijednost: %s" -#: src/parse-gram.y:773 +#: src/parse-gram.y:780 #, c-format msgid "character literals cannot be nonterminals" msgstr "" -#: src/parse-gram.y:779 +#: src/parse-gram.y:786 #, c-format msgid "character literals cannot be used together with %s" msgstr "" -#: src/parse-gram.y:782 +#: src/parse-gram.y:789 #, c-format msgid "definition of %s" msgstr "" -#: src/parse-gram.y:933 +#: src/parse-gram.y:940 #, c-format msgid "missing identifier in parameter declaration" msgstr "nedostaje identifikator u deklaraciji paremetra" -#: src/parse-gram.y:1052 +#: src/parse-gram.y:1062 #, c-format msgid "invalid version requirement: %s" msgstr "" -#: src/parse-gram.y:1063 +#: src/parse-gram.y:1073 #, c-format msgid "require bison %s, but have %s" msgstr "" -#: src/print-graph.c:62 src/print.c:350 +#: src/print-graph.c:62 src/print.c:352 #, c-format msgid "State %d" msgstr "Stanje %d" -#: src/print.c:141 +#: src/print.c:143 #, c-format msgid "shift, and go to state %d\n" msgstr "pomakni i idi u stanje %d\n" -#: src/print.c:143 +#: src/print.c:145 #, c-format msgid "go to state %d\n" msgstr "idi u stanje %d\n" -#: src/print.c:178 +#: src/print.c:180 msgid "error (nonassociative)\n" msgstr "greška (neasocijativna)\n" -#: src/print.c:200 +#: src/print.c:204 #, c-format msgid "reduce using rule %d (%s)" msgstr "reduciraj koristeći pravilo %d (%s)" -#: src/print.c:203 +#: src/print.c:202 #, c-format msgid "accept" msgstr "prihvati" -#: src/print.c:240 src/print.c:314 +#: src/print.c:242 src/print.c:316 msgid "$default" msgstr "$default" -#: src/print.c:376 +#: src/print.c:378 msgid "Terminals, with rules where they appear" msgstr "Završni znakovi, s pravilima gdje se pojavljuju" -#: src/print.c:403 +#: src/print.c:405 msgid "Nonterminals, with rules where they appear" msgstr "Nezavršni znakovi, s pravilima gdje se pojavljuju" -#: src/print.c:429 +#: src/print.c:431 msgid "on left:" msgstr "" -#: src/print.c:438 +#: src/print.c:440 msgid "on right:" msgstr "" -#: src/print.c:460 +#: src/print.c:462 msgid "Rules useless in parser due to conflicts" msgstr "Pravila su beskorisna u analizatoru zbog konflikata" @@ -652,82 +652,82 @@ msgid "multiple %s declarations" msgstr "višestruke %s deklaracije" -#: src/reader.c:130 +#: src/reader.c:151 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "sukob rezultantne vrste u funkciji spajanja %s: <%s> != <%s>" -#: src/reader.c:205 +#: src/reader.c:226 #, c-format msgid "duplicated symbol name for %s ignored" msgstr "dvostruko ime simbola za %s je zanemareno" -#: src/reader.c:241 +#: src/reader.c:262 #, c-format msgid "rule given for %s, which is a token" msgstr "navedeno je pravilo za %s, a to je simbol" -#: src/reader.c:298 +#: src/reader.c:321 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "sukob vrsta u zadanoj radnji: <%s> != <%s>" -#: src/reader.c:321 +#: src/reader.c:345 #, c-format msgid "empty rule for typed nonterminal, and no action" msgstr "prazno pravilo za nezavršni znak i nema radnje" -#: src/reader.c:337 +#: src/reader.c:389 #, c-format msgid "unused value: $%d" msgstr "nekorištena vrijednost: $%d" -#: src/reader.c:339 +#: src/reader.c:391 #, c-format msgid "unset value: $$" msgstr "nepostavljena vrijednost: $$" -#: src/reader.c:349 +#: src/reader.c:401 #, c-format msgid "%%empty on non-empty rule" msgstr "" -#: src/reader.c:359 +#: src/reader.c:411 #, c-format msgid "empty rule without %%empty" msgstr "" -#: src/reader.c:375 +#: src/reader.c:427 #, c-format msgid "token for %%prec is not defined: %s" msgstr "simbol za %%prec nije definiran: %s" -#: src/reader.c:380 +#: src/reader.c:432 #, c-format msgid "only midrule actions can be typed: %s" msgstr "" -#: src/reader.c:507 src/reader.c:529 src/reader.c:600 +#: src/reader.c:559 src/reader.c:581 src/reader.c:652 #, c-format msgid "%s affects only GLR parsers" msgstr "%s utječe samo na GLR analizatore" -#: src/reader.c:510 +#: src/reader.c:562 #, c-format msgid "%s must be followed by positive number" msgstr "nakon %s mora slijediti pozitivan broj" -#: src/reader.c:565 +#: src/reader.c:617 #, c-format msgid "POSIX Yacc does not support typed midrule actions" msgstr "" -#: src/reader.c:669 +#: src/reader.c:717 #, c-format msgid "rule is too long" msgstr "pravilo je predugačko" -#: src/reader.c:781 +#: src/reader.c:951 #, c-format msgid "no rules in the input grammar" msgstr "nema pravila u ulaznoj gramatici" @@ -736,24 +736,24 @@ msgid "rule useless in grammar" msgstr "pravilo je beskorisno u gramatici" -#: src/reduce.c:280 +#: src/reduce.c:281 #, c-format msgid "nonterminal useless in grammar: %s" msgstr "nezavršni znak je beskoristan u gramatici: %s" -#: src/reduce.c:321 +#: src/reduce.c:322 msgid "Nonterminals useless in grammar" msgstr "Nezavršni znakovi beskorisni u gramatici" -#: src/reduce.c:333 +#: src/reduce.c:334 msgid "Terminals unused in grammar" msgstr "Završni znakovi nekorišteni u gramatici" -#: src/reduce.c:342 +#: src/reduce.c:343 msgid "Rules useless in grammar" msgstr "Pravila beskorisna u gramatici" -#: src/reduce.c:355 +#: src/reduce.c:356 #, c-format msgid "%d nonterminal useless in grammar" msgid_plural "%d nonterminals useless in grammar" @@ -761,7 +761,7 @@ msgstr[1] "%d nezavršna znaka beskorisna u gramatici" msgstr[2] "%d nezavršnih znakova beskorisnih u gramatici" -#: src/reduce.c:360 +#: src/reduce.c:361 #, c-format msgid "%d rule useless in grammar" msgid_plural "%d rules useless in grammar" @@ -769,98 +769,98 @@ msgstr[1] "%d pravila beskorisna u gramatici" msgstr[2] "%d pravila beskorisnih u gramatici" -#: src/reduce.c:386 +#: src/reduce.c:392 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "početni simbol %s ne daje niti jednu rečenicu" -#: src/scan-code.l:158 +#: src/scan-code.l:160 #, c-format msgid "stray '%s'" msgstr "zalutali „%s”" -#: src/scan-code.l:330 +#: src/scan-code.l:332 #, c-format msgid "refers to: %c%s at %s" msgstr "odnosi se na: %c%s na %s" -#: src/scan-code.l:354 +#: src/scan-code.l:356 #, c-format msgid "possibly meant: %c" msgstr "vjerojatno znači: %c" -#: src/scan-code.l:363 +#: src/scan-code.l:365 #, c-format msgid ", hiding %c" msgstr ", skrivajući %c" -#: src/scan-code.l:371 +#: src/scan-code.l:373 #, c-format msgid " at %s" msgstr " na %s" -#: src/scan-code.l:375 +#: src/scan-code.l:377 #, c-format msgid ", cannot be accessed from midrule action at $%d" msgstr "" -#: src/scan-code.l:422 src/scan-gram.l:878 +#: src/scan-code.l:416 src/scan-gram.l:879 #, c-format msgid "integer out of range: %s" msgstr "cijeli broj izvan granica: %s" -#: src/scan-code.l:496 +#: src/scan-code.l:505 #, c-format msgid "invalid reference: %s" msgstr "neispravna referenca: %s" -#: src/scan-code.l:503 +#: src/scan-code.l:512 #, c-format msgid "syntax error after '%c', expecting integer, letter, '_', '[', or '$'" msgstr "" "sintaksna greška nakon „%c”, očekujem cijeli broj, slovo, „_”, „[” ili „$”" -#: src/scan-code.l:509 +#: src/scan-code.l:518 #, c-format msgid "symbol not found in production before $%d: %.*s" msgstr "simbol nije pronađen u proizvodnji prije $%d: %.*s" -#: src/scan-code.l:514 +#: src/scan-code.l:523 #, c-format msgid "symbol not found in production: %.*s" msgstr "simbol nije pronađen u proizvodnji: %.*s" -#: src/scan-code.l:528 +#: src/scan-code.l:537 #, c-format msgid "misleading reference: %s" msgstr "krivo navodeća referenca: %s" -#: src/scan-code.l:543 +#: src/scan-code.l:552 #, c-format msgid "ambiguous reference: %s" msgstr "višeznačna referenca: %s" -#: src/scan-code.l:579 +#: src/scan-code.l:588 #, c-format msgid "explicit type given in untyped grammar" msgstr "navedena eksplicitna vrsta u neunesenoj gramatici" -#: src/scan-code.l:634 +#: src/scan-code.l:643 #, c-format msgid "$$ for the midrule at $%d of %s has no declared type" msgstr "$$ za srednje pravilo na $%d od %s nema deklariranu vrstu" -#: src/scan-code.l:640 +#: src/scan-code.l:649 #, c-format msgid "$$ of %s has no declared type" msgstr "$$ od %s nema deklariranu vrstu" -#: src/scan-code.l:666 +#: src/scan-code.l:675 #, c-format msgid "$%s of %s has no declared type" msgstr "$%s od %s nema deklariranu vrstu" -#: src/scan-code.l:689 +#: src/scan-code.l:698 #, c-format msgid "multiple occurrences of $%d with api.value.automove" msgstr "" @@ -870,56 +870,56 @@ msgid "stray ',' treated as white space" msgstr "postupam sa zalutalim „,” kao praznim prostorom" -#: src/scan-gram.l:308 +#: src/scan-gram.l:309 #, c-format msgid "invalid directive: %s" msgstr "neispravan propis: %s" -#: src/scan-gram.l:330 +#: src/scan-gram.l:331 #, c-format msgid "invalid identifier: %s" msgstr "neispravan identifikator: %s" -#: src/scan-gram.l:384 +#: src/scan-gram.l:385 msgid "invalid character" msgid_plural "invalid characters" msgstr[0] "neispravan znak" msgstr[1] "neispravni znakovi" msgstr[2] "neispravni znakovi" -#: src/scan-gram.l:404 +#: src/scan-gram.l:405 #, c-format msgid "invalid null character" msgstr "neispravan prazan znak" -#: src/scan-gram.l:462 +#: src/scan-gram.l:463 #, c-format msgid "unexpected identifier in bracketed name: %s" msgstr "neočekivani identifikator u zagrađenom imenu: %s" -#: src/scan-gram.l:486 +#: src/scan-gram.l:487 #, c-format msgid "an identifier expected" msgstr "očekujem identifikator" -#: src/scan-gram.l:493 +#: src/scan-gram.l:494 msgid "invalid character in bracketed name" msgid_plural "invalid characters in bracketed name" msgstr[0] "neispravan znak u zagrađenom imenu" msgstr[1] "neispravni znakovi u zagrađenom imenu" msgstr[2] "neispravni znakovi u zagrađenom imenu" -#: src/scan-gram.l:566 src/scan-gram.l:581 +#: src/scan-gram.l:567 src/scan-gram.l:582 #, c-format msgid "POSIX Yacc does not support string literals" msgstr "" -#: src/scan-gram.l:604 +#: src/scan-gram.l:605 #, c-format msgid "empty character literal" msgstr "prazna znakovna konstanta" -#: src/scan-gram.l:610 +#: src/scan-gram.l:611 #, c-format msgid "extra characters in character literal" msgstr "višak znakova u znakovnoj konstanti" @@ -929,42 +929,42 @@ msgid "invalid number after \\-escape: %s" msgstr "neispravan broj nakon \\-izlaza: %s" -#: src/scan-gram.l:689 +#: src/scan-gram.l:690 #, c-format msgid "invalid character after \\-escape: %s" msgstr "neispravan znak nakon \\-izlaza: %s" -#: src/scan-gram.l:871 +#: src/scan-gram.l:872 #, c-format msgid "POSIX Yacc does not support hexadecimal literals" msgstr "" -#: src/scan-gram.l:1009 +#: src/scan-gram.l:1010 #, c-format msgid "missing %s at end of file" msgstr "nedostaje %s na kraju datoteke" -#: src/scan-gram.l:1020 +#: src/scan-gram.l:1021 #, c-format msgid "missing %s at end of line" msgstr "nedostaje %s na kraju retka" -#: src/scan-skel.l:141 +#: src/scan-skel.l:158 #, c-format msgid "unclosed %s directive in skeleton" msgstr "nezatvoren %s propis u predlošku" -#: src/scan-skel.l:252 +#: src/scan-skel.l:269 #, c-format msgid "too few arguments for %s directive in skeleton" msgstr "premalo argumenata %s propisa u predlošku" -#: src/scan-skel.l:259 +#: src/scan-skel.l:276 #, c-format msgid "too many arguments for %s directive in skeleton" msgstr "premalo argumenata %s propisa u predlošku" -#: src/symtab.c:131 +#: src/symtab.c:129 #, c-format msgid "POSIX Yacc forbids dashes in symbol names: %s" msgstr "POSIX Yacc zabranjuje povlake u imenima simbola: %s" @@ -974,44 +974,44 @@ msgid "too many symbols in input grammar (limit is %d)" msgstr "previše simbola u ulaznoj gramatici (ograničenje je %d)" -#: src/symtab.c:326 +#: src/symtab.c:329 #, c-format msgid "%s redeclaration for %s" msgstr "ponovna deklaracija %s za %s" -#: src/symtab.c:335 +#: src/symtab.c:338 #, c-format msgid "%s redeclaration for <%s>" msgstr "ponovna deklaracija %s za <%s>" -#: src/symtab.c:344 +#: src/symtab.c:347 #, c-format msgid "symbol %s redeclared as a token" msgstr "" -#: src/symtab.c:345 +#: src/symtab.c:348 #, c-format msgid "symbol %s redeclared as a nonterminal" msgstr "" -#: src/symtab.c:385 +#: src/symtab.c:388 #, c-format msgid "" "symbol %s is used, but is not defined as a token and has no rules; did you " "mean %s?" msgstr "" -#: src/symtab.c:395 +#: src/symtab.c:398 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "simbol %s je korišten, ali nije definiran kao simbol i nema pravila" -#: src/symtab.c:534 +#: src/symtab.c:537 #, c-format msgid "POSIX yacc reserves %%type to nonterminals" msgstr "" -#: src/symtab.c:564 +#: src/symtab.c:567 #, c-format msgid "symbol %s redeclared" msgstr "simbol %s ponovo deklariran" @@ -1031,32 +1031,32 @@ msgid "user token number of %s too large" msgstr "" -#: src/symtab.c:631 +#: src/symtab.c:634 #, c-format msgid "string literal %s not attached to a symbol" msgstr "" -#: src/symtab.c:659 +#: src/symtab.c:662 #, c-format msgid "useless %s for type <%s>" msgstr "" -#: src/symtab.c:664 +#: src/symtab.c:667 #, c-format msgid "type <%s> is used, but is not associated to any symbol" msgstr "" -#: src/symtab.c:709 +#: src/symtab.c:712 #, c-format msgid "nonterminals cannot be given a string alias" msgstr "" -#: src/symtab.c:712 +#: src/symtab.c:715 #, c-format msgid "symbol %s used more than once as a literal string" msgstr "simbol %s je korišten više puta kao konstantan niz" -#: src/symtab.c:715 +#: src/symtab.c:718 #, c-format msgid "symbol %s given more than one literal string" msgstr "simbolu %s je dano više od jednog konstantnog niza" @@ -1066,37 +1066,37 @@ msgid "user token number %d redeclaration for %s" msgstr "ponovna deklaracija broja korisničkog simbola %d za %s" -#: src/symtab.c:752 +#: src/symtab.c:755 #, c-format msgid "previous declaration for %s" msgstr "prethodna deklaracija za %s" -#: src/symtab.c:1080 +#: src/symtab.c:1083 #, c-format msgid "token number too large" msgstr "" -#: src/symtab.c:1151 +#: src/reader.c:923 #, c-format msgid "the start symbol %s is undefined" msgstr "početni simbol %s nije definiran" -#: src/symtab.c:1155 +#: src/reader.c:933 #, c-format msgid "the start symbol %s is a token" msgstr "početni simbol %s je simbol" -#: src/symtab.c:1338 +#: src/symtab.c:1332 #, c-format msgid "useless precedence and associativity for %s" msgstr "" -#: src/symtab.c:1341 +#: src/symtab.c:1335 #, c-format msgid "useless precedence for %s" msgstr "" -#: src/symtab.c:1345 +#: src/symtab.c:1339 #, c-format msgid "useless associativity for %s, use %%precedence" msgstr "" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bison-runtime.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bison-runtime.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bison-runtime.po 2021-08-03 09:03:55.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bison-runtime.po 2022-02-11 23:13:50.000000000 +0000 @@ -15,59 +15,59 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:05+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:55+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: data/skeletons/glr.c:904 data/skeletons/yacc.c:690 +#: data/skeletons/glr.c:930 data/skeletons/yacc.c:769 msgid "syntax error: cannot back up" msgstr "sintaksna greška: ne mogu napraviti sigurnosnu kopiju" -#: data/skeletons/glr.c:1819 +#: data/skeletons/glr.c:1832 msgid "syntax is ambiguous" msgstr "sintaksa je višeznačna" -#: data/skeletons/glr.c:2231 data/skeletons/glr.c:2257 -#: data/skeletons/glr.c:2310 data/skeletons/glr.c:2550 -#: data/skeletons/lalr1.cc:1046 data/skeletons/lalr1.cc:1543 -#: data/skeletons/yacc.c:1364 data/skeletons/yacc.c:1901 -#: data/skeletons/yacc.c:1905 +#: data/skeletons/glr.c:2245 data/skeletons/glr.c:2271 +#: data/skeletons/glr.c:2324 data/skeletons/glr.c:2560 +#: data/skeletons/lalr1.cc:1054 data/skeletons/lalr1.cc:1555 +#: data/skeletons/yacc.c:1443 data/skeletons/yacc.c:2006 +#: data/skeletons/yacc.c:2010 msgid "syntax error" msgstr "sintaksna greška" -#: data/skeletons/glr.c:2258 data/skeletons/lalr1.cc:1544 -#: data/skeletons/yacc.c:1365 +#: data/skeletons/glr.c:2272 data/skeletons/lalr1.cc:1556 +#: data/skeletons/yacc.c:1444 #, c-format msgid "syntax error, unexpected %s" msgstr "sintaksna greška, neočekivani %s" -#: data/skeletons/glr.c:2259 data/skeletons/lalr1.cc:1545 -#: data/skeletons/yacc.c:1366 +#: data/skeletons/glr.c:2273 data/skeletons/lalr1.cc:1557 +#: data/skeletons/yacc.c:1445 #, c-format msgid "syntax error, unexpected %s, expecting %s" msgstr "sintaksna greška, neočekivani %s, očekujem %s" -#: data/skeletons/glr.c:2260 data/skeletons/lalr1.cc:1546 -#: data/skeletons/yacc.c:1367 +#: data/skeletons/glr.c:2274 data/skeletons/lalr1.cc:1558 +#: data/skeletons/yacc.c:1446 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s" msgstr "sintaksna greška, neočekivani %s, očekujem %s ili %s" -#: data/skeletons/glr.c:2261 data/skeletons/lalr1.cc:1547 -#: data/skeletons/yacc.c:1368 +#: data/skeletons/glr.c:2275 data/skeletons/lalr1.cc:1559 +#: data/skeletons/yacc.c:1447 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s" msgstr "sintaksna greška, neočekivani %s, očekujem %s, %s ili %s" -#: data/skeletons/glr.c:2262 data/skeletons/lalr1.cc:1548 -#: data/skeletons/yacc.c:1369 +#: data/skeletons/glr.c:2276 data/skeletons/lalr1.cc:1560 +#: data/skeletons/yacc.c:1448 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s" msgstr "sintaksna greška, neočekivani %s, očekujem %s, %s, %s ili %s" -#: data/skeletons/glr.c:2609 data/skeletons/yacc.c:1437 -#: data/skeletons/yacc.c:1439 data/skeletons/yacc.c:1644 -#: data/skeletons/yacc.c:2053 +#: data/skeletons/glr.c:2619 data/skeletons/yacc.c:1516 +#: data/skeletons/yacc.c:1518 data/skeletons/yacc.c:1748 +#: data/skeletons/yacc.c:2158 msgid "memory exhausted" msgstr "memorija iscrpljena" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bootloader.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bootloader.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/bootloader.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/bootloader.po 2022-02-11 23:13: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: 2021-08-02 17:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:14+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" #. ok button label diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/byobu.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/byobu.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/byobu.po 2021-08-03 09:04:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/byobu.po 2022-02-11 23:13:54.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: 2021-08-02 17:57+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:53+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: bin/menu:34 byobu-config:129 byobu-config:401 byobu-config:409 msgid "Menu" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/colord.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/colord.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/colord.po 2021-08-03 09:04:01.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/colord.po 2022-02-11 23:13:55.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 18:14+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:11+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" #. TRANSLATORS: command line option diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/command-not-found.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/command-not-found.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/command-not-found.po 2021-08-03 09:03:53.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/command-not-found.po 2022-02-11 23:13:48.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: command-not-found\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2020-08-26 15:05+0000\n" +"POT-Creation-Date: 2021-10-05 18:45+0000\n" "PO-Revision-Date: 2019-10-17 14:48+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:24+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:19+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: ../CommandNotFound/CommandNotFound.py:156 +#: ../CommandNotFound/CommandNotFound.py:210 msgid "Do you want to install it? (N/y)" -msgstr "Želite li ju instalirati? (n/d)" +msgstr "Želite li ju instalirati? (n/y)" -#: ../CommandNotFound/CommandNotFound.py:165 +#: ../CommandNotFound/CommandNotFound.py:218 msgid "y" -msgstr "d" +msgstr "y" #: ../CommandNotFound/CommandNotFound.py:177 #, python-format @@ -70,12 +70,12 @@ msgid "Please ask your administrator." msgstr "Upitajte svojeg administratora." -#: ../CommandNotFound/CommandNotFound.py:231 +#: ../CommandNotFound/CommandNotFound.py:281 #, python-format msgid "You will have to enable the component called '%s'" msgstr "Morat ćete omogućiti komponentu '%s'" -#: ../CommandNotFound/CommandNotFound.py:252 +#: ../CommandNotFound/CommandNotFound.py:289 #, python-format msgid "You will have to enable component called '%s'" msgstr "Morat ćete omogućiti komponentu '%s'" @@ -89,24 +89,24 @@ msgid "See 'snap info %s' for additional versions." msgstr "Pogledajte 'snap info %s' za dodatne inačice." -#: ../CommandNotFound/CommandNotFound.py:314 +#: ../CommandNotFound/CommandNotFound.py:245 #, python-format msgid "Command '%(command)s' is available in '%(place)s'" msgstr "Naredba '%(command)s' je dostupna u '%(place)s'" -#: ../CommandNotFound/CommandNotFound.py:316 +#: ../CommandNotFound/CommandNotFound.py:247 #, python-format msgid "Command '%(command)s' is available in the following places" msgstr "Naredba '%(command)s' je dostupna na sljedećim mjestima" -#: ../CommandNotFound/CommandNotFound.py:321 +#: ../CommandNotFound/CommandNotFound.py:252 #, python-format msgid "" "The command could not be located because '%s' is not included in the PATH " "environment variable." msgstr "Naredba nije pronađena jer '%s' nije sadržana u PATH varijabli." -#: ../CommandNotFound/CommandNotFound.py:323 +#: ../CommandNotFound/CommandNotFound.py:254 msgid "" "This is most likely caused by the lack of administrative privileges " "associated with your user account." @@ -139,29 +139,30 @@ "Nemoguće je pronaći command-not-found bazu podataka. Pokrenite 'sudo apt " "update' kako bi ju popunili." -#: ../command-not-found:93 ../command-not-found:96 +#: ../command-not-found:91 #, c-format msgid "%s: command not found" msgstr "%s: naredba nije pronađena" -#: ../CommandNotFound/util.py:25 +#: ../CommandNotFound/util.py:26 msgid "Sorry, command-not-found has crashed! Please file a bug report at:" -msgstr "Nažalost, command-not-found se srušio! Ispunite izvještaj greške na:" +msgstr "" +"Nažalost, command-not-found se srušila! Ispunite izvještaj greške na:" -#: ../CommandNotFound/util.py:27 +#: ../CommandNotFound/util.py:28 msgid "Please include the following information with the report:" msgstr "Uključite sljedeću informaciju u izvještaj:" -#: ../CommandNotFound/util.py:29 +#: ../CommandNotFound/util.py:30 #, python-format msgid "command-not-found version: %s" msgstr "command-not-found inačica: %s" -#: ../CommandNotFound/util.py:30 +#: ../CommandNotFound/util.py:31 #, python-format msgid "Python version: %d.%d.%d %s %d" msgstr "Python inačica: %d.%d.%d %s %d" -#: ../CommandNotFound/util.py:36 +#: ../CommandNotFound/util.py:37 msgid "Exception information:" msgstr "Informacija iznimke:" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/coreutils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/coreutils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/coreutils.po 2021-08-03 09:03:54.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/coreutils.po 2022-02-11 23:13:49.000000000 +0000 @@ -18,10 +18,10 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:08+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" +"X-Launchpad-Export-Date: 2022-02-11 14:58+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: hr\n" #: lib/argmatch.c:132 #, c-format diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/cpio.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/cpio.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/cpio.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/cpio.po 2022-02-11 23:13:46.000000000 +0000 @@ -16,47 +16,46 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:08+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" +"X-Launchpad-Export-Date: 2022-02-11 14:59+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: hr\n" -#: gnu/argmatch.c:135 +#: gnu/argmatch.c:134 #, c-format msgid "invalid argument %s for %s" msgstr "neispravan argument %s za %s" -#: gnu/argmatch.c:136 +#: gnu/argmatch.c:135 #, c-format msgid "ambiguous argument %s for %s" msgstr "višeznačan argument %s za %s" -#: gnu/argmatch.c:155 -#, c-format +#: gnu/argmatch.c:154 msgid "Valid arguments are:" msgstr "Ispravni argumenti su:" -#: gnu/argp-help.c:149 +#: gnu/argp-help.c:148 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" msgstr "ARGP_HELP_FMT: vrijednost %s je manja ili jednaka %s" -#: gnu/argp-help.c:222 +#: gnu/argp-help.c:224 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" msgstr "%.*s: ARGP_HELP_FMT parametar zahtijeva vrijednost" -#: gnu/argp-help.c:237 +#: gnu/argp-help.c:234 #, c-format msgid "%.*s: Unknown ARGP_HELP_FMT parameter" msgstr "%.*s: Nepoznati ARGP_HELP_FMT parametar" -#: gnu/argp-help.c:249 +#: gnu/argp-help.c:247 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" msgstr "Smeće u ARGP_HELP_FMT: %s" -#: gnu/argp-help.c:1246 +#: gnu/argp-help.c:1227 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." @@ -64,15 +63,15 @@ "Obavezni ili opcionalni argumenti dugačkih opcija također su obavezni ili " "opcionalni za odgovarajuće kratke opcije." -#: gnu/argp-help.c:1639 +#: gnu/argp-help.c:1614 msgid "Usage:" msgstr "Uporaba:" -#: gnu/argp-help.c:1643 +#: gnu/argp-help.c:1618 msgid " or: " msgstr " ili: " -#: gnu/argp-help.c:1655 +#: gnu/argp-help.c:1630 msgid " [OPTION...]" msgstr " [OPCIJA...]" @@ -81,45 +80,44 @@ msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "" -#: gnu/argp-help.c:1710 +#: gnu/argp-help.c:1685 #, c-format msgid "Report bugs to %s.\n" msgstr "Prijavite greške na %s.\n" -#: gnu/argp-help.c:1929 gnu/error.c:155 +#: gnu/argp-help.c:1886 gnu/error.c:191 msgid "Unknown system error" msgstr "Nepoznata greška sustava" -#: gnu/argp-parse.c:83 +#: gnu/argp-parse.c:81 msgid "give this help list" msgstr "prikaži ovaj popis pomoći" -#: gnu/argp-parse.c:84 +#: gnu/argp-parse.c:82 msgid "give a short usage message" msgstr "prikaži kratke upute za uporabu" -#: gnu/argp-parse.c:85 tests/genfile.c:131 +#: gnu/argp-parse.c:83 tests/genfile.c:131 msgid "NAME" msgstr "IME" -#: gnu/argp-parse.c:85 +#: gnu/argp-parse.c:84 msgid "set the program name" msgstr "postavi ime programa" -#: gnu/argp-parse.c:86 +#: gnu/argp-parse.c:85 msgid "SECS" msgstr "SECS" -#: gnu/argp-parse.c:87 +#: gnu/argp-parse.c:86 msgid "hang for SECS seconds (default 3600)" msgstr "zaustavi na SECS sekundi (zadano 3600)" -#: gnu/argp-parse.c:144 +#: gnu/argp-parse.c:143 msgid "print program version" msgstr "ispiši inačicu programa" #: gnu/argp-parse.c:160 -#, c-format msgid "(PROGRAM ERROR) No version known!?" msgstr "(GREŠKA PROGRAMA) Nema poznate inačice!?" @@ -132,7 +130,7 @@ msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(GREŠKA PROGRAMA) Opcije su trebale biti prepoznate!?" -#: gnu/closeout.c:114 src/util.c:93 src/util.c:96 src/util.c:145 +#: gnu/closeout.c:112 src/util.c:93 src/util.c:96 src/util.c:146 #, c-format msgid "write error" msgstr "greška pisanja" @@ -142,17 +140,17 @@ msgid "%s: option '%s' is ambiguous; possibilities:" msgstr "" -#: gnu/getopt.c:531 gnu/getopt.c:547 +#: gnu/getopt.c:619 #, c-format msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcija „%s” je višeznačna\n" -#: gnu/getopt.c:580 gnu/getopt.c:584 +#: gnu/getopt.c:654 gnu/getopt.c:658 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: opcija „--%s” ne dozvoljava argument\n" -#: gnu/getopt.c:593 gnu/getopt.c:598 +#: gnu/getopt.c:667 gnu/getopt.c:672 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" @@ -162,32 +160,32 @@ msgid "%s: option '--%s' requires an argument\n" msgstr "" -#: gnu/getopt.c:698 gnu/getopt.c:701 +#: gnu/getopt.c:772 gnu/getopt.c:775 #, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: neprepoznata opcija „--%s”\n" -#: gnu/getopt.c:709 gnu/getopt.c:712 +#: gnu/getopt.c:783 gnu/getopt.c:786 #, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: neprepoznata opcija „%c%s”\n" -#: gnu/getopt.c:761 gnu/getopt.c:764 +#: gnu/getopt.c:835 gnu/getopt.c:838 #, c-format msgid "%s: invalid option -- '%c'\n" msgstr "%s: neispravna opcija -- „%c”\n" -#: gnu/getopt.c:814 gnu/getopt.c:831 gnu/getopt.c:1034 gnu/getopt.c:1052 +#: gnu/getopt.c:891 gnu/getopt.c:908 gnu/getopt.c:1118 gnu/getopt.c:1136 #, c-format msgid "%s: option requires an argument -- '%c'\n" msgstr "%s: opcija zahtijeva argument -- „%c”\n" -#: gnu/getopt.c:884 gnu/getopt.c:900 +#: gnu/getopt.c:964 gnu/getopt.c:980 #, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: opcija „-W %s” je višeznačna\n" -#: gnu/getopt.c:924 gnu/getopt.c:942 +#: gnu/getopt.c:1004 gnu/getopt.c:1022 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" @@ -197,53 +195,55 @@ msgid "%s: option '-W %s' requires an argument\n" msgstr "" -#: gnu/obstack.c:425 gnu/obstack.c:427 gnu/xalloc-die.c:36 +#: gnu/obstack.c:338 gnu/obstack.c:340 gnu/xalloc-die.c:34 msgid "memory exhausted" msgstr "memorija iscrpljena" -#: gnu/openat-die.c:36 +#: gnu/openat-die.c:38 #, c-format msgid "unable to record current working directory" msgstr "ne mogu zapisati trenutni radni direktorij" -#: gnu/openat-die.c:54 +#: gnu/openat-die.c:57 #, c-format msgid "failed to return to initial working directory" msgstr "nisam se uspio vratiti u početni radni direktorij" #. TRANSLATORS: #. Get translations for open and closing quotation marks. -#. #. The message catalog should translate "`" to a left #. quotation mark suitable for the locale, and similarly for -#. "'". If the catalog has no translation, -#. locale_quoting_style quotes `like this', and -#. clocale_quoting_style quotes "like this". +#. "'". For example, a French Unicode local should translate +#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE +#. QUOTATION MARK), respectively. #. -#. For example, an American English Unicode locale should -#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and -#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION -#. MARK). A British English Unicode locale should instead -#. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) -#. and U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. +#. If the catalog has no translation, we will try to +#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and +#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the +#. current locale is not Unicode, locale_quoting_style +#. will quote 'like this', and clocale_quoting_style will +#. quote "like this". You should always include translations +#. for "`" and "'" even if U+2018 and U+2019 are appropriate +#. for your locale. #. #. If you don't know what to put here, please see -#. +#. #. and use glyphs suitable for your language. -#: gnu/quotearg.c:274 +#: gnu/quotearg.c:354 msgid "`" msgstr "„" -#: gnu/quotearg.c:275 +#: gnu/quotearg.c:355 msgid "'" msgstr "”" -#: gnu/version-etc.c:76 +#: gnu/version-etc.c:74 #, c-format msgid "Packaged by %s (%s)\n" msgstr "Pakirao %s (%s)\n" -#: gnu/version-etc.c:79 +#: gnu/version-etc.c:77 #, c-format msgid "Packaged by %s\n" msgstr "Pakirao %s\n" @@ -251,11 +251,11 @@ #. TRANSLATORS: Translate "(C)" to the copyright symbol #. (C-in-a-circle), if this symbol is available in the user's #. locale. Otherwise, do not translate "(C)"; leave it as-is. -#: gnu/version-etc.c:86 +#: gnu/version-etc.c:84 msgid "(C)" msgstr "(C)" -#: gnu/version-etc.c:88 +#: gnu/version-etc.c:86 msgid "" "\n" "License GPLv3+: GNU GPL version 3 or later " @@ -272,19 +272,19 @@ "\n" #. TRANSLATORS: %s denotes an author name. -#: gnu/version-etc.c:104 +#: gnu/version-etc.c:102 #, c-format msgid "Written by %s.\n" msgstr "Napisao %s.\n" #. TRANSLATORS: Each %s denotes an author name. -#: gnu/version-etc.c:108 +#: gnu/version-etc.c:106 #, c-format msgid "Written by %s and %s.\n" msgstr "Napisali %s i %s.\n" #. TRANSLATORS: Each %s denotes an author name. -#: gnu/version-etc.c:112 +#: gnu/version-etc.c:110 #, c-format msgid "Written by %s, %s, and %s.\n" msgstr "Napisali %s, %s i %s.\n" @@ -292,7 +292,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:119 +#: gnu/version-etc.c:117 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -304,7 +304,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:126 +#: gnu/version-etc.c:124 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -316,7 +316,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:133 +#: gnu/version-etc.c:131 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -328,7 +328,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:141 +#: gnu/version-etc.c:139 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -340,7 +340,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:149 +#: gnu/version-etc.c:147 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -354,7 +354,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:158 +#: gnu/version-etc.c:156 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -368,7 +368,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: gnu/version-etc.c:169 +#: gnu/version-etc.c:167 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -383,7 +383,7 @@ #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). -#: gnu/version-etc.c:247 +#: gnu/version-etc.c:245 #, c-format msgid "" "\n" @@ -393,22 +393,22 @@ "Prijavite greške na %s.\n" "Prijavite greške prijevoda na .\n" -#: gnu/version-etc.c:249 +#: gnu/version-etc.c:247 #, c-format msgid "Report %s bugs to: %s\n" msgstr "Prijavite greške %s na %s\n" -#: gnu/version-etc.c:253 +#: gnu/version-etc.c:251 #, c-format msgid "%s home page: <%s>\n" msgstr "%s početna stranica: <%s>\n" -#: gnu/version-etc.c:255 +#: gnu/version-etc.c:253 #, c-format msgid "%s home page: \n" msgstr "%s početna stranica: \n" -#: gnu/version-etc.c:258 +#: gnu/version-etc.c:256 msgid "General help using GNU software: \n" msgstr "" "Općenita pomoć za korištenje GNU softvera: \n" @@ -417,7 +417,7 @@ #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/error.c:58 lib/error.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Ne mogu izvršiti %s" @@ -426,27 +426,27 @@ #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/error.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Upozorenje: Ne mogu izvršiti %s" -#: lib/error.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Ne mogu promijeniti mod u %s" -#: lib/error.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Ne mogu promijeniti vlasništvo u uid %lu, gid %lu" -#: lib/error.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Ne mogu napraviti čvrstu vezu na %s" -#: lib/error.c:179 lib/error.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -454,7 +454,7 @@ msgstr[1] "%s: Greška čitanja na bajtu %s pri čitanju %lu bajta" msgstr[2] "%s: Greška čitanja na bajtu %s pri čitanju %lu bajtova" -#: lib/error.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -463,22 +463,22 @@ msgstr[2] "" "%s: Upozorenje: Greška čitanja na bajtu %s pri čitanju %lu bajtova" -#: lib/error.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Ne mogu ići na %s" -#: lib/error.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Upozorenje: Ne mogu ići na %s" -#: lib/error.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ne mogu napraviti simboličku vezu na %s" -#: lib/error.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -486,21 +486,21 @@ msgstr[1] "%s: Zapisao samo %lu od %lu bajta" msgstr[2] "%s: Zapisao samo %lu od %lu bajtova" -#: lib/names.c:155 +#: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" msgstr "Uklanjam početni „%s” iz imena elemenata" -#: lib/names.c:156 +#: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" msgstr "Uklanjam početni „%s” iz odredišta čvrstih veza" -#: lib/names.c:169 +#: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" msgstr "Mijenjam „.” za prazno ime elementa" -#: lib/names.c:170 +#: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" msgstr "Mijenjam „.” za prazno odredište čvrste veze" @@ -529,84 +529,84 @@ msgid "Cannot redirect files for remote shell" msgstr "" -#: lib/rtapelib.c:515 +#: lib/rtapelib.c:516 #, c-format msgid "Cannot execute remote shell" msgstr "Ne mogu pokrenuti udaljenu ljusku" -#: rmt/rmt.c:413 +#: rmt/rmt.c:432 msgid "Seek direction out of range" msgstr "Smjer traženja izvan granica" -#: rmt/rmt.c:419 +#: rmt/rmt.c:438 msgid "Invalid seek direction" msgstr "Neispravan smjer traženja" -#: rmt/rmt.c:427 +#: rmt/rmt.c:446 msgid "Invalid seek offset" msgstr "Neispravan pomak traženja" -#: rmt/rmt.c:433 +#: rmt/rmt.c:452 msgid "Seek offset out of range" msgstr "Pomak traženja izvan granica" -#: rmt/rmt.c:474 rmt/rmt.c:525 rmt/rmt.c:589 +#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 msgid "Invalid byte count" msgstr "Neispravan broj bajtova" -#: rmt/rmt.c:480 rmt/rmt.c:531 rmt/rmt.c:595 rmt/rmt.c:606 +#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" msgstr "Broj bajtova izvan granica" -#: rmt/rmt.c:539 +#: rmt/rmt.c:558 msgid "Premature eof" msgstr "Preuranjen kraj datoteke (eof)" -#: rmt/rmt.c:582 +#: rmt/rmt.c:601 msgid "Invalid operation code" msgstr "Neispravan operacijski kod" -#: rmt/rmt.c:617 rmt/rmt.c:661 +#: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" msgstr "Operacija nije podržana" -#: rmt/rmt.c:645 +#: rmt/rmt.c:664 msgid "Unexpected arguments" msgstr "Neočekivani argumenti" -#: rmt/rmt.c:670 +#: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Upravlja pogonom vrpce, prihvaćajući naredbe udaljenog procesa" -#: rmt/rmt.c:677 src/main.c:123 tests/genfile.c:167 +#: rmt/rmt.c:696 src/main.c:129 tests/genfile.c:167 msgid "NUMBER" msgstr "BROJ" -#: rmt/rmt.c:678 +#: rmt/rmt.c:697 msgid "set debug level" msgstr "postavi razinu debugiranja" -#: rmt/rmt.c:679 src/main.c:151 src/main.c:157 tests/genfile.c:133 +#: rmt/rmt.c:698 src/main.c:166 src/main.c:172 tests/genfile.c:133 #: tests/genfile.c:181 tests/genfile.c:185 tests/genfile.c:188 #: tests/genfile.c:194 msgid "FILE" msgstr "DATOTEKA" -#: rmt/rmt.c:680 +#: rmt/rmt.c:699 msgid "set debug output file name" msgstr "postavi ime datoteke izlaza za debugiranje" -#: rmt/rmt.c:696 rmt/rmt.c:764 +#: rmt/rmt.c:715 rmt/rmt.c:783 #, c-format msgid "cannot open %s" msgstr "ne mogu otvoriti %s" -#: rmt/rmt.c:761 tests/genfile.c:885 tests/genfile.c:902 +#: rmt/rmt.c:780 tests/genfile.c:953 tests/genfile.c:970 #, c-format msgid "too many arguments" msgstr "previše argumenata" -#: rmt/rmt.c:803 +#: rmt/rmt.c:822 msgid "Garbage command" msgstr "Naredba smeća" @@ -633,67 +633,67 @@ msgid "%s: checksum error (0x%x, should be 0x%x)" msgstr "" -#: src/copyin.c:208 src/copypass.c:129 +#: src/copyin.c:200 src/copypass.c:135 #, c-format msgid "%s not created: newer or same age version exists" msgstr "%s nije napravljen: postoji jednako stara ili novija inačica" -#: src/copyin.c:218 src/copypass.c:137 +#: src/copyin.c:210 src/copypass.c:143 #, c-format msgid "cannot remove current %s" msgstr "ne mogu ukloniti trenutni %s" -#: src/copyin.c:279 src/copyin.c:476 src/copyin.c:601 src/copypass.c:394 +#: src/copyin.c:271 src/copyin.c:467 src/copyin.c:582 src/copypass.c:391 #, c-format msgid "cannot link %s to %s" msgstr "ne mogu povezati %s na %s" -#: src/copyin.c:509 +#: src/copyin.c:500 #, c-format msgid "cannot swap halfwords of %s: odd number of halfwords" msgstr "ne mogu zamijeniti poluriječi %s: neparan broj poluriječi" -#: src/copyin.c:517 +#: src/copyin.c:508 #, c-format msgid "cannot swap bytes of %s: odd number of bytes" msgstr "ne mogu zamijeniti bajtove %s: neparan broj bajtova" -#: src/copyin.c:673 +#: src/copyin.c:659 #, c-format msgid "%s: Cannot symlink to %s" msgstr "%s: Ne mogu napraviti simboličku vezu na %s" -#: src/copyin.c:727 src/copyout.c:850 src/copypass.c:317 +#: src/copyin.c:713 src/copyout.c:832 src/copypass.c:314 #, c-format msgid "%s: unknown file type" msgstr "%s: nepoznata vrsta datoteke" -#: src/copyin.c:912 src/copyin.c:919 +#: src/copyin.c:848 src/copyin.c:855 #, c-format msgid "Malformed number %.*s" msgstr "Izobličen broj %.*s" -#: src/copyin.c:929 +#: src/copyin.c:865 #, c-format msgid "Archive value %.*s is out of range" msgstr "Vrijednost arhive %.*s je izvan granica" -#: src/copyin.c:964 +#: src/copyin.c:904 #, c-format msgid "premature end of archive" msgstr "preuranjen kraj arhive" -#: src/copyin.c:1184 +#: src/copyin.c:1120 #, c-format msgid "warning: archive header has reverse byte-order" msgstr "upozorenje: zaglavlje arhive ima obrnuti redoslijed bajtova" -#: src/copyin.c:1331 +#: src/copyin.c:1260 #, c-format msgid "standard input is closed" msgstr "standardni ulaz je zatvoren" -#: src/copyin.c:1497 src/copyout.c:893 src/copypass.c:335 +#: src/copyin.c:1435 src/copyout.c:874 src/copypass.c:332 #, c-format msgid "%lu block\n" msgid_plural "%lu blocks\n" @@ -711,68 +711,68 @@ msgid "%s: value %s %s out of allowed range 0..%s" msgstr "" -#: src/copyout.c:308 +#: src/copyout.c:304 #, c-format msgid "%s: truncating %s" msgstr "%s: skraćujem %s" -#: src/copyout.c:343 src/copyout.c:406 src/copyout.c:480 +#: src/copyout.c:339 src/copyout.c:402 src/copyout.c:476 msgid "inode number" msgstr "broj indeksnih čvorova (inode)" -#: src/copyout.c:346 src/copyout.c:409 src/copyout.c:484 +#: src/copyout.c:342 src/copyout.c:405 src/copyout.c:480 msgid "file mode" msgstr "mod datoteke" -#: src/copyout.c:349 src/copyout.c:411 src/copyout.c:488 +#: src/copyout.c:345 src/copyout.c:407 src/copyout.c:484 msgid "uid" msgstr "uid" -#: src/copyout.c:352 src/copyout.c:413 src/copyout.c:492 +#: src/copyout.c:348 src/copyout.c:409 src/copyout.c:488 msgid "gid" msgstr "gid" -#: src/copyout.c:355 src/copyout.c:416 src/copyout.c:496 +#: src/copyout.c:351 src/copyout.c:412 src/copyout.c:492 msgid "number of links" msgstr "broj veza" -#: src/copyout.c:358 src/copyout.c:421 +#: src/copyout.c:354 src/copyout.c:417 msgid "modification time" msgstr "vrijeme uređivanja" -#: src/copyout.c:361 src/copyout.c:428 src/copyout.c:515 +#: src/copyout.c:357 src/copyout.c:424 src/copyout.c:516 msgid "file size" msgstr "veličina datoteke" -#: src/copyout.c:365 +#: src/copyout.c:361 msgid "device major number" msgstr "glavni broj uređaja" -#: src/copyout.c:369 +#: src/copyout.c:365 msgid "device minor number" msgstr "sporedni broj uređaja" -#: src/copyout.c:373 +#: src/copyout.c:369 msgid "rdev major" msgstr "rdev glavni" -#: src/copyout.c:377 +#: src/copyout.c:373 msgid "rdev minor" msgstr "rdev sporedni" -#: src/copyout.c:381 src/copyout.c:424 src/copyout.c:505 +#: src/copyout.c:377 src/copyout.c:420 src/copyout.c:503 msgid "name size" msgstr "veličina imena" -#: src/copyout.c:403 +#: src/copyout.c:399 msgid "device number" msgstr "broj uređaja" -#: src/copyout.c:418 +#: src/copyout.c:414 msgid "rdev" msgstr "rdev" -#: src/copyout.c:476 +#: src/copyout.c:472 #, c-format msgid "%s: truncating inode number" msgstr "%s: skraćujem broj indeksnih čvorova (inode)" @@ -787,37 +787,37 @@ msgid "%s: value %s %s out of allowed range 0..%lu" msgstr "" -#: src/copyin.c:95 src/copyout.c:562 +#: src/copyout.c:564 #, c-format msgid "%s: file name too long" msgstr "%s: predugačko ime datoteke" -#: src/copyout.c:619 +#: src/copyout.c:621 #, c-format msgid "standard output is closed" msgstr "standardni izlaz je zatvoren" -#: src/copyout.c:640 src/copypass.c:86 +#: src/copyout.c:644 src/copypass.c:99 #, c-format msgid "blank line ignored" msgstr "zanemaren prazan redak" -#: src/copyout.c:775 +#: src/copyout.c:757 #, c-format msgid "%s not dumped: not a regular file" msgstr "%s nije izbačen: nije obična datoteka" -#: src/copyout.c:826 +#: src/copyout.c:808 #, c-format msgid "%s: symbolic link too long" msgstr "%s: simbolička veza predugačka" -#: src/copypass.c:389 +#: src/copypass.c:386 #, c-format msgid "%s linked to %s" msgstr "%s povezan na %s" -#: src/main.c:73 +#: src/main.c:76 msgid "" "GNU `cpio' copies files to and from archives\n" "\n" @@ -839,32 +839,32 @@ " # Kopiraj datoteke iz popisa-datoteka u odredišni-direktorij\n" " cpio -p odredišni-direktorij < popis-datoteka\n" -#: src/main.c:87 +#: src/main.c:92 #, c-format msgid "%s is meaningless with %s" msgstr "%s je beznačajan uz %s" -#: src/main.c:93 +#: src/main.c:98 msgid "Main operation mode:" msgstr "Glavni način operacije:" -#: src/main.c:95 +#: src/main.c:100 msgid "Create the archive (run in copy-out mode)" msgstr "Napravi arhivu (radi u načinu copy-out)" -#: src/main.c:97 +#: src/main.c:102 msgid "Extract files from an archive (run in copy-in mode)" msgstr "Otpakiraj datoteke iz arhive (radi u načinu copy-in)" -#: src/main.c:99 +#: src/main.c:104 msgid "Run in copy-pass mode" msgstr "Pokreni u copy-pass načinu" -#: src/main.c:101 +#: src/main.c:106 msgid "Print a table of contents of the input" msgstr "Ispiši sadržaj ulaza" -#: src/main.c:107 +#: src/main.c:112 msgid "Operation modifiers valid in any mode:" msgstr "Modifikatori operacija ispravni u svakom načinu:" @@ -876,59 +876,59 @@ msgid "Change to directory DIR" msgstr "" -#: src/main.c:112 +#: src/main.c:118 msgid "Archive file is local, even if its name contains colons" msgstr "Datoteka arhive je lokalna, čak i ako ime sadrži dvotočke" -#: src/main.c:113 tests/genfile.c:154 +#: src/main.c:119 tests/genfile.c:154 msgid "FORMAT" msgstr "OBLIK" -#: src/main.c:114 +#: src/main.c:120 msgid "Use given archive FORMAT" msgstr "Koristi zadani OBLIK arhive" -#: src/main.c:116 +#: src/main.c:122 msgid "Set the I/O block size to 5120 bytes" msgstr "Postavi veličinu U/I bloka na 5120 bajtova" -#: src/main.c:117 +#: src/main.c:123 msgid "BLOCK-SIZE" msgstr "VELIČINA-BLOKA" -#: src/main.c:118 +#: src/main.c:124 msgid "Set the I/O block size to BLOCK-SIZE * 512 bytes" msgstr "Postavi veličinu U/I bloka na VELIČINA-BLOKA * 512 bajtova" -#: src/main.c:120 +#: src/main.c:126 msgid "Use the old portable (ASCII) archive format" msgstr "Koristi stari prenosivi (ASCII) oblik arhive" -#: src/main.c:122 +#: src/main.c:128 msgid "Print a \".\" for each file processed" msgstr "Ispiši „.” za svaku obrađenu datoteku" -#: src/main.c:124 +#: src/main.c:130 msgid "Set the I/O block size to the given NUMBER of bytes" msgstr "Postavi veličinu U/I bloka na navedeni BROJ bajtova" -#: src/main.c:136 +#: src/main.c:132 msgid "Do not print the number of blocks copied" msgstr "Ne ispisuj broj kopiranih blokova" -#: src/main.c:138 +#: src/main.c:134 msgid "Verbosely list the files processed" msgstr "Opširno ispiši obrađene datoteke" -#: src/main.c:141 +#: src/main.c:137 msgid "Enable debugging info" msgstr "Omogući informacije za debugiranje" -#: src/main.c:143 +#: src/main.c:139 msgid "FLAG" msgstr "ZASTAVICA" -#: src/main.c:144 +#: src/main.c:140 msgid "" "Control warning display. Currently FLAG is one of 'none', 'truncate', 'all'. " "Multiple options accumulate." @@ -936,11 +936,11 @@ "Upravljaj prikazom upozorenja. Trenutno je ZASTAVICA jedna od „none”, " "„truncate”, „all”. Višestruke opcije se nadopunjuju." -#: src/main.c:209 +#: src/main.c:141 msgid "[USER][:.][GROUP]" msgstr "[KORISNIK][:.][GRUPA]" -#: src/main.c:210 +#: src/main.c:142 msgid "" "Set the ownership of all files created to the specified USER and/or GROUP" msgstr "" @@ -951,11 +951,11 @@ msgid "Operation modifiers valid in copy-in and copy-out modes" msgstr "" -#: src/main.c:109 src/main.c:176 src/main.c:205 +#: src/main.c:148 src/main.c:183 src/main.c:193 msgid "[[USER@]HOST:]FILE-NAME" msgstr "[[KORISNIK@]RAČUNALO:]IME-DATOTEKE" -#: src/main.c:110 +#: src/main.c:149 msgid "" "Use this FILE-NAME instead of standard input or output. Optional USER and " "HOST specify the user and host names in case of a remote archive" @@ -964,15 +964,15 @@ "KORISNIK i RAČUNALO označavaju imena korisnika i računala u slučaju udaljene " "arhive" -#: src/main.c:125 tests/genfile.c:170 +#: src/main.c:150 tests/genfile.c:170 msgid "STRING" msgstr "NIZ" -#: src/main.c:126 +#: src/main.c:151 msgid "Print STRING when the end of a volume of the backup media is reached" msgstr "Ispiši NIZ kad je dosegnut kraj medija za sigurnosno kopiranje" -#: src/main.c:133 src/mt.c:182 tests/genfile.c:191 +#: src/main.c:153 src/mt.c:182 tests/genfile.c:191 msgid "COMMAND" msgstr "NAREDBA" @@ -980,26 +980,26 @@ msgid "Use COMMAND instead of rsh" msgstr "" -#: src/main.c:150 +#: src/main.c:160 msgid "Operation modifiers valid only in copy-in mode:" msgstr "Modifikatori operacija ispravni samo u načinu copy-in:" -#: src/main.c:129 +#: src/main.c:162 msgid "Only copy files that do not match any of the given patterns" msgstr "Kopiraj samo datoteke koje ne odgovaraju nijednom navedenom uzorku" -#: src/main.c:131 +#: src/main.c:164 msgid "In the verbose table of contents listing, show numeric UID and GID" msgstr "U opširnom ispisu sadržaja prikaži numerički UID i GID" -#: src/main.c:152 +#: src/main.c:167 msgid "" "Read additional patterns specifying filenames to extract or list from FILE" msgstr "" "Čitaj dodatne uzorke koji navode datoteke za ekstrakciju ili ispis iz " "DATOTEKE" -#: src/main.c:154 +#: src/main.c:169 msgid "" "When reading a CRC format archive, only verify the CRC's of each file in the " "archive, don't actually extract the files" @@ -1007,30 +1007,30 @@ "Pri čitanju arhive CRC oblika samo provjeri CRC svake datoteke u arhivi, bez " "otpakiranja datoteka" -#: src/main.c:156 +#: src/main.c:171 msgid "Interactively rename files" msgstr "Interaktivno preimenuj datoteke" -#: src/main.c:160 +#: src/main.c:175 msgid "" "Swap both halfwords of words and bytes of halfwords in the data. Equivalent " "to -sS" msgstr "" "Zamijeni obje poluriječi riječi i bajtove poluriječi u podacima. Isto kao -sS" -#: src/main.c:162 +#: src/main.c:177 msgid "Swap the bytes of each halfword in the files" msgstr "Zamijeni bajtove svake poluriječi u datotekama" -#: src/main.c:164 +#: src/main.c:179 msgid "Swap the halfwords of each word (4 bytes) in the files" msgstr "Zamijeni poluriječi svake riječi (4 bajta) u datotekama" -#: src/main.c:167 +#: src/main.c:182 msgid "Extract files to standard output" msgstr "Otpakiraj datoteke na standardni izlaz" -#: src/main.c:206 +#: src/main.c:184 msgid "" "Archive filename to use instead of standard input. Optional USER and HOST " "specify the user and host names in case of a remote archive" @@ -1039,15 +1039,15 @@ "KORISNIK i RAČUNALO označavaju imena korisnika i računala u slučaju udaljene " "arhive" -#: src/main.c:173 +#: src/main.c:190 msgid "Operation modifiers valid only in copy-out mode:" msgstr "Modifikatori operacija ispravni samo u načinu copy-out:" -#: src/main.c:175 +#: src/main.c:192 msgid "Append to an existing archive." msgstr "Dodaj u postojeću arhivu." -#: src/main.c:177 +#: src/main.c:194 msgid "" "Archive filename to use instead of standard output. Optional USER and HOST " "specify the user and host names in case of a remote archive" @@ -1068,28 +1068,28 @@ msgid "Create device-independent (reproducible) archives" msgstr "" -#: src/main.c:183 +#: src/main.c:207 msgid "Operation modifiers valid only in copy-pass mode:" msgstr "Modifikatori operacija ispravni samo u načinu copy-pass:" -#: src/main.c:185 +#: src/main.c:209 msgid "Link files instead of copying them, when possible" msgstr "Poveži datoteke umjesto njihovog kopiranja gdje je moguće" -#: src/main.c:192 +#: src/main.c:216 msgid "Operation modifiers valid in copy-in and copy-out modes:" msgstr "Modifikatori operacija ispravni u načinima copy-in i copy-out:" -#: src/main.c:194 +#: src/main.c:218 msgid "Do not strip file system prefix components from the file names" msgstr "" "Ne uklanjaj prefiksne komponente datotečnog sustava iz imena datoteka" -#: src/main.c:197 +#: src/main.c:221 msgid "Create all files relative to the current directory" msgstr "Napravi sve datoteke relativno u odnosu na trenutni direktorij" -#: src/main.c:202 +#: src/main.c:226 msgid "Operation modifiers valid in copy-out and copy-pass modes:" msgstr "Modifikatori operacija ispravni u načinima copy-out i copy-pass:" @@ -1098,7 +1098,7 @@ "Filenames in the list are delimited by null characters instead of newlines" msgstr "" -#: src/main.c:208 +#: src/main.c:230 msgid "" "Dereference symbolic links (copy the files that they point to instead of " "copying the links)." @@ -1106,46 +1106,44 @@ "Dereferenciraj simboličke veze (kopiraj datoteke na koje pokazuju umjesto " "kopiranja veza)." -#: src/main.c:212 +#: src/main.c:232 msgid "Reset the access times of files after reading them" msgstr "" "Vrati na početnu vrijednost vremena pristupa datotekama nakon čitanja" -#: src/main.c:218 +#: src/main.c:238 msgid "Operation modifiers valid in copy-in and copy-pass modes:" msgstr "Modifikatori operacija ispravni u načinima copy-in i copy-pass:" -#: src/main.c:220 +#: src/main.c:240 msgid "Retain previous file modification times when creating files" msgstr "Zadrži prethodna vremena uređivanja kod stvaranja datoteka" -#: src/main.c:222 +#: src/main.c:242 msgid "Create leading directories where needed" msgstr "Napravi vodeće direktorije gdje je potrebno" -#: src/main.c:224 +#: src/main.c:244 msgid "Do not change the ownership of the files" msgstr "Ne mijenjaj vlasništvo datoteka" -#: src/main.c:226 +#: src/main.c:246 msgid "Replace all files unconditionally" msgstr "Bezuvjetno zamijeni sve datoteke" -#: src/main.c:228 +#: src/main.c:248 msgid "Write files with large blocks of zeros as sparse files" msgstr "Zapiši datoteke s velikim blokovima nula kao raštrkane datoteke" -#: src/main.c:304 src/main.c:321 -#, c-format +#: src/main.c:324 src/main.c:341 msgid "invalid block size" msgstr "neispravna veličina bloka" -#: src/main.c:310 src/main.c:342 -#, c-format +#: src/main.c:330 src/main.c:366 msgid "Archive format multiply defined" msgstr "Oblik arhive definiran više puta" -#: src/main.c:360 +#: src/main.c:384 #, c-format msgid "" "invalid archive format `%s'; valid formats are:\n" @@ -1154,27 +1152,24 @@ "neispravan oblik arhive „%s”; ispravni oblici su:\n" "crc newc odc bin ustar tar (prepoznaje i sva velika slova)" -#: src/main.c:367 src/main.c:417 src/main.c:431 -#, c-format +#: src/main.c:391 src/main.c:436 src/main.c:450 msgid "Mode already defined" msgstr "Mod je već definiran" -#: src/main.c:411 -#, c-format +#: src/main.c:430 msgid "--no-preserve-owner cannot be used with --owner" msgstr "--no-preserve-owner se ne može koristiti uz --owner" -#: src/main.c:454 -#, c-format +#: src/main.c:485 msgid "--owner cannot be used with --no-preserve-owner" msgstr "--owner se ne može koristiti uz --no-preserve-owner" -#: src/main.c:501 +#: src/main.c:532 #, c-format msgid "Invalid value for --warning option: %s" msgstr "Neispravna vrijednost opcije --warning: %s" -#: src/main.c:531 +#: src/main.c:562 msgid "[destination-directory]" msgstr "[odredišni-direktorij]" @@ -1182,61 +1177,55 @@ msgid "You must specify one of -oipt options." msgstr "" -#: src/main.c:589 -#, c-format +#: src/main.c:624 msgid "Both -I and -F are used in copy-in mode" msgstr "Koriste se opcije -I i -F u copy-in načinu" -#: src/main.c:601 src/main.c:637 -#, c-format +#: src/main.c:636 src/main.c:676 msgid "Too many arguments" msgstr "Previše argumenata" -#: src/main.c:620 -#, c-format +#: src/main.c:655 msgid "" "--append is used but no archive file name is given (use -F or -O options)" msgstr "" "koristi se --append, ali nije navedena arhiva (koristite opciju -F ili -O)" -#: src/main.c:626 -#, c-format +#: src/main.c:662 msgid "Both -O and -F are used in copy-out mode" msgstr "Koriste se opcije -O i -F u copy-out načinu" -#: src/main.c:639 -#, c-format +#: src/main.c:678 msgid "Not enough arguments" msgstr "Nema dovoljno argumenata" -#: src/main.c:643 -#, c-format +#: src/main.c:682 msgid "" "Archive format is not specified in copy-pass mode (use --format option)" msgstr "" "Nije naveden oblik arhive u copy-pass načinu (koristite opciju --format)" -#: src/main.c:665 +#: src/main.c:708 #, c-format msgid "-F can be used only with --create or --extract" msgstr "-F se može koristiti samo uz --create ili --extract" -#: src/main.c:668 +#: src/main.c:711 #, c-format msgid "Cannot open %s" msgstr "Ne mogu otvoriti %s" -#: src/main.c:740 +#: src/main.c:783 #, c-format msgid "error closing archive" msgstr "greška zatvaranja arhive" -#: src/makepath.c:96 src/makepath.c:155 +#: src/makepath.c:82 src/makepath.c:129 #, c-format msgid "cannot make directory `%s'" msgstr "ne mogu napraviti direktorij „%s”" -#: src/makepath.c:131 src/makepath.c:181 +#: src/makepath.c:105 src/makepath.c:155 #, c-format msgid "`%s' exists but is not a directory" msgstr "„%s” postoji, ali nije direktorij" @@ -1295,20 +1284,20 @@ msgid "%s: rmtclose failed" msgstr "%s: rmtclose nije uspio" -#: src/tar.c:309 +#: src/tar.c:303 #, c-format msgid "invalid header: checksum error" msgstr "neispravno zaglavlje: greška kontrolne sume" -#: src/userspec.c:116 +#: src/userspec.c:122 msgid "invalid user" msgstr "neispravan korisnik" -#: src/userspec.c:122 +#: src/userspec.c:128 msgid "cannot get the login group of a numeric UID" msgstr "ne mogu dobiti prijavnu grupu numeričkog UID-a" -#: src/userspec.c:162 +#: src/userspec.c:175 msgid "invalid group" msgstr "neispravna grupa" @@ -1317,17 +1306,17 @@ msgid "write error: partial write" msgstr "" -#: src/util.c:207 src/util.c:376 +#: src/util.c:210 src/util.c:376 #, c-format msgid "read error" msgstr "greška čitanja" -#: src/util.c:210 +#: src/util.c:212 #, c-format msgid "premature end of file" msgstr "preuranjen kraj datoteke" -#: src/util.c:495 src/util.c:545 +#: src/util.c:495 src/util.c:546 #, c-format msgid "File %s shrunk by %s byte, padding with zeros" msgid_plural "File %s shrunk by %s bytes, padding with zeros" @@ -1335,12 +1324,12 @@ msgstr[1] "Datoteka %s smanjena za %s bajta, nadopunjavam nulama" msgstr[2] "Datoteka %s smanjena za %s bajtova, nadopunjavam nulama" -#: src/util.c:501 src/util.c:551 +#: src/util.c:502 src/util.c:553 #, c-format msgid "Read error at byte %lld in file %s, padding with zeros" msgstr "Greška čitanja na bajtu %lld u datoteci %s, nadopunjavam nulama" -#: src/util.c:586 +#: src/util.c:588 #, c-format msgid "File %s grew, % new byte not copied" msgid_plural "File %s grew, % new bytes not copied" @@ -1348,47 +1337,47 @@ msgstr[1] "Datoteka %s se povećala, % nova bajta nisu kopirana" msgstr[2] "Datoteka %s se povećala, % novih bajtova nije kopirano" -#: src/util.c:592 +#: src/util.c:594 #, c-format msgid "File %s was modified while being copied" msgstr "Datoteka %s se promijenila za vrijeme kopiranja" -#: src/util.c:620 +#: src/util.c:608 #, c-format msgid "virtual memory exhausted" msgstr "virtualna memorija iscrpljena" -#: src/util.c:626 +#: src/util.c:614 #, c-format msgid "Creating intermediate directory `%s'" msgstr "Stvaram posredni direktorij „%s”" -#: src/util.c:663 src/util.c:669 +#: src/util.c:651 src/util.c:657 #, c-format msgid "cannot seek on output" msgstr "ne mogu tražiti na izlazu" -#: src/util.c:841 +#: src/util.c:875 #, c-format msgid "Found end of tape. Load next tape and press RETURN. " msgstr "Pronađen kraj vrpce. Učitajte sljedeću vrpcu i pritisnite RETURN. " -#: src/util.c:843 +#: src/util.c:877 #, c-format msgid "Found end of tape. To continue, type device/file name when ready.\n" msgstr "Pronađen kraj vrpce. Za nastavak, upišite ime uređaja/vrpce.\n" -#: src/util.c:866 +#: src/util.c:900 #, c-format msgid "To continue, type device/file name when ready.\n" msgstr "Za nastavak upišite ime uređaja/datoteke.\n" -#: src/util.c:891 +#: src/util.c:925 #, c-format msgid "internal error: tape descriptor changed from %d to %d" msgstr "interna greška: opisnik vrpce se promijenio iz %d u %d" -#: src/util.c:1610 +#: src/util.c:1487 #, c-format msgid "%s is not a directory" msgstr "%s nije direktorij" @@ -1549,7 +1538,7 @@ msgid "Negative size: %s" msgstr "Negativna veličina: %s" -#: tests/genfile.c:266 tests/genfile.c:568 +#: tests/genfile.c:266 tests/genfile.c:630 #, c-format msgid "stat(%s) failed" msgstr "stat(%s) nije uspio" @@ -1578,8 +1567,8 @@ msgid "[ARGS...]" msgstr "[ARGUMENTI...]" -#: tests/genfile.c:429 tests/genfile.c:469 tests/genfile.c:522 -#: tests/genfile.c:672 tests/genfile.c:686 +#: tests/genfile.c:429 tests/genfile.c:469 tests/genfile.c:571 +#: tests/genfile.c:734 tests/genfile.c:748 #, c-format msgid "cannot open `%s'" msgstr "ne mogu otvoriti „%s”" @@ -1593,24 +1582,24 @@ msgid "file name contains null character" msgstr "ime datoteke sadrži prazan (null) znak" -#: tests/genfile.c:517 +#: tests/genfile.c:566 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" "ne mogu stvoriti raštrkane datoteke na standardnom izlazu, koristite opciju -" "-file" -#: tests/genfile.c:595 +#: tests/genfile.c:657 #, c-format msgid "incorrect mask (near `%s')" msgstr "netočna maska (kod „%s”)" -#: tests/genfile.c:601 tests/genfile.c:634 +#: tests/genfile.c:663 tests/genfile.c:696 #, c-format msgid "Unknown field `%s'" msgstr "Nepoznato polje „%s”" -#: tests/genfile.c:661 +#: tests/genfile.c:723 #, c-format msgid "cannot set time on `%s'" msgstr "ne mogu postaviti vrijeme na „%s”" @@ -1625,42 +1614,42 @@ msgid "command failed: %s" msgstr "" -#: tests/genfile.c:700 +#: tests/genfile.c:767 #, c-format msgid "cannot unlink `%s'" msgstr "ne mogu ukloniti vezu „%s”" -#: tests/genfile.c:826 +#: tests/genfile.c:894 #, c-format msgid "Command exited successfully\n" msgstr "Izlaz naredbe uspješan\n" -#: tests/genfile.c:828 +#: tests/genfile.c:896 #, c-format msgid "Command failed with status %d\n" msgstr "Naredba nije uspjela sa stanjem %d\n" -#: tests/genfile.c:832 +#: tests/genfile.c:900 #, c-format msgid "Command terminated on signal %d\n" msgstr "Naredba završena signalom %d\n" -#: tests/genfile.c:834 +#: tests/genfile.c:902 #, c-format msgid "Command stopped on signal %d\n" msgstr "Naredba zaustavljena signalom %d\n" -#: tests/genfile.c:837 +#: tests/genfile.c:905 #, c-format msgid "Command dumped core\n" msgstr "Naredba je izbacila jezgru\n" -#: tests/genfile.c:840 +#: tests/genfile.c:908 #, c-format msgid "Command terminated\n" msgstr "Naredba završena\n" -#: tests/genfile.c:872 +#: tests/genfile.c:940 #, c-format msgid "--stat requires file names" msgstr "--stat zahtijeva imena datoteka" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/cups.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/cups.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/cups.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/cups.po 2022-02-11 23:13: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: 2021-08-02 17:51+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:47+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" #: systemv/lpstat.c:1871 systemv/lpstat.c:1990 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/cwidget.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/cwidget.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/cwidget.po 2021-08-03 09:03:58.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/cwidget.po 2022-02-11 23:13:52.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:45+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:41+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/debconf.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/debconf.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/debconf.po 2021-08-03 09:03:58.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/debconf.po 2022-02-11 23:13:53.000000000 +0000 @@ -14,33 +14,33 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:08+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 14:59+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: ../Debconf/AutoSelect.pm:88 +#: ../Debconf/AutoSelect.pm:89 #, perl-format msgid "falling back to frontend: %s" msgstr "vraćam na sučelje: %s" -#: ../Debconf/AutoSelect.pm:96 +#: ../Debconf/AutoSelect.pm:97 #, perl-format msgid "unable to initialize frontend: %s" msgstr "nemoguće pokretanje sučelja: %s" -#: ../Debconf/AutoSelect.pm:102 +#: ../Debconf/AutoSelect.pm:103 #, perl-format msgid "Unable to start a frontend: %s" msgstr "Nemoguće pokretanje sučelje: %s" -#: ../Debconf/Config.pm:130 +#: ../Debconf/Config.pm:131 msgid "Config database not specified in config file." msgstr "Baza podataka podešavanja nije navedena u datoteci podešavanja." -#: ../Debconf/Config.pm:134 +#: ../Debconf/Config.pm:135 msgid "Template database not specified in config file." msgstr "Baza predložaka nije navedena u datoteci podešavanja." -#: ../Debconf/Config.pm:139 +#: ../Debconf/Config.pm:140 msgid "" "The Sigils and Smileys options in the config file are no longer used. Please " "remove them." @@ -48,13 +48,13 @@ "\"Sigils and Smileys\" mogućnost u datoteci podešavanja se više ne koristi. " "Uklonite ju!" -#: ../Debconf/Config.pm:153 +#: ../Debconf/Config.pm:157 #, perl-format msgid "Problem setting up the database defined by stanza %s of %s." msgstr "" "Problem pri postavljanju baze podataka definirane u odlomku %s od %s." -#: ../Debconf/Config.pm:228 +#: ../Debconf/Config.pm:232 msgid "" " -f, --frontend\t\tSpecify debconf frontend to use.\n" " -p, --priority\t\tSpecify minimum priority question to show.\n" @@ -64,12 +64,12 @@ " -p, --priority\t\tOdređuje najmanji prioritet za prikazivanje pitanja.\n" " --terse\t\t\tOmogućava sažet prikaz.\n" -#: ../Debconf/Config.pm:308 +#: ../Debconf/Config.pm:312 #, perl-format msgid "Ignoring invalid priority \"%s\"" msgstr "Zanemarivam neispravan prioritet \"%s\"" -#: ../Debconf/Config.pm:309 +#: ../Debconf/Config.pm:313 #, perl-format msgid "Valid priorities are: %s" msgstr "Ispravni prioriteti su: %s" @@ -135,7 +135,7 @@ "Upisana vrijednost, \"%s\" nije pronađena u C izborima! Ovo se nikad ne bi " "smjelo dogoditi. Možda je predložak pogrešno lokaliziran." -#: ../Debconf/Element/Teletype/Multiselect.pm:27 +#: ../Debconf/Element/Teletype/Multiselect.pm:59 msgid "none of the above" msgstr "ništa od navedenog" @@ -170,7 +170,7 @@ "Dijalog sučelje neće raditi na pasivnom terminalu, emacs međuspremnikom " "ljuske ili bez kontrolnog terminala." -#: ../Debconf/FrontEnd/Dialog.pm:105 +#: ../Debconf/FrontEnd/Dialog.pm:107 msgid "" "No usable dialog-like program is installed, so the dialog based frontend " "cannot be used." @@ -178,14 +178,14 @@ "Nije instaliran upotrebljivi dijalog program, te se dijalog sučelje neće " "moći koristiti." -#: ../Debconf/FrontEnd/Dialog.pm:112 +#: ../Debconf/FrontEnd/Dialog.pm:114 msgid "" "Dialog frontend requires a screen at least 13 lines tall and 31 columns wide." msgstr "" "Djialog sučelja zahtijeva zaslon s najmanje 13 redaka visine i 31 znakom " "širine." -#: ../Debconf/FrontEnd/Dialog.pm:296 +#: ../Debconf/FrontEnd/Dialog.pm:331 msgid "Package configuration" msgstr "Podešavanje paketa" @@ -243,8 +243,7 @@ msgid "Continue" msgstr "Nastavi" -#: ../Debconf/FrontEnd/Gnome.pm:218 ../Debconf/FrontEnd/Kde.pm:100 -#: ../Debconf/FrontEnd/Kde.pm:104 +#: ../Debconf/FrontEnd/Gnome.pm:218 #, perl-format msgid "Debconf on %s" msgstr "Debconf na %s" @@ -261,7 +260,7 @@ msgid "This frontend requires a controlling tty." msgstr "Ovo sučelje zahtijeva tty upravljanje." -#: ../Debconf/FrontEnd/Readline.pm:58 +#: ../Debconf/FrontEnd/Readline.pm:62 msgid "Term::ReadLine::GNU is incompatable with emacs shell buffers." msgstr "Term::ReadLine::GNU nije kompatibilan s emacs međuspremnikom ljuske." diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/debian-tasks.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/debian-tasks.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/debian-tasks.po 2021-08-03 09:03:57.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/debian-tasks.po 2022-02-11 23:13:52.000000000 +0000 @@ -14,17 +14,17 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:11+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:04+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" #. Description -#: ../po/debian-tasks.desc:10001 +#: ../po/debian-tasks.desc:11001 msgid "standard system utilities" msgstr "Standardni alati sustava" #. Description -#: ../po/debian-tasks.desc:10001 +#: ../po/debian-tasks.desc:11001 msgid "" "This task sets up a basic user environment, providing a reasonably small " "selection of services and tools usable on the command line." diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/debianutils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/debianutils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/debianutils.po 2021-08-03 09:03:53.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/debianutils.po 2022-02-11 23:13: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: 2021-08-02 17:56+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:52+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #. type: TH #: ../sensible-editor.1:2 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kde-config-whoopsie.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kde-config-whoopsie.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kde-config-whoopsie.po 2021-08-03 09:04:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kde-config-whoopsie.po 2022-02-11 23:13:54.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: 2021-08-02 18:27+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:24+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/kcm_whoopsie.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kubuntu-driver-manager.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kubuntu-driver-manager.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2022-02-11 23:13:50.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: 2021-08-02 18:27+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:24+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/kcm_driver_manager.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kubuntu-notification-helper.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kubuntu-notification-helper.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2021-08-03 09:03:52.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kubuntu-notification-helper.po 2022-02-11 23:13: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: 2021-08-02 18:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:59+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: src/daemon/notificationhelper.desktop:2 msgctxt "Name" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2021-08-03 09:03:54.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/desktop_kubuntu-web-shortcuts.po 2022-02-11 23:13:49.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: 2021-08-02 18:12+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:08+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: searchproviders/brainstorm.desktop:5 msgctxt "Name" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/diffutils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/diffutils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/diffutils.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/diffutils.po 2022-02-11 23:13:51.000000000 +0000 @@ -14,30 +14,30 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:13+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:07+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/argmatch.c:134 +#: lib/argmatch.c:132 #, c-format msgid "invalid argument %s for %s" msgstr "nevaljani argument %s for %s" -#: lib/argmatch.c:135 +#: lib/argmatch.c:133 #, c-format msgid "ambiguous argument %s for %s" msgstr "višeznačni argument %s za %s" -#: lib/argmatch.c:154 +#: lib/argmatch.c:152 lib/argmatch.h:223 msgid "Valid arguments are:" msgstr "Valjani argumenti su:" -#: lib/c-stack.c:208 lib/c-stack.c:301 +#: lib/c-stack.c:187 msgid "program error" msgstr "programska greška" -#: lib/c-stack.c:209 lib/c-stack.c:302 +#: lib/c-stack.c:188 msgid "stack overflow" msgstr "prelijevanje stȏga" @@ -197,11 +197,11 @@ #. If you don't know what to put here, please see #. #. and use glyphs suitable for your language. -#: lib/quotearg.c:362 +#: lib/quotearg.c:355 msgid "`" msgstr "„" -#: lib/quotearg.c:363 +#: lib/quotearg.c:356 msgid "'" msgstr "“" @@ -273,7 +273,7 @@ msgid "Unmatched ) or \\)" msgstr "Nesparena ) ili \\)" -#: lib/regcomp.c:688 +#: lib/regcomp.c:676 msgid "No previous regular expression" msgstr "Nema prethodnog regularnog izraza" @@ -281,23 +281,23 @@ msgid "memory exhausted" msgstr "nema dovoljno memorije" -#: lib/xfreopen.c:35 +#: lib/xfreopen.c:34 msgid "stdin" msgstr "standardni ulaz" -#: lib/xfreopen.c:36 +#: lib/xfreopen.c:35 msgid "stdout" msgstr "standardni izlaz" -#: lib/xfreopen.c:37 +#: lib/xfreopen.c:36 msgid "stderr" msgstr "standardni izlaz za greške" -#: lib/xfreopen.c:38 +#: lib/xfreopen.c:37 msgid "unknown stream" msgstr "nepoznat tok podataka" -#: lib/xfreopen.c:39 +#: lib/xfreopen.c:38 #, c-format msgid "failed to reopen %s with mode %s" msgstr "nije uspjelo ponovo otvoriti %s u načinu %s" @@ -351,19 +351,19 @@ "\n" #. TRANSLATORS: %s denotes an author name. -#: lib/version-etc.c:102 +#: lib/version-etc.c:105 #, c-format msgid "Written by %s.\n" msgstr "Napisao %s.\n" #. TRANSLATORS: Each %s denotes an author name. -#: lib/version-etc.c:106 +#: lib/version-etc.c:109 #, c-format msgid "Written by %s and %s.\n" msgstr "Napisali %s i %s.\n" #. TRANSLATORS: Each %s denotes an author name. -#: lib/version-etc.c:110 +#: lib/version-etc.c:113 #, c-format msgid "Written by %s, %s, and %s.\n" msgstr "Napisali %s, %s i %s.\n" @@ -371,7 +371,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:117 +#: lib/version-etc.c:120 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -383,7 +383,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:124 +#: lib/version-etc.c:127 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -395,7 +395,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:131 +#: lib/version-etc.c:134 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -407,7 +407,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:139 +#: lib/version-etc.c:142 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -419,7 +419,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:147 +#: lib/version-etc.c:150 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -433,7 +433,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:156 +#: lib/version-etc.c:159 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -447,7 +447,7 @@ #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies #. ca. 16 screen columns and that a screen line has ca. 80 columns. -#: lib/version-etc.c:167 +#: lib/version-etc.c:170 #, c-format msgid "" "Written by %s, %s, %s,\n" @@ -472,12 +472,12 @@ "Prijavite programske greške (na engleskom, LC_ALL=C) na %s.\n" "Prijavite pogreške u prijevodu na .\n" -#: lib/version-etc.c:247 +#: lib/version-etc.c:251 #, c-format msgid "Report %s bugs to: %s\n" msgstr "Prijavite %s greške na %s\n" -#: lib/version-etc.c:251 +#: lib/version-etc.c:255 lib/version-etc.c:257 #, c-format msgid "%s home page: <%s>\n" msgstr "Mrežna stranica za %s: <%s>\n" @@ -492,7 +492,7 @@ msgstr "" "Općenita pomoć za korištenje GNU softvera: \n" -#: src/analyze.c:454 src/diff.c:1404 +#: src/analyze.c:454 src/diff.c:1406 #, c-format msgid "Files %s and %s differ\n" msgstr "Datoteke %s i %s su različite\n" @@ -502,55 +502,55 @@ msgid "Binary files %s and %s differ\n" msgstr "Binarne datoteke %s i %s se razlikuju\n" -#: src/analyze.c:706 src/diff3.c:1465 src/util.c:1254 +#: src/analyze.c:706 src/diff3.c:1470 src/util.c:1254 msgid "No newline at end of file" msgstr "Nema znaka za kraj retka (LF) na kraju datoteke" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:44 +#: src/cmp.c:45 msgid "Torbjorn Granlund" msgstr "Torbjorn Granlund" #. This is a proper name. See the gettext manual, section Names. -#: src/cmp.c:45 +#: src/cmp.c:46 msgid "David MacKenzie" msgstr "David MacKenzie" -#: src/cmp.c:119 src/diff.c:877 src/diff3.c:462 src/sdiff.c:159 +#: src/cmp.c:120 src/diff.c:879 src/diff3.c:467 src/sdiff.c:160 #, c-format msgid "Try '%s --help' for more information." msgstr "Pokušajte s „%s --help“ za pomoć i više informacija." -#: src/cmp.c:137 +#: src/cmp.c:138 #, c-format msgid "invalid --ignore-initial value '%s'" msgstr "nevaljana vrijednost „%s“ za --ignore-initial" -#: src/cmp.c:147 +#: src/cmp.c:148 #, c-format msgid "options -l and -s are incompatible" msgstr "opcije -l i -s nisu kompatibilne" -#: src/cmp.c:155 src/diff.c:885 src/diff3.c:469 src/sdiff.c:167 src/sdiff.c:315 -#: src/sdiff.c:322 src/sdiff.c:874 src/util.c:852 src/util.c:952 src/util.c:959 +#: src/cmp.c:156 src/diff.c:887 src/diff3.c:474 src/sdiff.c:168 src/sdiff.c:316 +#: src/sdiff.c:323 src/sdiff.c:876 src/util.c:852 src/util.c:952 src/util.c:959 msgid "write failed" msgstr "pisanje nije uspjelo" -#: src/cmp.c:157 src/diff.c:887 src/diff.c:1469 src/diff3.c:471 src/sdiff.c:169 +#: src/cmp.c:158 src/diff.c:889 src/diff.c:1471 src/diff3.c:476 src/sdiff.c:170 msgid "standard output" msgstr "standardni izlaz" -#: src/cmp.c:161 +#: src/cmp.c:162 msgid "-b, --print-bytes print differing bytes" msgstr "-b, --print-bytes ispiše različite bajtove" -#: src/cmp.c:162 +#: src/cmp.c:163 msgid "" "-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs" msgstr "" "-i, --ignore-initial=BROJ preskoči prvih BROJ bajtova oba ulaza" -#: src/cmp.c:163 +#: src/cmp.c:164 msgid "" "-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2" @@ -558,40 +558,40 @@ "-i, --ignore-initial=SKIP1:SKIP2 preskoči prvih SKIP1 bajtova DATOTEKE1\n" " i prvih SKIP2 bajtova DATOTEKE2" -#: src/cmp.c:165 +#: src/cmp.c:166 msgid "" "-l, --verbose output byte numbers and differing byte values" msgstr "" "-l, --verbose pokaže poziciju i vrijednost različitih bajtova" -#: src/cmp.c:166 +#: src/cmp.c:167 msgid "-n, --bytes=LIMIT compare at most LIMIT bytes" msgstr "-n, --bytes=BROJ usporedi ne više od BROJ bajtova" -#: src/cmp.c:167 +#: src/cmp.c:168 msgid "-s, --quiet, --silent suppress all normal output" msgstr "" "-s, --quiet, --silent izostavi normalni izlaz (ispiše samo status " "izlaza)" -#: src/cmp.c:168 +#: src/cmp.c:169 msgid " --help display this help and exit" msgstr " --help pokaže ovu pomoć i iziđe" -#: src/cmp.c:169 +#: src/cmp.c:170 msgid "-v, --version output version information and exit" msgstr "-v, --version informacije o inačici ovog programa" -#: src/cmp.c:178 +#: src/cmp.c:179 #, c-format msgid "Usage: %s [OPTION]... FILE1 [FILE2 [SKIP1 [SKIP2]]]\n" msgstr "Uporaba: %s [OPCIJA]... DATOTEKA1 [DATOTEKA2 [SKIP1 [SKIP2]]]\n" -#: src/cmp.c:180 +#: src/cmp.c:181 msgid "Compare two files byte by byte." msgstr "Usporedi dvije datoteke bajt po bajt." -#: src/cmp.c:182 +#: src/cmp.c:183 msgid "" "The optional SKIP1 and SKIP2 specify the number of bytes to skip\n" "at the beginning of each file (zero by default)." @@ -599,13 +599,13 @@ "Neobvezne vrijednosti SKIP1 i SKIP2 specificiraju broj bajtova koje treba\n" "preskočiti od početka svake datoteke (zadano 0)." -#: src/cmp.c:185 src/diff.c:997 src/diff3.c:509 src/sdiff.c:210 +#: src/cmp.c:186 src/diff.c:999 src/diff3.c:514 src/sdiff.c:211 msgid "" "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obvezni argumenti dugačkih opcija obvezni su također i za kratke opcije.\n" -#: src/cmp.c:191 +#: src/cmp.c:192 msgid "" "SKIP values may be followed by the following multiplicative suffixes:\n" "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" @@ -615,194 +615,194 @@ "kB 1000, K 1024, MB 1,000,000, M 1,048,576,\n" "GB 1,000,000,000, G 1,073,741,824, itd. za T, P, E, Z, Y." -#: src/cmp.c:194 +#: src/cmp.c:195 msgid "If a FILE is '-' or missing, read standard input." msgstr "Ako DATOTEKA nije navedena ili je „-“, čita standardni ulaz." -#: src/cmp.c:195 src/diff.c:985 src/sdiff.c:220 +#: src/cmp.c:196 src/diff.c:987 src/sdiff.c:221 msgid "" "Exit status is 0 if inputs are the same, 1 if different, 2 if trouble." msgstr "" -"Izlazni status je 0 ako su ulazi jednaki, 1 ako su različiti, 2 pri greški" +"Izlazni status je 0 ako su ulazi jednaki, 1 ako su različiti, 2 pri greški." -#: src/cmp.c:240 +#: src/cmp.c:243 #, c-format msgid "invalid --bytes value '%s'" msgstr "nevaljana vrijednost „%s“ za --bytes" -#: src/cmp.c:266 src/diff.c:795 src/diff3.c:356 src/sdiff.c:565 +#: src/cmp.c:269 src/diff.c:797 src/diff3.c:361 src/sdiff.c:567 #, c-format msgid "missing operand after '%s'" msgstr "nedostaje operand iza „%s“" -#: src/cmp.c:278 src/diff.c:797 src/diff3.c:358 src/sdiff.c:567 +#: src/cmp.c:281 src/diff.c:799 src/diff3.c:363 src/sdiff.c:569 #, c-format msgid "extra operand '%s'" msgstr "suvišni operand „%s“" -#: src/cmp.c:498 +#: src/cmp.c:507 #, c-format msgid "%s %s differ: byte %s, line %s\n" msgstr "%s %s se razlikuju: bajt %s, redak %s\n" -#: src/cmp.c:514 +#: src/cmp.c:523 #, c-format msgid "%s %s differ: byte %s, line %s is %3o %s %3o %s\n" msgstr "%s %s se razlikuju: bajt %s, redak %s je %3o %s %3o %s\n" -#: src/cmp.c:571 +#: src/cmp.c:580 #, c-format msgid "cmp: EOF on %s which is empty\n" msgstr "cmp: kraj datoteke (EOF) u %s koji je prazan\n" -#: src/cmp.c:585 +#: src/cmp.c:594 #, c-format msgid "cmp: EOF on %s after byte %s, line %s\n" msgstr "cmp: kraj datoteke (EOF) u %s iza bajta %s, redak %s\n" -#: src/cmp.c:586 +#: src/cmp.c:595 #, c-format msgid "cmp: EOF on %s after byte %s, in line %s\n" msgstr "cmp: kraj datoteke (EOF) u %s iza bajta %s, u retku %s\n" -#: src/cmp.c:592 +#: src/cmp.c:601 #, c-format msgid "cmp: EOF on %s after byte %s\n" msgstr "cmp: kraj datoteke (EOF) u %s iza bajta %s\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:50 +#: src/diff.c:51 msgid "Paul Eggert" msgstr "Paul Eggert" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:51 +#: src/diff.c:52 msgid "Mike Haertel" msgstr "Mike Haertel" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:52 +#: src/diff.c:53 msgid "David Hayes" msgstr "David Hayes" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:53 +#: src/diff.c:54 msgid "Richard Stallman" msgstr "Richard Stallman" #. This is a proper name. See the gettext manual, section Names. -#: src/diff.c:54 +#: src/diff.c:55 msgid "Len Tower" msgstr "Len Tower" -#: src/diff.c:353 +#: src/diff.c:355 #, c-format msgid "invalid context length '%s'" msgstr "nevaljana duljina konteksta „%s“" -#: src/diff.c:436 +#: src/diff.c:438 #, c-format msgid "pagination not supported on this host" msgstr "paginacija nije podržana na ovom računalu" -#: src/diff.c:451 src/diff3.c:336 +#: src/diff.c:453 src/diff3.c:341 #, c-format msgid "too many file label options" msgstr "previše opcija datotečnih oznaka (label)" -#: src/diff.c:528 +#: src/diff.c:530 #, c-format msgid "invalid width '%s'" msgstr "nevaljana širina „%s“" -#: src/diff.c:532 +#: src/diff.c:534 msgid "conflicting width options" msgstr "konfliktne opcije za širinu" -#: src/diff.c:557 +#: src/diff.c:559 #, c-format msgid "invalid horizon length '%s'" msgstr "nevaljana duljina „%s“ za horizon" -#: src/diff.c:613 +#: src/diff.c:615 #, c-format msgid "invalid tabsize '%s'" msgstr "nevaljana širina „%s“ za tab(ulator)" -#: src/diff.c:617 +#: src/diff.c:619 msgid "conflicting tabsize options" msgstr "konfliktne opcije za širinu tab(ulatora)" -#: src/diff.c:772 +#: src/diff.c:774 msgid "--from-file and --to-file both specified" msgstr "specificirani su --from-file i --to-file" -#: src/diff.c:891 +#: src/diff.c:893 msgid " --normal output a normal diff (the default)" msgstr " --normal prikaže normalni diff (zadano)" -#: src/diff.c:892 +#: src/diff.c:894 msgid "-q, --brief report only when files differ" msgstr "" "-q, --brief izvijesti samo kad se datoteke razlikuju" -#: src/diff.c:893 +#: src/diff.c:895 msgid "-s, --report-identical-files report when two files are the same" msgstr "-s, --report-identical-files izvijesti kad su datoteke jednake" -#: src/diff.c:894 +#: src/diff.c:896 msgid "" "-c, -C NUM, --context[=NUM] output NUM (default 3) lines of copied context" msgstr "" "-c, -C NUM, --context[=BROJ] pokaže BROJ (zadano 3) retka\n" " kopiranog konteksta" -#: src/diff.c:895 +#: src/diff.c:897 msgid "" "-u, -U NUM, --unified[=NUM] output NUM (default 3) lines of unified context" msgstr "" "-u, -U NUM, --unified[=BROJ] pokaže BROJ (zadano 3) unificiranog konteksta" -#: src/diff.c:896 +#: src/diff.c:898 msgid "-e, --ed output an ed script" msgstr "-e, --ed generira i prikaže ed-script" -#: src/diff.c:897 +#: src/diff.c:899 msgid "-n, --rcs output an RCS format diff" msgstr "-n, --rcs prikaže diff u RCS formatu" -#: src/diff.c:898 +#: src/diff.c:900 msgid "-y, --side-by-side output in two columns" msgstr "-y, --side-by-side prikaz u dva stupca" -#: src/diff.c:899 +#: src/diff.c:901 msgid "" "-W, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-W, --width=BROJ prikaže ne više od BROJ (zadano 130)\n" " znakova po retku" -#: src/diff.c:900 +#: src/diff.c:902 msgid "" " --left-column output only the left column of common lines" msgstr "" " --left-column pokaže samo lijevi stupac kad su redci jednaki" -#: src/diff.c:901 +#: src/diff.c:903 msgid " --suppress-common-lines do not output common lines" msgstr " --suppress-common-lines ne prikazuje jednake retke" -#: src/diff.c:903 +#: src/diff.c:905 msgid "-p, --show-c-function show which C function each change is in" msgstr "" "-p, --show-c-function pokaže u kojoj C funkcije je svaka promjena" -#: src/diff.c:904 +#: src/diff.c:906 msgid "-F, --show-function-line=RE show the most recent line matching RE" msgstr "" "-F, --show-function-line=RE pokaže najnoviji redak podudaran s RE (regexp)" -#: src/diff.c:905 +#: src/diff.c:907 msgid "" " --label LABEL use LABEL instead of file name and timestamp\n" " (can be repeated)" @@ -810,87 +810,87 @@ " --label LABEL koristi LABEL umjesto imena i vremenskog žiga\n" " datoteke (može se ponavljati)" -#: src/diff.c:908 +#: src/diff.c:910 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs na izlazu proširi tab(ulatore) u razmake" -#: src/diff.c:909 +#: src/diff.c:911 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab poravna umetanjem tab(ulatora) na početak retka" -#: src/diff.c:910 +#: src/diff.c:912 msgid "" " --tabsize=NUM tab stops every NUM (default 8) print columns" msgstr "" " --tabsize=BROJ tabulacija svakih BROJ (zadano 8) stupaca" -#: src/diff.c:911 +#: src/diff.c:913 msgid "" " --suppress-blank-empty suppress space or tab before empty output lines" msgstr "" " --suppress-blank-empty izostavi razmak ili tab ispred\n" " praznih izlaznih redaka" -#: src/diff.c:912 +#: src/diff.c:914 msgid "-l, --paginate pass output through 'pr' to paginate it" msgstr "" "-l, --paginate proslijedi izlaz na paginaciju kroz „pr“" -#: src/diff.c:914 +#: src/diff.c:916 msgid "" "-r, --recursive recursively compare any subdirectories found" msgstr "" "-r, --recursive rekurzivno uspoređuje sve poddirektorije" -#: src/diff.c:915 +#: src/diff.c:917 msgid " --no-dereference don't follow symbolic links" msgstr " --no-dereference ne slijedi simboličke poveznice" -#: src/diff.c:916 +#: src/diff.c:918 msgid "-N, --new-file treat absent files as empty" msgstr "-N, --new-file tretira odsutne datoteke kao prazne" -#: src/diff.c:917 +#: src/diff.c:919 msgid " --unidirectional-new-file treat absent first files as empty" msgstr "" " --unidirectional-new-file tretira samo datoteke odsutne\n" " u prvom direktoriju kao prazne" -#: src/diff.c:918 +#: src/diff.c:920 msgid " --ignore-file-name-case ignore case when comparing file names" msgstr "" " --ignore-file-name-case ignorira veličinu slova pri\n" " uspoređivanju imena datoteka" -#: src/diff.c:919 +#: src/diff.c:921 msgid "" " --no-ignore-file-name-case consider case when comparing file names" msgstr "" " --no-ignore-file-name-case ne ignorira veličinu slova\n" " pri uspoređivanju imena datoteka" -#: src/diff.c:920 +#: src/diff.c:922 msgid "-x, --exclude=PAT exclude files that match PAT" msgstr "" "-x, --exclude=UZORAK izostavi datoteke podudarne s UZORKOM" -#: src/diff.c:921 +#: src/diff.c:923 msgid "" "-X, --exclude-from=FILE exclude files that match any pattern in FILE" msgstr "" "-X, --exclude-from=DATOTEKA izostavi datoteke podudarne s bilo kojim\n" " uzorkom u DATOTECI" -#: src/diff.c:922 +#: src/diff.c:924 msgid "" "-S, --starting-file=FILE start with FILE when comparing directories" msgstr "" "-S, --starting-file=DATOTEKA pri uspoređivanju direktorija\n" " započinje s DATOTEKOM" -#: src/diff.c:923 +#: src/diff.c:925 msgid "" " --from-file=FILE1 compare FILE1 to all operands;\n" " FILE1 can be a directory" @@ -898,7 +898,7 @@ " --from-file=DATOTEKA1 usporedi DATOTEKU1 sa svim argumentima;\n" " DATOTEKA1 može biti direktorij" -#: src/diff.c:925 +#: src/diff.c:927 msgid "" " --to-file=FILE2 compare all operands to FILE2;\n" " FILE2 can be a directory" @@ -906,40 +906,40 @@ " --to-file=DATOTEKA2 usporedi sve argumente s DATOTEKOM2;\n" " DATOTEKA2 može biti direktorij" -#: src/diff.c:928 +#: src/diff.c:930 msgid "" "-i, --ignore-case ignore case differences in file contents" msgstr "" "-i, --ignore-case ignorira veličinu slova u sadržaju datoteka" -#: src/diff.c:929 +#: src/diff.c:931 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignorira promjene nastale ekspanzijom " "tab(ova)" -#: src/diff.c:930 +#: src/diff.c:932 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space ignorira bjeline na kraju retka" -#: src/diff.c:931 +#: src/diff.c:933 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change ignorira promjene u količini bijelog prostora" -#: src/diff.c:932 +#: src/diff.c:934 msgid "-w, --ignore-all-space ignore all white space" msgstr "-w, --ignore-all-space ignorira sav bijeli prostor" -#: src/diff.c:933 +#: src/diff.c:935 msgid "" "-B, --ignore-blank-lines ignore changes where lines are all blank" msgstr "" "-B, --ignore-blank-lines ignorira promjene nastale uklanjanjem\n" " praznih redaka" -#: src/diff.c:934 +#: src/diff.c:936 msgid "" "-I, --ignore-matching-lines=RE ignore changes where all lines match RE" msgstr "" @@ -947,43 +947,43 @@ "redaka\n" " podudarnih s RE (regex)" -#: src/diff.c:936 +#: src/diff.c:938 msgid "-a, --text treat all files as text" msgstr "-a, --text tretira sve datoteke kao tekst" -#: src/diff.c:937 +#: src/diff.c:939 msgid "" " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr uklanja zaostali znak za Enter (CR) na ulazu" -#: src/diff.c:939 +#: src/diff.c:941 msgid " --binary read and write data in binary mode" msgstr "" " --binary čita i piše podatke u binarnom načinu" -#: src/diff.c:942 +#: src/diff.c:944 msgid "" "-D, --ifdef=NAME output merged file with '#ifdef NAME' diffs" msgstr "" "-D, --ifdef=IME pokaže spojenu datoteku s prikazanim\n" " razlikama u „#ifdef IME“" -#: src/diff.c:943 +#: src/diff.c:945 msgid " --GTYPE-group-format=GFMT format GTYPE input groups with GFMT" msgstr "" " --GTYPE-group-format=GFMT ulazne grupe vrste GTYPE formatira s GFMT" -#: src/diff.c:944 +#: src/diff.c:946 msgid " --line-format=LFMT format all input lines with LFMT" msgstr " --line-format=LFMT sve ulazne retke formatira s LFMT" -#: src/diff.c:945 +#: src/diff.c:947 msgid " --LTYPE-line-format=LFMT format LTYPE input lines with LFMT" msgstr "" " --LTYPE-line-format=LFMT ulazne retke vrste LTYPE formatira s LFMT" -#: src/diff.c:946 +#: src/diff.c:948 msgid "" " These format options provide fine-grained control over the output\n" " of diff, generalizing -D/--ifdef." @@ -992,14 +992,14 @@ "oblikovanje\n" " prikaza diff izlaza generaliziranjem opcije -D/--ifdef." -#: src/diff.c:948 +#: src/diff.c:950 msgid "" " LTYPE is 'old', 'new', or 'unchanged'. GTYPE is LTYPE or 'changed'." msgstr "" " LTYPE je jedan od „old“, „new“ ili „unchanged“.\n" " GTYPE je jedan od LTYPE ili „changed“." -#: src/diff.c:949 +#: src/diff.c:951 msgid "" " GFMT (only) may contain:\n" " %< lines from FILE1\n" @@ -1027,7 +1027,7 @@ " M L+1\n" " %(A=B?T:E) ako je A jednako B, onda T, inače E" -#: src/diff.c:961 +#: src/diff.c:963 msgid "" " LFMT (only) may contain:\n" " %L contents of line\n" @@ -1039,7 +1039,7 @@ " %l sadržaj retka bez zaostalih newline (znak novog retka)\n" " %[-][ŠIRINA][.[PREC]]{doxX} format broja ulaznog retka u stilu printf" -#: src/diff.c:965 +#: src/diff.c:967 msgid "" " Both GFMT and LFMT may contain:\n" " %% %\n" @@ -1053,17 +1053,17 @@ " %c'\\OOO' znak u oktalnom kodu OOO\n" " C znak C (ostali znakovi predstavljaju sami sebe)" -#: src/diff.c:971 +#: src/diff.c:973 msgid "-d, --minimal try hard to find a smaller set of changes" msgstr "-d, --minimal nastoji naći što manju količinu promjena" -#: src/diff.c:972 +#: src/diff.c:974 msgid "" " --horizon-lines=NUM keep NUM lines of the common prefix and suffix" msgstr "" " --horizon-lines=BROJ zadrži BROJ redaka zajednički prefiksu i sufiksu" -#: src/diff.c:973 +#: src/diff.c:975 msgid "" " --speed-large-files assume large files and many scattered small changes" msgstr "" @@ -1079,7 +1079,7 @@ " --color[=KAD] oboji izlaz; KAD može biti „never“, „always“\n" " ili „auto“ (zadano)" -#: src/diff.c:976 +#: src/diff.c:978 msgid "" " --palette=PALETTE the colors to use when --color is active; PALETTE " "is\n" @@ -1088,42 +1088,42 @@ " --palette=PALETA boje koje će se koristiti s --color; PALETA je\n" " popis terminfo mogućnosti odvojenih dvotočkom" -#: src/diff.c:979 +#: src/diff.c:981 msgid " --help display this help and exit" msgstr " --help pokaže ovu pomoć" -#: src/diff.c:980 +#: src/diff.c:982 msgid "-v, --version output version information and exit" msgstr "-v, --version informacije o inačici ovog programa" -#: src/diff.c:982 +#: src/diff.c:984 msgid "FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'." msgstr "" "DATOTEKE su „DATOTEKA1 DATOTEKA2“ ili „DIR1 DIR2“ ili „DIR DATOTEKA“ ili\n" " „DATOTEKA DIR“." -#: src/diff.c:983 +#: src/diff.c:985 msgid "" "If --from-file or --to-file is given, there are no restrictions on FILE(s)." msgstr "" "Ako je dano --from-file ili --to-file, onda nema restrikcija na " "DATOTEK(U/E)." -#: src/diff.c:984 src/diff3.c:528 src/sdiff.c:219 +#: src/diff.c:986 src/diff3.c:533 src/sdiff.c:220 msgid "If a FILE is '-', read standard input." msgstr "Ako je DATOTEKA „-“, čita standardni ulaz." -#: src/diff.c:994 +#: src/diff.c:996 #, c-format msgid "Usage: %s [OPTION]... FILES\n" msgstr "Uporaba: %s [OPCIJA...] DATOTEKE\n" -#: src/diff.c:995 +#: src/diff.c:997 msgid "Compare FILES line by line." msgstr "Usporedi DATOTEKE redak po redak." # Ovdje trebam zamijeniti poredak... Pogledati kako se to radi. -#: src/diff.c:1032 +#: src/diff.c:1034 #, c-format msgid "conflicting %s option value '%s'" msgstr "konfliktna vrijednost „%2$s“ opcije %1$s" @@ -1133,75 +1133,75 @@ # # Format: # C -#: src/diff.c:1045 +#: src/diff.c:1047 #, c-format msgid "conflicting output style options" msgstr "konfliktne opcije za stil izlaza" -#: src/diff.c:1061 +#: src/diff.c:1063 #, c-format msgid "invalid color '%s'" msgstr "nevaljana boja „%s“" -#: src/diff.c:1117 src/diff.c:1327 +#: src/diff.c:1119 src/diff.c:1329 #, c-format msgid "Only in %s: %s\n" msgstr "Samo u %s: %s\n" -#: src/diff.c:1251 +#: src/diff.c:1253 msgid "cannot compare '-' to a directory" msgstr "nije moguće usporediti „-“ s direktorijem" -#: src/diff.c:1286 +#: src/diff.c:1288 msgid "-D option not supported with directories" msgstr "opcija -D nije podržana za direktorije" -#: src/diff.c:1295 +#: src/diff.c:1297 #, c-format msgid "Common subdirectories: %s and %s\n" msgstr "Uobičajeni poddirektoriji: %s i %s\n" -#: src/diff.c:1337 src/diff.c:1387 +#: src/diff.c:1339 src/diff.c:1389 #, c-format msgid "File %s is a %s while file %s is a %s\n" msgstr "Datoteka %s je %s dok datoteka %s je %s\n" -#: src/diff.c:1373 +#: src/diff.c:1375 #, c-format msgid "Symbolic links %s and %s differ\n" msgstr "Simboličke poveznice %s i %s se razlikuju\n" -#: src/diff.c:1460 +#: src/diff.c:1462 #, c-format msgid "Files %s and %s are identical\n" msgstr "Datoteke %s i %s su identične\n" #. This is a proper name. See the gettext manual, section Names. -#: src/diff3.c:42 +#: src/diff3.c:43 msgid "Randy Smith" msgstr "Randy Smith" -#: src/diff3.c:351 +#: src/diff3.c:356 #, c-format msgid "incompatible options" msgstr "nekompatibilne opcije" -#: src/diff3.c:391 +#: src/diff3.c:396 msgid "'-' specified for more than one input file" msgstr "„-“ je navedena za više od jedne ulazne datoteke" -#: src/diff3.c:442 src/diff3.c:1290 src/diff3.c:1693 src/diff3.c:1748 -#: src/sdiff.c:307 src/sdiff.c:844 src/sdiff.c:855 +#: src/diff3.c:447 src/diff3.c:1295 src/diff3.c:1698 src/diff3.c:1753 +#: src/sdiff.c:308 src/sdiff.c:846 src/sdiff.c:857 msgid "read failed" msgstr "čitanje nije uspjelo" -#: src/diff3.c:475 +#: src/diff3.c:480 msgid "-A, --show-all output all changes, bracketing conflicts" msgstr "" "-A, --show-all pokaže sve promjene, konflikte u uglatim " "zagradama" -#: src/diff3.c:477 +#: src/diff3.c:482 msgid "" "-e, --ed output ed script incorporating changes\n" " from OLDFILE to YOURFILE into MYFILE" @@ -1209,12 +1209,12 @@ "-e, --ed generira ed-script koji uključujuje promjene od\n" " STARADATOTEKE do VAŠADATOTEKE u MOJADATOTEKA" -#: src/diff3.c:479 +#: src/diff3.c:484 msgid "-E, --show-overlap like -e, but bracket conflicts" msgstr "" "-E, --show-overlap kao -e plus konflikte u uglatim zagradama" -#: src/diff3.c:480 +#: src/diff3.c:485 msgid "" "-3, --easy-only like -e, but incorporate only nonoverlapping " "changes" @@ -1222,23 +1222,23 @@ "-3, --easy-only kao -e, ali uključi samo promjene koje se\n" " ne preklapaju" -#: src/diff3.c:481 +#: src/diff3.c:486 msgid "" "-x, --overlap-only like -e, but incorporate only overlapping changes" msgstr "" "-x, --overlap-only kao -e, ali uključi samo promjene koje se\n" " preklapaju" -#: src/diff3.c:482 +#: src/diff3.c:487 msgid "-X like -x, but bracket conflicts" msgstr "" "-X kao -x plus konflikte u uglatim zagradama" -#: src/diff3.c:483 +#: src/diff3.c:488 msgid "-i append 'w' and 'q' commands to ed scripts" msgstr "-i pripoji naredbe „w“ i „q“ u ed-scripts" -#: src/diff3.c:485 +#: src/diff3.c:490 msgid "" "-m, --merge output actual merged file, according to\n" " -A if no other options are given" @@ -1246,26 +1246,26 @@ "-m, --merge prikaže trenutnu spojenu datoteku kao -A ako\n" " nijedna druga opcija nije dana" -#: src/diff3.c:488 +#: src/diff3.c:493 msgid "-a, --text treat all files as text" msgstr "-a, --text tretira sve datoteke kao tekst" -#: src/diff3.c:489 +#: src/diff3.c:494 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr uklanja zaostali znak za Enter (CR) na ulazu" -#: src/diff3.c:490 +#: src/diff3.c:495 msgid "-T, --initial-tab make tabs line up by prepending a tab" msgstr "" "-T, --initial-tab poravna umetanjem tab(ulatora) na početak retka" -#: src/diff3.c:491 +#: src/diff3.c:496 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAM koristi PROGRAM za uspoređivanja datoteka" -#: src/diff3.c:492 +#: src/diff3.c:497 msgid "" "-L, --label=LABEL use LABEL instead of file name\n" " (can be repeated up to three times)" @@ -1273,24 +1273,24 @@ "-L, --label=LABEL koristi LABEL umjesto imena i vremenskog žiga\n" " datoteke (može se ponavljati)" -#: src/diff3.c:495 +#: src/diff3.c:500 msgid " --help display this help and exit" msgstr " --help pokaže ovu pomoć" -#: src/diff3.c:496 +#: src/diff3.c:501 msgid "-v, --version output version information and exit" msgstr "-v, --version informacije o inačici ovog programa" -#: src/diff3.c:505 +#: src/diff3.c:510 #, c-format msgid "Usage: %s [OPTION]... MYFILE OLDFILE YOURFILE\n" msgstr "Uporaba: %s [OPCIJA...] MOJADATOTEKA STARADATOTEKA VAŠADATOTEKA\n" -#: src/diff3.c:507 +#: src/diff3.c:512 msgid "Compare three files line by line." msgstr "Usporedi tri datoteke redak po redak." -#: src/diff3.c:517 +#: src/diff3.c:522 msgid "" "\n" "The default output format is a somewhat human-readable representation of\n" @@ -1314,45 +1314,45 @@ "je spojena datoteka. Za neuobičajeni ulaz to je pouzdanije od korištenja ed-" "a.\n" -#: src/diff3.c:529 +#: src/diff3.c:534 msgid "Exit status is 0 if successful, 1 if conflicts, 2 if trouble." msgstr "Izlazno stanje je 0 za uspjeh, 1 za neuspjeh, 2 u slučaju greške." -#: src/diff3.c:722 +#: src/diff3.c:727 msgid "internal error: screwup in format of diff blocks" msgstr "*interna programska greška*: greška u formatu diff blokova" -#: src/diff3.c:1017 +#: src/diff3.c:1022 #, c-format msgid "%s: diff failed: " msgstr "%s: diff nije uspio: " -#: src/diff3.c:1039 +#: src/diff3.c:1044 msgid "internal error: invalid diff type in process_diff" msgstr "*interna greška*: nevaljana diff vrsta u process_diff" -#: src/diff3.c:1064 +#: src/diff3.c:1069 msgid "invalid diff format; invalid change separator" msgstr "nevaljani diff format: nevaljani graničnik promjena" -#: src/diff3.c:1300 +#: src/diff3.c:1305 msgid "invalid diff format; incomplete last line" msgstr "nevaljani diff format: nepotpuni posljednji redak" -#: src/diff3.c:1324 src/sdiff.c:275 src/util.c:969 +#: src/diff3.c:1329 src/sdiff.c:276 src/util.c:969 #, c-format msgid "subsidiary program '%s' could not be invoked" msgstr "podređeni program „%s“ nije (bilo) moguće pozvati" -#: src/diff3.c:1349 +#: src/diff3.c:1354 msgid "invalid diff format; incorrect leading line chars" msgstr "nevaljani diff format: nevaljani znakovi na početku retka" -#: src/diff3.c:1422 +#: src/diff3.c:1427 msgid "internal error: invalid diff type passed to output" msgstr "*interna greška*:nevaljana diff vrsta je proslijeđena na izlaz" -#: src/diff3.c:1695 src/diff3.c:1752 +#: src/diff3.c:1700 src/diff3.c:1757 msgid "input file shrank" msgstr "ulazna datoteka se smanjila" @@ -1367,47 +1367,47 @@ msgstr "%s: rekurzivna petlja direktorija" #. This is a proper name. See the gettext manual, section Names. -#: src/sdiff.c:43 +#: src/sdiff.c:44 msgid "Thomas Lord" msgstr "Thomas Lord" -#: src/sdiff.c:173 +#: src/sdiff.c:174 msgid "" "-o, --output=FILE operate interactively, sending output to FILE" msgstr "" "-o, --output=DATOTEKA interaktivni rad; rezultat se sprema u DATOTEKU" -#: src/sdiff.c:175 +#: src/sdiff.c:176 msgid "" "-i, --ignore-case consider upper- and lower-case to be the same" msgstr "-i, --ignore-case ignorira veličinu slova" -#: src/sdiff.c:176 +#: src/sdiff.c:177 msgid "-E, --ignore-tab-expansion ignore changes due to tab expansion" msgstr "" "-E, --ignore-tab-expansion ignorira promjene nastale ekspanzijom tab(ova)" -#: src/sdiff.c:177 +#: src/sdiff.c:178 msgid "-Z, --ignore-trailing-space ignore white space at line end" msgstr "-Z, --ignore-trailing-space ignorira bjeline na kraju retka" -#: src/sdiff.c:178 +#: src/sdiff.c:179 msgid "" "-b, --ignore-space-change ignore changes in the amount of white space" msgstr "" "-b, --ignore-space-change ignorira promjene u količini bijelog prostora" -#: src/sdiff.c:179 +#: src/sdiff.c:180 msgid "-W, --ignore-all-space ignore all white space" msgstr "-W, --ignore-all-space ignorira sav bijeli prostor" -#: src/sdiff.c:180 +#: src/sdiff.c:181 msgid "-B, --ignore-blank-lines ignore changes whose lines are all blank" msgstr "" "-B, --ignore-blank-lines ignorira promjene nastale uklanjanjem\n" " praznih redaka" -#: src/sdiff.c:181 +#: src/sdiff.c:182 msgid "" "-I, --ignore-matching-lines=RE ignore changes all whose lines match RE" msgstr "" @@ -1415,50 +1415,50 @@ "redaka\n" " podudarnih s RE (regex)" -#: src/sdiff.c:182 +#: src/sdiff.c:183 msgid " --strip-trailing-cr strip trailing carriage return on input" msgstr "" " --strip-trailing-cr uklanja zaostali znak za Enter (CR) na ulazu" -#: src/sdiff.c:183 +#: src/sdiff.c:184 msgid "-a, --text treat all files as text" msgstr "-a, --text tretira sve datoteke kao tekst" -#: src/sdiff.c:185 +#: src/sdiff.c:186 msgid "" "-w, --width=NUM output at most NUM (default 130) print columns" msgstr "" "-w, --width=NUM ispiše ne više od BROJ (zadano 130)\n" " znakova po retku" -#: src/sdiff.c:186 +#: src/sdiff.c:187 msgid "" "-l, --left-column output only the left column of common lines" msgstr "" "-l, --left-column pokaže samo lijevi stupac kad su redci jednaki" -#: src/sdiff.c:187 +#: src/sdiff.c:188 msgid "-s, --suppress-common-lines do not output common lines" msgstr "-s, --suppress-common-lines ne prikazuje jednake retke" -#: src/sdiff.c:189 +#: src/sdiff.c:190 msgid "-t, --expand-tabs expand tabs to spaces in output" msgstr "" "-t, --expand-tabs na izlazu proširi tab(ulatore) u razmake" -#: src/sdiff.c:190 +#: src/sdiff.c:191 msgid "" " --tabsize=NUM tab stops at every NUM (default 8) print columns" msgstr "" " --tabsize=NUM tabulacija svakih BROJ (zadano 8) stupaca" -#: src/sdiff.c:192 +#: src/sdiff.c:193 msgid "" "-d, --minimal try hard to find a smaller set of changes" msgstr "" "-d, --minimal nastoji naći što manju količinu promjena" -#: src/sdiff.c:193 +#: src/sdiff.c:194 msgid "" "-H, --speed-large-files assume large files, many scattered small changes" msgstr "" @@ -1466,39 +1466,39 @@ "malih\n" " razbacanih promjena" -#: src/sdiff.c:194 +#: src/sdiff.c:195 msgid " --diff-program=PROGRAM use PROGRAM to compare files" msgstr "" " --diff-program=PROGRAM koristi PROGRAM za uspoređivanja datoteka" -#: src/sdiff.c:196 +#: src/sdiff.c:197 msgid " --help display this help and exit" msgstr " --help pokaže ovu pomoć" -#: src/sdiff.c:197 +#: src/sdiff.c:198 msgid "-v, --version output version information and exit" msgstr "-v, --version informacije o inačici ovog programa" -#: src/sdiff.c:206 +#: src/sdiff.c:207 #, c-format msgid "Usage: %s [OPTION]... FILE1 FILE2\n" msgstr "Uporaba: %s [OPCIJA...] DATOTEKA1 DATOTEKA2\n" -#: src/sdiff.c:208 +#: src/sdiff.c:209 msgid "Side-by-side merge of differences between FILE1 and FILE2." msgstr "" "Interaktivno usporedi DATOTEKU1 s DATOTEKOM2, pokaže ih jednu pored druge\n" "s razlikama između njih." -#: src/sdiff.c:329 +#: src/sdiff.c:330 msgid "cannot interactively merge standard input" msgstr "nije moguće interaktivno spojiti standardni ulaz" -#: src/sdiff.c:595 +#: src/sdiff.c:597 msgid "both files to be compared are directories" msgstr "obje datoteke za usporedbu su direktoriji" -#: src/sdiff.c:818 +#: src/sdiff.c:820 msgid "" "ed:\tEdit then use both versions, each decorated with a header.\n" "eb:\tEdit then use both versions.\n" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/doc-base.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/doc-base.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/doc-base.po 2021-08-03 09:03:58.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/doc-base.po 2022-02-11 23:13:52.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:10+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../../install-docs.in:104 #, perl-format diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/dpkg.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/dpkg.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/dpkg.po 2021-08-03 09:04:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/dpkg.po 2022-02-11 23:13:54.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:11+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: lib/dpkg/ar.c msgid "failed to fstat archive" @@ -953,7 +953,7 @@ msgid "unable to check file '%s' lock status" msgstr "" -#: lib/dpkg/file.c:146 +#: lib/dpkg/file.c #, c-format msgid "%s is locked by another process" msgstr "" @@ -1296,14 +1296,14 @@ msgid "no package information in '%.255s'" msgstr "" -#: lib/dpkg/parsehelp.c:45 +#: lib/dpkg/parsehelp.c #, c-format msgid "" "parsing file '%.255s' near line %d package '%.255s':\n" " %.255s" msgstr "" -#: lib/dpkg/parsehelp.c:48 +#: lib/dpkg/parsehelp.c #, c-format msgid "" "parsing file '%.255s' near line %d:\n" @@ -2261,7 +2261,7 @@ msgid "%s: failed to rename '%.250s' to '%.250s': %s" msgstr "" -#: src/configure.c +#: src/configure.c src/unpack.c #, c-format msgid "%s: failed to remove '%.250s': %s" msgstr "" @@ -3005,7 +3005,7 @@ msgid "Configure any package which may help this one" msgstr "" -#: src/main.c:225 +#: src/force.c msgid "Process incidental packages even when on hold" msgstr "" @@ -4129,7 +4129,7 @@ msgid "Debian %s package trigger utility version %s.\n" msgstr "" -#: src/trigcmd.c:67 +#: src/trigcmd.c #, c-format msgid "" "Usage: %s [ ...] \n" @@ -5887,7 +5887,7 @@ msgid "unknown argument '%s'" msgstr "" -#: utils/update-alternatives.c:2343 +#: utils/update-alternatives.c msgid "--install needs " msgstr "" @@ -5913,11 +5913,11 @@ msgid "--%s needs " msgstr "" -#: utils/update-alternatives.c:2388 +#: utils/update-alternatives.c msgid "--slave only allowed with --install" msgstr "" -#: utils/update-alternatives.c:2390 +#: utils/update-alternatives.c msgid "--slave needs " msgstr "" @@ -5936,7 +5936,7 @@ msgid "--%s needs a argument" msgstr "" -#: utils/update-alternatives.c:2453 +#: utils/update-alternatives.c msgid "" "need --display, --query, --list, --get-selections, --config, --set, --set-" "selections, --install, --remove, --all, --remove-all or --auto" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/ecryptfs-utils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/ecryptfs-utils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/ecryptfs-utils.po 2021-08-03 09:03:54.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/ecryptfs-utils.po 2022-02-11 23:13:48.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: 2021-08-02 17:42+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:37+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #. Name #: ../src/desktop/ecryptfs-record-passphrase:1 diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/example-content.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/example-content.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/example-content.po 2021-08-03 09:03:53.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/example-content.po 2022-02-11 23:13: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: 2021-08-02 17:23+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:17+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../data/examples.desktop.in.h:1 msgid "Examples" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/fcitx-mozc.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/fcitx-mozc.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/fcitx-mozc.po 2021-08-03 09:03:50.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/fcitx-mozc.po 2022-02-11 23:13: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: 2021-08-02 18:06+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:01+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../eim.cc:187 msgid "Press Escape to go back" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/findutils.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/findutils.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/findutils.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/findutils.po 2022-02-11 23:13:45.000000000 +0000 @@ -18,10 +18,10 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 16:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" +"X-Launchpad-Export-Date: 2022-02-11 15:10+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: hr\n" #: find/exec.c:123 #, c-format diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/flex.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/flex.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/flex.po 2021-08-03 09:03:54.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/flex.po 2022-02-11 23:13:49.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: 2021-08-02 16:19+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:11+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/fprintd.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/fprintd.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/fprintd.po 2021-08-03 09:03:52.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/fprintd.po 2022-02-11 23:13:46.000000000 +0000 @@ -16,259 +16,259 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 17:55+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:51+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "Language: hr\n" -#: ../data/net.reactivated.fprint.device.policy.in.h:1 +#: data/net.reactivated.fprint.device.policy.in:13 msgid "Verify a fingerprint" msgstr "Provjeri otiske prstiju" -#: ../data/net.reactivated.fprint.device.policy.in.h:2 +#: data/net.reactivated.fprint.device.policy.in:14 msgid "Privileges are required to verify fingerprints." msgstr "Potrebne su ovlasti za provjeru otisaka prstiju." -#: ../data/net.reactivated.fprint.device.policy.in.h:3 +#: data/net.reactivated.fprint.device.policy.in:23 msgid "Enroll new fingerprints" msgstr "Unesi nove otiske prstiju" -#: ../data/net.reactivated.fprint.device.policy.in.h:4 +#: data/net.reactivated.fprint.device.policy.in:24 msgid "Privileges are required to enroll new fingerprints." msgstr "Potrebne su ovlasti za unošenje novih otisaka prstiju." -#: ../data/net.reactivated.fprint.device.policy.in.h:5 +#: data/net.reactivated.fprint.device.policy.in:33 msgid "Select a user to enroll" msgstr "Odaberite korisnika za unos" -#: ../data/net.reactivated.fprint.device.policy.in.h:6 +#: data/net.reactivated.fprint.device.policy.in:34 msgid "Privileges are required to enroll new fingerprints for other users." msgstr "" "Potrebne su ovlasti za unošenje novih otisaka prstiju za druge korisnike." -#: ../src/device.c:385 +#: src/device.c:690 #, c-format msgid "Device was not claimed before use" msgstr "Uređaj nije zauzet prije korištenja" -#: ../src/device.c:395 +#: src/device.c:699 #, c-format msgid "Device already in use by another user" msgstr "Uređaj već koristi drugi korisnik" -#: ../pam/fingerprint-strings.h:31 +#: pam/fingerprint-strings.h:50 msgid "Place your finger on the fingerprint reader" msgstr "Postavite prst na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:32 +#: pam/fingerprint-strings.h:51 #, c-format msgid "Place your finger on %s" msgstr "Postavite prst na %s" -#: ../pam/fingerprint-strings.h:33 +#: pam/fingerprint-strings.h:52 msgid "Swipe your finger across the fingerprint reader" msgstr "Povucite prst preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:34 +#: pam/fingerprint-strings.h:53 #, c-format msgid "Swipe your finger across %s" msgstr "Povucite prst preko %s" -#: ../pam/fingerprint-strings.h:36 +#: pam/fingerprint-strings.h:55 msgid "Place your left thumb on the fingerprint reader" msgstr "Postavite palac lijeve ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:37 +#: pam/fingerprint-strings.h:56 #, c-format msgid "Place your left thumb on %s" msgstr "Postavite palac lijeve ruke na %s" -#: ../pam/fingerprint-strings.h:38 +#: pam/fingerprint-strings.h:57 msgid "Swipe your left thumb across the fingerprint reader" msgstr "Povucite palac lijeve ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:39 +#: pam/fingerprint-strings.h:58 #, c-format msgid "Swipe your left thumb across %s" msgstr "Povucite palac lijeve ruke preko %s" -#: ../pam/fingerprint-strings.h:41 +#: pam/fingerprint-strings.h:60 msgid "Place your left index finger on the fingerprint reader" msgstr "Postavite kažiprst lijeve ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:42 +#: pam/fingerprint-strings.h:61 #, c-format msgid "Place your left index finger on %s" msgstr "Postavite kažiprst lijeve ruke na %s" -#: ../pam/fingerprint-strings.h:43 +#: pam/fingerprint-strings.h:62 msgid "Swipe your left index finger across the fingerprint reader" msgstr "Povucite kažiprst lijeve ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:44 +#: pam/fingerprint-strings.h:63 #, c-format msgid "Swipe your left index finger across %s" msgstr "Povucite kažiprst lijeve ruke preko %s" -#: ../pam/fingerprint-strings.h:46 +#: pam/fingerprint-strings.h:65 msgid "Place your left middle finger on the fingerprint reader" msgstr "Postavite srednji prst lijeve ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:47 +#: pam/fingerprint-strings.h:66 #, c-format msgid "Place your left middle finger on %s" msgstr "Postavite srednji prst lijeve ruke na %s" -#: ../pam/fingerprint-strings.h:48 +#: pam/fingerprint-strings.h:67 msgid "Swipe your left middle finger across the fingerprint reader" msgstr "Povucite srednji prst lijeve ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:49 +#: pam/fingerprint-strings.h:68 #, c-format msgid "Swipe your left middle finger across %s" msgstr "Povucite srednji prst lijeve ruke preko %s" -#: ../pam/fingerprint-strings.h:51 +#: pam/fingerprint-strings.h:70 msgid "Place your left ring finger on the fingerprint reader" msgstr "Postavite prstenjak lijeve ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:52 +#: pam/fingerprint-strings.h:71 #, c-format msgid "Place your left ring finger on %s" msgstr "Postavite prstenjak lijeve ruke na %s" -#: ../pam/fingerprint-strings.h:53 +#: pam/fingerprint-strings.h:72 msgid "Swipe your left ring finger across the fingerprint reader" msgstr "Povucite prstenjak lijeve ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:54 +#: pam/fingerprint-strings.h:73 #, c-format msgid "Swipe your left ring finger across %s" msgstr "Povucite prstenjak lijeve ruke preko %s" -#: ../pam/fingerprint-strings.h:56 +#: pam/fingerprint-strings.h:75 msgid "Place your left little finger on the fingerprint reader" msgstr "Postavite mali prst lijeve ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:57 +#: pam/fingerprint-strings.h:76 #, c-format msgid "Place your left little finger on %s" msgstr "Postavite mali prst lijeve ruke na %s" -#: ../pam/fingerprint-strings.h:58 +#: pam/fingerprint-strings.h:77 msgid "Swipe your left little finger across the fingerprint reader" msgstr "Povucite mali prst lijeve ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:59 +#: pam/fingerprint-strings.h:78 #, c-format msgid "Swipe your left little finger across %s" msgstr "Povucite mali prst lijeve ruke preko %s" -#: ../pam/fingerprint-strings.h:61 +#: pam/fingerprint-strings.h:80 msgid "Place your right thumb on the fingerprint reader" msgstr "Postavite palac desne ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:62 +#: pam/fingerprint-strings.h:81 #, c-format msgid "Place your right thumb on %s" msgstr "Postavite palac desne ruke na %s" -#: ../pam/fingerprint-strings.h:63 +#: pam/fingerprint-strings.h:82 msgid "Swipe your right thumb across the fingerprint reader" msgstr "Povucite palac desne ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:64 +#: pam/fingerprint-strings.h:83 #, c-format msgid "Swipe your right thumb across %s" msgstr "Povucite palac desne ruke preko %s" -#: ../pam/fingerprint-strings.h:66 +#: pam/fingerprint-strings.h:85 msgid "Place your right index finger on the fingerprint reader" msgstr "Postavite kažiprst desne ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:67 +#: pam/fingerprint-strings.h:86 #, c-format msgid "Place your right index finger on %s" msgstr "Postavite kažiprst desne ruke na %s" -#: ../pam/fingerprint-strings.h:68 +#: pam/fingerprint-strings.h:87 msgid "Swipe your right index finger across the fingerprint reader" msgstr "Povucite kažiprst desne ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:69 +#: pam/fingerprint-strings.h:88 #, c-format msgid "Swipe your right index finger across %s" msgstr "Povucite kažiprst desne ruke preko %s" -#: ../pam/fingerprint-strings.h:71 +#: pam/fingerprint-strings.h:90 msgid "Place your right middle finger on the fingerprint reader" msgstr "Postavite srednji prst desne ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:72 +#: pam/fingerprint-strings.h:91 #, c-format msgid "Place your right middle finger on %s" msgstr "Postavite srednji prst desne ruke na %s" -#: ../pam/fingerprint-strings.h:73 +#: pam/fingerprint-strings.h:92 msgid "Swipe your right middle finger across the fingerprint reader" msgstr "Povucite srednji prst desne ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:74 +#: pam/fingerprint-strings.h:93 #, c-format msgid "Swipe your right middle finger across %s" msgstr "Povucite srednji prst desne ruke preko %s" -#: ../pam/fingerprint-strings.h:76 +#: pam/fingerprint-strings.h:95 msgid "Place your right ring finger on the fingerprint reader" msgstr "Postavite prstenjak desne ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:77 +#: pam/fingerprint-strings.h:96 #, c-format msgid "Place your right ring finger on %s" msgstr "Postavite prstenjak desne ruke na %s" -#: ../pam/fingerprint-strings.h:78 +#: pam/fingerprint-strings.h:97 msgid "Swipe your right ring finger across the fingerprint reader" msgstr "Povucite prstenjak desne ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:79 +#: pam/fingerprint-strings.h:98 #, c-format msgid "Swipe your right ring finger across %s" msgstr "Povucite prstenjak desne ruke preko %s" -#: ../pam/fingerprint-strings.h:81 +#: pam/fingerprint-strings.h:100 msgid "Place your right little finger on the fingerprint reader" msgstr "Postavite mali prst desne ruke na čitač otisaka prstiju" -#: ../pam/fingerprint-strings.h:82 +#: pam/fingerprint-strings.h:101 #, c-format msgid "Place your right little finger on %s" msgstr "Postavite mali prst desne ruke na %s" -#: ../pam/fingerprint-strings.h:83 +#: pam/fingerprint-strings.h:102 msgid "Swipe your right little finger across the fingerprint reader" msgstr "Povucite mali prst desne ruke preko čitača otisaka prstiju" -#: ../pam/fingerprint-strings.h:84 +#: pam/fingerprint-strings.h:103 #, c-format msgid "Swipe your right little finger across %s" msgstr "Povucite mali prst desne ruke preko %s" -#: ../pam/fingerprint-strings.h:131 ../pam/fingerprint-strings.h:157 +#: pam/fingerprint-strings.h:171 pam/fingerprint-strings.h:199 msgid "Place your finger on the reader again" msgstr "Postavite prst na čitač još jednom" -#: ../pam/fingerprint-strings.h:133 ../pam/fingerprint-strings.h:159 +#: pam/fingerprint-strings.h:173 pam/fingerprint-strings.h:201 msgid "Swipe your finger again" msgstr "Povucite prst još jednom" -#: ../pam/fingerprint-strings.h:136 ../pam/fingerprint-strings.h:162 +#: pam/fingerprint-strings.h:176 pam/fingerprint-strings.h:204 msgid "Swipe was too short, try again" msgstr "Niste dovoljno dugo povlačili, pokušajte ponovo" -#: ../pam/fingerprint-strings.h:138 ../pam/fingerprint-strings.h:164 +#: pam/fingerprint-strings.h:178 pam/fingerprint-strings.h:206 msgid "Your finger was not centered, try swiping your finger again" msgstr "Vaš prst nije bio centriran, pokušajte ga povući ponovo" -#: ../pam/fingerprint-strings.h:140 ../pam/fingerprint-strings.h:166 +#: pam/fingerprint-strings.h:180 pam/fingerprint-strings.h:208 msgid "Remove your finger, and try swiping your finger again" msgstr "Maknite prst i pokušajte ga povući ponovo" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/friendly-recovery.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/friendly-recovery.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/friendly-recovery.po 2021-08-03 09:04:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/friendly-recovery.po 2022-02-11 23:13:54.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: 2021-08-02 17:43+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 16:39+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/fwupd.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/fwupd.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/fwupd.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/fwupd.po 2022-02-11 23:13:45.000000000 +0000 @@ -0,0 +1,619 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the fwupd package. +# +# Translators: +# FIRST AUTHOR , 2016 +# gogo , 2016 +# Ping , 2020-2021 +# Ping , 2021 +# gogo , 2016-2021 +msgid "" +msgstr "" +"Project-Id-Version: fwupd\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-05-26 23:11+0000\n" +"PO-Revision-Date: 2021-08-02 14:48+0000\n" +"Last-Translator: Łukasz Zemczak \n" +"Language-Team: Croatian " +"(http://www.transifex.com/freedesktop/fwupd/language/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2022-02-11 17:29+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" +"Language: hr\n" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:1 +msgid "Install signed system firmware" +msgstr "Instaliraj firmver potpisan sustavom" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:3 +msgid "Authentication is required to update the firmware on this machine" +msgstr "Potrebna je ovjera za nadopunu firmvera na ovom računalu" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:4 +msgid "Install unsigned system firmware" +msgstr "Instaliraj firmver nepotpisan sustavom" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:5 +msgid "Install old version of system firmware" +msgstr "Instaliraj stariju inačicu firmvera sustava" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:7 +msgid "Authentication is required to downgrade the firmware on this machine" +msgstr "" +"Potrebna je ovjera za vraćanje starije inačice firmvera na ovom računalu" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:8 +msgid "Install signed device firmware" +msgstr "Instaliraj firmver potpisan uređajem" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:10 +msgid "" +"Authentication is required to update the firmware on a removable device" +msgstr "Potrebna je ovjera za nadopunu firmvera na uklonjivom uređaju" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:11 +msgid "Install unsigned device firmware" +msgstr "Instaliraj firmver nepotpisan uređajem" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:13 +msgid "" +"Authentication is required to downgrade the firmware on a removable device" +msgstr "" +"Potrebna je ovjera za vraćanje starije inačice firmvera na uklonjivom uređaju" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:14 +msgid "Unlock the device to allow access" +msgstr "Otključaj uređaj za dopuštenje pristupa" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:16 +msgid "Authentication is required to unlock a device" +msgstr "Potrebna je ovjera za otključavanje uređaja" + +#: ../policy/org.freedesktop.fwupd.policy.in.h:17 +msgid "Update the stored device verification information" +msgstr "Nadopuni spremljenu informaciju provjere uređaja" + +#. TRANSLATORS: this is the PolicyKit modal dialog +#: ../policy/org.freedesktop.fwupd.policy.in.h:19 +msgid "" +"Authentication is required to update the stored checksums for the device" +msgstr "Potrebna je ovjera za nadopunu spremljenog kontrolnog zbroja uređaja" + +#. TRANSLATORS: this is a command alias, e.g. 'get-devices' +#: ../libdfu/dfu-tool.c:121 ../plugins/synapticsmst/synapticsmst-tool.c:115 +#: ../src/fu-util.c:109 +#, c-format +msgid "Alias to %s" +msgstr "Zamjena za %s" + +#. TRANSLATORS: error message +#: ../libdfu/dfu-tool.c:194 ../plugins/synapticsmst/synapticsmst-tool.c:362 +#: ../src/fu-util.c:173 +msgid "Command not found" +msgstr "Naredba nije pronađena" + +#. TRANSLATORS: read from device to host +#: ../libdfu/dfu-tool.c:1115 +msgid "Reading" +msgstr "Čitanje" + +#. TRANSLATORS: write from host to device +#: ../libdfu/dfu-tool.c:1121 +msgid "Writing" +msgstr "Zapisivanje" + +#. TRANSLATORS: read from device to host +#: ../libdfu/dfu-tool.c:1127 +msgid "Verifying" +msgstr "Provjera" + +#. TRANSLATORS: read from device to host +#: ../libdfu/dfu-tool.c:1133 +msgid "Erasing" +msgstr "Brisanje" + +#. TRANSLATORS: waiting for device +#: ../libdfu/dfu-tool.c:1139 +msgid "Detaching" +msgstr "Odvajanje" + +#. TRANSLATORS: waiting for device +#: ../libdfu/dfu-tool.c:1145 +msgid "Attaching" +msgstr "Povezivanje" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../libdfu/dfu-tool.c:1367 +msgid "Added" +msgstr "Dodano" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../libdfu/dfu-tool.c:1378 +msgid "Removed" +msgstr "Uklonjeno" + +#. TRANSLATORS: this is when a device is hotplugged +#. TRANSLATORS: this is when the daemon state changes +#: ../libdfu/dfu-tool.c:1387 ../src/fu-util.c:965 +msgid "Changed" +msgstr "Promijenjeno" + +#. TRANSLATORS: this is when a device ctrl+c's a watch +#: ../libdfu/dfu-tool.c:1395 ../src/fu-util.c:927 +msgid "Cancelled" +msgstr "Prekinuto" + +#. TRANSLATORS: Appstream ID for the hardware type +#: ../libdfu/dfu-tool.c:1904 ../src/fu-util.c:878 +msgid "ID" +msgstr "ID" + +#. TRANSLATORS: interface name, e.g. "Flash" +#. TRANSLATORS: device name, e.g. 'ColorHug2' +#: ../libdfu/dfu-tool.c:1910 ../libdfu/dfu-tool.c:1916 +#: ../libdfu/dfu-tool.c:2003 +msgid "Name" +msgstr "Naziv" + +#. TRANSLATORS: this is the encryption method used when writing +#: ../libdfu/dfu-tool.c:1923 +msgid "Cipher" +msgstr "Cipher" + +#. TRANSLATORS: these are areas of memory on the chip +#: ../libdfu/dfu-tool.c:1937 +msgid "Region" +msgstr "Regija" + +#. TRANSLATORS: detected a DFU device +#: ../libdfu/dfu-tool.c:1972 +msgid "Found" +msgstr "Pronađeno" + +#. TRANSLATORS: DFU protocol version, e.g. 1.1 +#: ../libdfu/dfu-tool.c:1980 +msgid "Protocol" +msgstr "Protokol" + +#. TRANSLATORS: probably not run as root... +#. TRANSLATORS: device has failed to report status +#. TRANSLATORS: device status, e.g. "OK" +#: ../libdfu/dfu-tool.c:1992 ../libdfu/dfu-tool.c:1995 +#: ../libdfu/dfu-tool.c:2018 +msgid "Status" +msgstr "Stanje" + +#: ../libdfu/dfu-tool.c:1992 +msgid "Unknown: permission denied" +msgstr "Nepoznato: dozvola odbijena" + +#. TRANSLATORS: serial number, e.g. '00012345' +#: ../libdfu/dfu-tool.c:2009 +msgid "Serial" +msgstr "Serijski broj" + +#. TRANSLATORS: device mode, e.g. runtime or DFU +#: ../libdfu/dfu-tool.c:2014 +msgid "Mode" +msgstr "Način" + +#. TRANSLATORS: device state, i.e. appIDLE +#: ../libdfu/dfu-tool.c:2022 +msgid "State" +msgstr "Stanje" + +#. TRANSLATORS: transfer size in bytes +#: ../libdfu/dfu-tool.c:2030 +msgid "Transfer Size" +msgstr "Veličina prijenosa" + +#. TRANSLATORS: device quirks, i.e. things that +#. * it does that we have to work around +#: ../libdfu/dfu-tool.c:2038 +msgid "Quirks" +msgstr "Okolnosti uređaja" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2117 +msgid "Convert firmware to DFU format" +msgstr "Pretvori firmver u DFU format" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2123 +msgid "Merge multiple firmware files into one" +msgstr "Spoji više frimver datoteka u jednu" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2129 +msgid "Set vendor ID on firmware file" +msgstr "Postavi ID proizvođača u datoteku firmvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2135 +msgid "Set product ID on firmware file" +msgstr "Postavi ID proizvoda u datoteku firmvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2141 +msgid "Set element address on firmware file" +msgstr "Postavi adresu elementa u datoteku firmvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2147 +msgid "Set the firmware size for the target" +msgstr "Postavi veličinu firmvera za metu" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2153 +msgid "Set release version on firmware file" +msgstr "Postavi inačicu izdanja u datoteku firmvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2159 +msgid "Set alternative number on firmware file" +msgstr "Postavi zamjenski broj u datoteku firmvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2165 +msgid "Set alternative name on firmware file" +msgstr "Postavi zamjenski naziv u datoteku firmvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2171 +msgid "Attach DFU capable device back to runtime" +msgstr "Poveži DFU sposoban uređaj natrag u vremenu izvršavanja" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2177 +msgid "Read firmware from device into a file" +msgstr "Očitaj firmver iz uređaja u datoteku" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2183 +msgid "Read firmware from one partition into a file" +msgstr "Očitaj firmver iz jedne particije u datoteku" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2189 +msgid "Write firmware from file into device" +msgstr "Zapiši firmver iz datoteke u uređaj" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2195 +msgid "Write firmware from file into one partition" +msgstr "Zapiši firmver iz datoteke u jednu particiju uređaja" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2201 +msgid "List currently attached DFU capable devices" +msgstr "Prikaži trenutno povezane DFU sposobne uređaje" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2207 +msgid "Detach currently attached DFU capable device" +msgstr "Odspoji trenutno povezane DFU sposobne uređaje" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2213 +msgid "Dump details about a firmware file" +msgstr "Ispiši opširnije pojedinosti o firmveru u datoteku" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2219 +msgid "Watch DFU devices being hotplugged" +msgstr "Nadgledaj odspajanje DFU uređaja" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2225 +msgid "Encrypt firmware data" +msgstr "Šifriraj podatke frimvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2231 +msgid "Decrypt firmware data" +msgstr "Dešifriraj podatke frimvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2237 +msgid "Sets metadata on a firmware file" +msgstr "Postavlja metapodatke u datoteku frimvera" + +#. TRANSLATORS: command description +#: ../libdfu/dfu-tool.c:2243 +msgid "Replace data in an existing firmware file" +msgstr "Zamijeni podatke u postojećoj datoteci firmvera" + +#. TRANSLATORS: DFU stands for device firmware update +#: ../libdfu/dfu-tool.c:2269 +msgid "DFU Utility" +msgstr "DFU pomagalo" + +#. TRANSLATORS: the user didn't read the man page +#: ../libdfu/dfu-tool.c:2274 ../plugins/synapticsmst/synapticsmst-tool.c:439 +#: ../src/fu-util.c:1202 +msgid "Failed to parse arguments" +msgstr "Neuspjela obrada argumenata" + +#. TRANSLATORS: command description +#: ../plugins/synapticsmst/synapticsmst-tool.c:408 +msgid "Enumerate all Synaptics MST devices" +msgstr "Pobroji sve Synaptics MST uređaje" + +#. TRANSLATORS: command description +#: ../plugins/synapticsmst/synapticsmst-tool.c:414 +msgid "Flash firmware file to MST device" +msgstr "Zapiši datoteku firmvera u MST uređaj" + +#: ../plugins/synapticsmst/synapticsmst-tool.c:434 +msgid "Synaptics Multistream Transport Utility" +msgstr "Synaptics Multistream Transport pomagalo" + +#. TRANSLATORS: turn on all debugging +#: ../src/fu-debug.c:130 +msgid "Show debugging information for all files" +msgstr "Prikaži informacije otklanjanja greške za sve datoteke" + +#. TRANSLATORS: for the --verbose arg +#: ../src/fu-debug.c:180 +msgid "Debugging Options" +msgstr "Mogućnosti otklanjanja greške" + +#. TRANSLATORS: for the --verbose arg +#: ../src/fu-debug.c:182 +msgid "Show debugging options" +msgstr "Prikaži mogućnosti otklanjanja greške" + +#. TRANSLATORS: exit after we've started up, used for user profiling +#: ../src/fu-main.c:2757 +msgid "Exit after a small delay" +msgstr "Izađi nakon kratke odgode" + +#. TRANSLATORS: exit straight away, used for automatic profiling +#: ../src/fu-main.c:2760 +msgid "Exit after the engine has loaded" +msgstr "Izađi nakon učitavanja pogona" + +#. TRANSLATORS: program name +#: ../src/fu-main.c:2773 +msgid "Firmware Update Daemon" +msgstr "Pozadinski program nadopune firmvera" + +#. TRANSLATORS: program summary +#: ../src/fu-main.c:2778 +msgid "Firmware Update D-Bus Service" +msgstr "Firmver nadopuna D-Bus usluge" + +#. TRANSLATORS: daemon is inactive +#: ../src/fu-util.c:183 +msgid "Idle…" +msgstr "Mirovanje…" + +#. TRANSLATORS: decompressing the firmware file +#: ../src/fu-util.c:187 +msgid "Decompressing…" +msgstr "Raspakiravanje…" + +#. TRANSLATORS: parsing the firmware information +#: ../src/fu-util.c:191 +msgid "Loading…" +msgstr "Učitavanje…" + +#. TRANSLATORS: restarting the device to pick up new F/W +#: ../src/fu-util.c:195 +msgid "Restarting device…" +msgstr "Ponovno pokretanje uređaja…" + +#. TRANSLATORS: writing to the flash chips +#: ../src/fu-util.c:199 +msgid "Writing…" +msgstr "Zapisivanje…" + +#. TRANSLATORS: verifying we wrote the firmware correctly +#: ../src/fu-util.c:203 +msgid "Verifying…" +msgstr "Provjeravanje…" + +#. TRANSLATORS: scheduing an update to be done on the next boot +#: ../src/fu-util.c:207 +msgid "Scheduling…" +msgstr "Zakazivanje…" + +#. TRANSLATORS: currect daemon status is unknown +#: ../src/fu-util.c:214 +msgid "Unknown" +msgstr "Nepoznat" + +#. TRANSLATORS: nothing attached that can be upgraded +#: ../src/fu-util.c:283 +msgid "No hardware detected with firmware update capability" +msgstr "Nema otkrivenog hardvera s mogućnosti nadopune firmvera" + +#. TRANSLATOR: the plugin only supports offline +#: ../src/fu-util.c:317 +msgid "Retrying as an offline update" +msgstr "Ponovni pokušaj nadopune bez pristupa internetu" + +#. TRANSLATORS: the first replacement is a display name +#. * e.g. "ColorHugALS" and the second is a version number +#. * e.g. "1.2.3" +#: ../src/fu-util.c:457 +#, c-format +msgid "Reinstalling %s with %s... " +msgstr "Ponovna instalacija %s inačice %s... " + +#. TRANSLATORS: the first replacement is a display name +#. * e.g. "ColorHugALS" and the second and third are +#. * version numbers e.g. "1.2.3" +#: ../src/fu-util.c:464 +#, c-format +msgid "Downgrading %s from %s to %s... " +msgstr "Vraćanje %s s inačice %s na inačicu %s... " + +#. TRANSLATORS: the first replacement is a display name +#. * e.g. "ColorHugALS" and the second and third are +#. * version numbers e.g. "1.2.3" +#: ../src/fu-util.c:472 +#, c-format +msgid "Updating %s from %s to %s... " +msgstr "Nadopuna %s s inačice %s na inačicu %s... " + +#: ../src/fu-util.c:499 +msgid "Done!" +msgstr "Završeno!" + +#: ../src/fu-util.c:541 ../src/fu-util.c:790 +msgid "OK" +msgstr "U redu" + +#. TRANSLATORS: first replacement is device name +#: ../src/fu-util.c:874 +#, c-format +msgid "%s has firmware updates:" +msgstr "%s ima nadopune frimvera:" + +#: ../src/fu-util.c:884 +msgid "GUID" +msgstr "GUID" + +#. TRANSLATORS: section header for firmware version +#: ../src/fu-util.c:888 +msgid "Update Version" +msgstr "Inačica nadopune" + +#. TRANSLATORS: section header for firmware checksum +#: ../src/fu-util.c:892 +msgid "Update Checksum" +msgstr "Kontrolni zbroj nadopune" + +#: ../src/fu-util.c:899 +msgid "Update Checksum Type" +msgstr "Vrsta kontrolnog zbroja nadopune" + +#. TRANSLATORS: section header for firmware remote http:// +#: ../src/fu-util.c:903 +msgid "Update Location" +msgstr "Lokacija nadopune" + +#. TRANSLATORS: section header for long firmware desc +#: ../src/fu-util.c:914 +msgid "Update Description" +msgstr "Opis nadopune" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../src/fu-util.c:938 +msgid "Device added:" +msgstr "Uređaj dodan:" + +#. TRANSLATORS: this is when a device is hotplugged +#: ../src/fu-util.c:948 +msgid "Device removed:" +msgstr "Uređaj uklonjen:" + +#. TRANSLATORS: this is when a device has been updated +#: ../src/fu-util.c:958 +msgid "Device changed:" +msgstr "Uređaj promijenjen:" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1068 +msgid "Show extra debugging information" +msgstr "Prikaži dodatne informacije otklanjanja grešaka" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1074 +msgid "Schedule installation for next reboot when possible" +msgstr "Zakaži instalaciju pri sljedećem pokretanju kada je moguće" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1077 +msgid "Allow re-installing existing firmware versions" +msgstr "Dopusti ponovnu instalaciju frimvera postojeće inačice" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1080 +msgid "Allow downgrading firmware versions" +msgstr "Dopusti vraćanje starije inačice firmvera" + +#. TRANSLATORS: command line option +#: ../src/fu-util.c:1083 +msgid "Override plugin warning" +msgstr "Zaobiđi upozorenja priključka" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1106 +msgid "Get all devices that support firmware updates" +msgstr "Prikaži sve uređaje koji podržavaju nadopunu firmvera" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1112 +msgid "Install prepared updates now" +msgstr "Instaliraj pripremljene uređaje odmah" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1118 +msgid "Install a firmware file on this hardware" +msgstr "Instaliraj datoteku firmvera na ovaj uređaj" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1124 +msgid "Gets details about a firmware file" +msgstr "Prikaži pojedinosti datoteke firmvera" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1130 +msgid "Gets the list of updates for connected hardware" +msgstr "Prikaži popis nadopuna za povezani hardver" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1136 +msgid "Updates all firmware to latest versions available" +msgstr "Nadopuni sav firmver na najnovije dostupne inačice" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1142 +msgid "Gets the cryptographic hash of the dumped firmware" +msgstr "" +"Prikaži kriptografsku jedinstvenu vrijednost opširnijih informacija frimvera" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1148 +msgid "Unlocks the device for firmware access" +msgstr "Otključava uređaj za pristup firmvera" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1154 +msgid "Clears the results from the last update" +msgstr "Uklanja rezultate posljednje nadopune" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1160 +msgid "Gets the results from the last update" +msgstr "Prikaži rezultate posljednje nadopune" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1166 +msgid "Refresh metadata from remote server" +msgstr "Osvježi metapodatke s udaljenog poslužitelja" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1172 +msgid "Update the stored metadata with current ROM contents" +msgstr "Nadopuni pohranjene metapodatke s trenutnim sadržajem ROM-a" + +#. TRANSLATORS: command description +#: ../src/fu-util.c:1178 +msgid "Monitor the daemon for events" +msgstr "Nadgledaj događaje pozadinskim programom" + +#. TRANSLATORS: program name +#: ../src/fu-util.c:1197 +msgid "Firmware Utility" +msgstr "Firmver pomagalo" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/gcc.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/gcc.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/gcc.po 2021-08-03 09:03:56.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/gcc.po 2022-02-11 23:13:50.000000000 +0000 @@ -16,10 +16,10 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 18:51+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" +"X-Launchpad-Export-Date: 2022-02-11 17:49+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" "X-Bugs: Report translation errors to the Language-Team address.\n" +"Language: hr\n" #: cfgrtl.c:2748 msgid "flow control insn inside a basic block" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/geoclue.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/geoclue.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/geoclue.po 2021-08-03 09:03:59.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/geoclue.po 2022-02-11 23:13:54.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: 2021-08-02 18:25+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 17:22+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" #: ../demo/agent.c:42 ../src/gclue-main.c:47 msgid "Display version number" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/gettext-runtime.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/gettext-runtime.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/gettext-runtime.po 2021-08-03 09:03:51.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/gettext-runtime.po 2022-02-11 23:13:45.000000000 +0000 @@ -14,19 +14,18 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-08-02 16:26+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" -"Language: hr\n" +"X-Launchpad-Export-Date: 2022-02-11 15:17+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" +"X-Poedit-SearchPath-0: .\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../../Downloads/gettext-0.19.7-rc1/gettext-runtime/src\n" -"X-Poedit-SearchPath-0: .\n" +"Language: hr\n" -# Provjeriti koje nazive parametara i varijabli okoline treba prevesti... (TK) #: gnulib-lib/closeout.c:66 msgid "write error" msgstr "greška pisanja" -#: gnulib-lib/error.c:195 +#: gnulib-lib/error.c:188 msgid "Unknown system error" msgstr "Nepoznata greška sustava" @@ -44,65 +43,62 @@ msgid "%s: option '%s' is ambiguous\n" msgstr "%s: opcija „%s“ je višeznačna\n" -# http://ihjj.hr/: „dopustiti“ umjesto „dozvoliti“. Umjesto „ne dopušta“/„zahtijeva“ predlažem „ne očekuje“/„očekuje“ -#: gnulib-lib/getopt.c:576 gnulib-lib/getopt.c:580 +#: gnulib-lib/getopt.c:624 gnulib-lib/getopt.c:628 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: opcija „--%s“ ne dopušta argument\n" +msgstr "%s: opcija „--%s” ne dozvoljava argument\n" -#: gnulib-lib/getopt.c:589 gnulib-lib/getopt.c:594 +#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:642 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: opcija „%c%s“ ne dopušta argument\n" +msgstr "%s: opcija „%c%s” ne dozvoljava argument\n" -#: gnulib-lib/getopt.c:637 gnulib-lib/getopt.c:656 +#: gnulib-lib/getopt.c:685 gnulib-lib/getopt.c:704 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: opcija „--%s“ zahtijeva argument\n" +msgstr "%s: opcija „--%s” zahtijeva argument\n" -# http://wikidiff.com/unknown/unrecognized: Unrecognized is a synonym of unknown; lingivisti ne preporučuju „nepropoznata“, ako se koristi „nije prepoznata“ -#: gnulib-lib/getopt.c:694 gnulib-lib/getopt.c:697 +#: gnulib-lib/getopt.c:742 gnulib-lib/getopt.c:745 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: nepoznata opcija „--%s“\n" +msgstr "%s: neprepoznata opcija „--%s”\n" -#: gnulib-lib/getopt.c:705 gnulib-lib/getopt.c:708 +#: gnulib-lib/getopt.c:753 gnulib-lib/getopt.c:756 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: nepoznata opcija „%c%s“\n" +msgstr "%s: neprepoznata opcija „%c%s”\n" -#: gnulib-lib/getopt.c:621 +#: gnulib-lib/getopt.c:805 gnulib-lib/getopt.c:808 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: nevaljana opcija -- „%c“\n" +msgstr "%s: neispravna opcija -- „%c”\n" -#: gnulib-lib/getopt.c:636 gnulib-lib/getopt.c:682 +#: gnulib-lib/getopt.c:861 gnulib-lib/getopt.c:878 gnulib-lib/getopt.c:1088 +#: gnulib-lib/getopt.c:1106 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: opcija zahtijeva argument -- „%c“\n" +msgstr "%s: opcija zahtijeva argument -- „%c”\n" -#: gnulib-lib/getopt.c:883 gnulib-lib/getopt.c:899 +#: gnulib-lib/getopt.c:934 gnulib-lib/getopt.c:950 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: opcija „-W %s“ je dvosmislena\n" +msgstr "%s: opcija „-W %s” je višeznačna\n" -#: gnulib-lib/getopt.c:923 gnulib-lib/getopt.c:941 +#: gnulib-lib/getopt.c:974 gnulib-lib/getopt.c:992 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: opcija „-W %s“ ne dopušta argument\n" +msgstr "%s: opcija „-W %s” ne dozvoljava argument\n" -#: gnulib-lib/getopt.c:962 gnulib-lib/getopt.c:980 +#: gnulib-lib/getopt.c:1013 gnulib-lib/getopt.c:1031 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: opcija „-W %s“ zahtijeva argument\n" +msgstr "%s: opcija „-W %s” zahtijeva argument\n" -# doslovni prijevod iscrpljen ima više smisao izmučen = malaksao -#: gnulib-lib/xmalloc.c:38 +#: gnulib-lib/xmalloc.c:37 #, c-format msgid "memory exhausted" -msgstr "nema dovoljno memorije" +msgstr "memorija iscrpljena" -# http://ihjj.hr/ ppreporučuje „licencija“ umjesto „licenca“; jamstva umjesto jamstava #: src/envsubst.c:112 src/gettext.c:133 src/ngettext.c:123 #, c-format, no-wrap msgid "" @@ -113,83 +109,76 @@ "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" "Copyright © %s Free Software Foundation, Inc.\n" -"Licencija GPLv3+: GNU GPL inačica 3 ili novija " +"Licenca GPLv3+: GNU GPL inačica 3 ili novija " "\n" -"Ovo je slobodan softver: slobodno ga mijenjajte i dijelite.\n" -"NEMA JAMSTVA, do granica dopuštenih zakonom.\n" +"Ovo je slobodan softver: slobodno ga smijete mijenjati i dijeliti.\n" +"NEMA JAMSTAVA, do krajnje mjere dozvoljene zakonom.\n" -#: src/envsubst.c:116 src/gettext.c:141 src/ngettext.c:130 +#: src/envsubst.c:118 src/gettext.c:139 src/ngettext.c:129 #, c-format msgid "Written by %s.\n" msgstr "Napisao %s.\n" #. This is a proper name. See the gettext manual, section Names. -#: src/envsubst.c:116 +#: src/envsubst.c:118 msgid "Bruno Haible" msgstr "Bruno Haible" -#: src/envsubst.c:125 src/gettext.c:159 src/ngettext.c:142 +#: src/envsubst.c:127 src/gettext.c:157 src/ngettext.c:141 #, c-format msgid "too many arguments" msgstr "previše argumenata" -#: src/envsubst.c:136 src/gettext.c:169 src/ngettext.c:154 +#: src/envsubst.c:138 src/gettext.c:167 src/ngettext.c:153 #, c-format msgid "missing arguments" -msgstr "nema argumenata" +msgstr "nedostaju argumenti" #: src/envsubst.c:174 src/gettext.c:246 src/ngettext.c:211 #, c-format msgid "Try '%s --help' for more information.\n" msgstr "„%s --help“ pomoć za uporabu i dodatne obavijesti.\n" -# gettext manual 15.5.2.3 -# SHELL-FORMAT su strings, as supported by gettext and the ‘envsubst’ program, are strings with references to shell variables in the form $variable or ${variable}. -# Naziv SHELL-FORMAT (LJUSKA-FORMAT) je zbunjujući. Predložiti neku drugu riječ za SHELL-FORMAT? -#: src/envsubst.c:179 +#: src/envsubst.c:176 #, c-format, no-wrap msgid "Usage: %s [OPTION] [SHELL-FORMAT]\n" -msgstr "Uporaba: %s [OPCIJA] [FORMAT-LJUSKE]\n" +msgstr "Uporaba: %s [OPCIJA] [OBLIK-LJUSKE]\n" -#: src/envsubst.c:184 +#: src/envsubst.c:181 #, c-format, no-wrap msgid "Substitutes the values of environment variables.\n" msgstr "Zamjenjuje vrijednosti varijabli okoline.\n" -# Operation mode (za razliku Mode of Operation) je više „u toku rada, u toku procesiranja“ -#: src/envsubst.c:188 +#: src/envsubst.c:185 #, c-format, no-wrap msgid "Operation mode:\n" msgstr "Način rada:\n" -#: src/envsubst.c:191 +#: src/envsubst.c:188 #, c-format, no-wrap msgid "" " -v, --variables output the variables occurring in SHELL-" "FORMAT\n" msgstr "" -" -v, --variables ispiše varijable koje se javljaju u FORMAT-" +" -v, --variables ispiši varijable koje se nalaze u OBLIK-" "LJUSKE\n" -#: src/envsubst.c:195 src/gettext.c:275 src/ngettext.c:241 +#: src/envsubst.c:192 #, c-format, no-wrap msgid "Informative output:\n" -msgstr "Dodatne obavijesti:\n" +msgstr "Informativni izlaz:\n" -# http://ihjj.hr iziđi umjesto izađi: „prikaži pomoć i iziđi“ Ili kraće samo „pomoć“, ili „ova pomoć“; glagoli nisu nužni, jer je iz konteksta sve jasno. -#: src/envsubst.c:198 +#: src/envsubst.c:195 #, c-format, no-wrap msgid " -h, --help display this help and exit\n" -msgstr " -h, --help pokaže ovu pomoć i iziđe\n" +msgstr " -h, --help prikaži ovu pomoć i izađi\n" -#: src/envsubst.c:201 +#: src/envsubst.c:198 #, c-format, no-wrap msgid " -V, --version output version information and exit\n" -msgstr "" -" -V, --version informira o inačici ovog programa i iziđe\n" +msgstr " -V, --version ispiši informacije o inačici i izađi\n" -# envsubst:Substitutes environment variables in „shell format strings“ ali samo (i samo onda) ako su formatu $VARIJABLA ili ${VARIJABLA}! -#: src/envsubst.c:205 +#: src/envsubst.c:202 #, c-format, no-wrap msgid "" "In normal operation mode, standard input is copied to standard output,\n" @@ -200,14 +189,14 @@ "substituted; otherwise all environment variables references occurring in\n" "standard input are substituted.\n" msgstr "" -"U običnom načinu rada standardni ulaz kopira se na standardni izlaz,\n" -"s time da se referencije na varijable okoline u formatu $VARIJABLA ili\n" -"${VARIJABLA} zamijene odgovarajućim vrijednostima. Ako je navedeni argument\n" -"FORMAT-LJUSKE, onda će samo one varijable okoline s referencijom u\n" -"FORMAT-LJUSKE biti zamijenjene; u suprotnom, sve varijable okoline koje se\n" -"pojavljuju na standardnom ulazu bit će zamijenjene.\n" +"U normalnom načinu rada, standardni ulaz se kopira na standardni izlaz,\n" +"gdje se reference na varijable okoline oblika $VARIABLE ili ${VARIABLE}\n" +"zamjenjuju odgovarajućim vrijednostima. Ako je zadan OBLIK-LJUSKE, samo\n" +"se one varijable okoline referencirane u OBLIK-LJUSKE zamjenjuju, inače\n" +"se zamjenjuju reference na sve varijable okoline koje se pojavljuju na\n" +"standardnom ulazu.\n" -#: src/envsubst.c:214 +#: src/envsubst.c:211 #, c-format, no-wrap msgid "" "When --variables is used, standard input is ignored, and the output " @@ -215,11 +204,9 @@ "of the environment variables that are referenced in SHELL-FORMAT, one per " "line.\n" msgstr "" -"Ako se koristi --variables, standardni ulaz se ignorira, a izlaz se\n" -"sastoji od onih varijabli okoline s referencijom u FORMAT-LJUSKE,\n" -"po jedna po retku.\n" +"Kada se koristi --variables, standardni ulaz se zanemaruje, a izlaz sadrži\n" +"varijable okoline referencirane u OBLIK-LJUSKE, jedna po retku.\n" -# Savjet lingvista: Ako može, onda je bolje upotrijebiti hrvatski red riječi, prvo subjekt, pa onda veznici, predikati.... #. TRANSLATORS: The placeholder indicates the bug-reporting address #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the address for translation @@ -227,44 +214,37 @@ #: src/envsubst.c:219 src/gettext.c:279 src/ngettext.c:245 msgid "Report bugs to .\n" msgstr "" -"Greške u programu na engleskom javite na .\n" -"Primjedbe i pogreške u prijevodu javite na .\n" +"Prijavite greške na .\n" +"Prijavite greške prijevoda na .\n" -#: src/envsubst.c:451 +#: src/envsubst.c:442 #, c-format msgid "error while reading \"%s\"" -msgstr "greška pri čitanju „%s“" +msgstr "greška pri čitanju „%s”" -#: src/envsubst.c:451 +#: src/envsubst.c:443 msgid "standard input" msgstr "standardni ulaz" #. This is a proper name. See the gettext manual, section Names. -#: src/gettext.c:141 src/ngettext.c:130 +#: src/gettext.c:139 src/ngettext.c:129 msgid "Ulrich Drepper" msgstr "Ulrich Drepper" -# 15.5.2.3 Invoking the gettext program -# gettext [option] [[textdomain] msgid] -# gettext [option] -s [msgid]... -# Upute koriste „msgid“, pa je možda bolje ne prevađati tu riječ. -#: src/gettext.c:251 +#: src/gettext.c:243 #, c-format, no-wrap msgid "" "Usage: %s [OPTION] [[TEXTDOMAIN] MSGID]\n" "or: %s [OPTION] -s [MSGID]...\n" msgstr "" -"Uporaba: %s [OPCIJA] [[TEKSTDOMENA] MSGID]\n" -" ili: %s [OPCIJA] -s [MSGID]...\n" +"Uporaba: %s [OPCIJA] [[TEKSTDOMENA] ID-PORUKE]\n" +"ili: %s [OPCIJA] -s [ID-PORUKE]...\n" -# http://ihjj.hr: „materinji“ > „materinski“ -#: src/gettext.c:257 +#: src/gettext.c:249 #, c-format, no-wrap msgid "Display native language translation of a textual message.\n" -msgstr "Ispiše prijevod tekstualne poruke.\n" +msgstr "Prikaži prijevod tekstualne poruke na materinji jezik.\n" -# „retrieve“ podrazumijeva implicitno postojane prijevoda; ako prijevoda nema, onda ga ne može „retrieve“; zato promjena „retrieve“ > „traži“ -# jd./mn. za poruke slijedi gettext Manual. #: src/gettext.c:253 #, c-format, no-wrap msgid "" @@ -277,14 +257,14 @@ " [TEXTDOMAIN] MSGID retrieve translated message corresponding\n" " to MSGID from TEXTDOMAIN\n" msgstr "" -" -d, --domain=TEKSTDOMENA traži prevedene poruke iz TEKSTDOMENE\n" -" -e omogući proširenje nekih escape sekvencija\n" -" -E (ignorira se zbog kompatibilnosti)\n" -" -h, --help pokaže ovu pomoć i iziđe\n" -" -n bez završnog znaka novog retka\n" -" -V, --version informira o inačici ovog programa i iziđe\n" -" [TEKSTDOMENA] MSGID potraži prevedenu poruku\n" -" za MSGID u TEKSTDOMENI\n" +" -d, --domain=TEKSTDOMENA dohvati prevedene poruke iz TEKSTDOMENA\n" +" -e omogući proširivanje nekih izlaznih nizova\n" +" -E (zanemareno zbog kompatibilnosti)\n" +" -h, --help prikaži ovu pomoć i izađi\n" +" -n izostavi završnu oznaku novog retka\n" +" -V, --version prikaži informacije o inačici i izađi\n" +" [TEKSTDOMENA] [ID-PORUKE] dohvati prevedene poruke koje odgovaraju\n" +" ID-PORUKE iz TEKSTDOMENA\n" #: src/gettext.c:283 #, c-format, no-wrap @@ -310,28 +290,20 @@ "\n" "Uobičajeni direktorij za pretragu je: %s\n" -#: src/ngettext.c:216 +#: src/ngettext.c:212 #, c-format, no-wrap msgid "Usage: %s [OPTION] [TEXTDOMAIN] MSGID MSGID-PLURAL COUNT\n" -msgstr "Uporaba: %s [OPCIJA] [TEKSTDOMENA] MSGID MSGID-PLURAL BROJ\n" +msgstr "Uporaba: %s [OPCIJA] [TEXTDOMAIN] ID-PORUKE ID-MNOŽINE BROJ\n" -# http://ihjj.hr: „materinji“ > „materinski“ -#: src/ngettext.c:221 +#: src/ngettext.c:217 #, c-format, no-wrap msgid "" "Display native language translation of a textual message whose grammatical\n" "form depends on a number.\n" msgstr "" -"Ispiše prijevod tekstualne poruke čiji gramatički oblik ovisi o broju\n" +"Prikaži prijevod tekstualne poruke čiji gramatički oblik ovisi o broju na\n" +"materinji jezik.\n" -# 15.5.2.4 Invoking the ngettext program -# ngettext [option] [textdomain] msgid msgid-plural count -# U uputama „messages“ su u pluralu, u po file su u singularu. Slijedimo Upute. -# „retrieve“ podrazumijeva implicitno -# postojane prijevoda; ako prijevoda -# nema, onda ga ne može „retrieve“; zato -# promjena „retrieve“ > „traži“ -# jd./mn. za poruke slijedi gettext Manual. #: src/ngettext.c:222 #, c-format, no-wrap msgid "" @@ -345,17 +317,18 @@ "(plural)\n" " COUNT choose singular/plural form based on this value\n" msgstr "" -" -d, --domain=TEKSTDOMENA traži prevedene poruke iz TEKSTDOMENA\n" -" -e omogući proširenje nekih escape sekvencija\n" -" -E (ignorira se zbog kompatibilnosti)\n" -" -h, --help pokaže ovu pomoć i iziđe\n" -" -V, --version informira o inačici ovog programa i iziđe\n" -" [TEKSTDOMENA] potraži prevedenu poruku u TEKSTDOMENI\n" -" MSGID MSGID-PLURAL prijevod za MSGID (jednina)/MSGID-PLURAL " +" -d, --domain=TEKSTDOMENA dohvati prevedenu poruku iz TEKSTDOMENA\n" +" -e omogući proširivanje nekih izlaznih nizova\n" +" -E (zanemareno zbog kompatibilnosti)\n" +" -h, --help prikaži ovu pomoć i izađi\n" +" -V, --version prikaži informacije o inačici i izađi\n" +" [TEKSTDOMENA] dohvati prevedenu poruku iz TEKSTDOMENA\n" +" ID-PORUKE ID-MNOŽINE prevedi ID-PORUKE (jednina) / ID-MNOŽINE " "(množina)\n" -" BROJ odabere oblik za jd./mn. na temelju ovog BROJA\n" +" BROJ odaberi oblik jednine/množine ovisno o ovoj\n" +" vrijednosti\n" -#: src/ngettext.c:249 +#: src/ngettext.c:233 #, c-format, no-wrap msgid "" "If the TEXTDOMAIN parameter is not given, the domain is determined from the\n" @@ -365,8 +338,8 @@ "variable TEXTDOMAINDIR.\n" "Standard search directory: %s\n" msgstr "" -"Ako parametar TEKSTDOMENA nije naveden, domenu određuje varijabla okoline\n" -"TEXTDOMAIN. Ako katalog poruka nije pronađen u uobičajenom direktoriju,\n" -"alternativna lokacija može se zadati varijablom okoline TEXTDOMAINDIR.\n" -"\n" -"Uobičajeni direktorij za pretragu je: %s\n" +"Ako parametar TEKSTDOMENA nije naveden, domena se određuje iz varijable\n" +"okoline TEXTDOMAIN. Ako katalog poruka nije pronađen u uobičajenom\n" +"direktoriju, druga lokacija se može navesti varijablom okoline " +"TEXTDOMAINDIR.\n" +"Uobičajeni direktorij za pretragu: %s\n" diff -Nru language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/git.po language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/git.po --- language-pack-hr-base-20.04+20210802/data/hr/LC_MESSAGES/git.po 2021-08-03 09:03:58.000000000 +0000 +++ language-pack-hr-base-20.04+20220211/data/hr/LC_MESSAGES/git.po 2022-02-11 23:13:53.000000000 +0000 @@ -16,215 +16,216 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2021-08-02 17:04+0000\n" -"X-Generator: Launchpad (build 8bd362bf86c4b35e805f897f03c203e3576a7006)\n" +"X-Launchpad-Export-Date: 2022-02-11 15:57+0000\n" +"X-Generator: Launchpad (build fb383037dc57f48cc5195c1eb2676319fbdf7e33)\n" -#: add-interactive.c:376 +#: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 -#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 -#: builtin/rebase.c:1963 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: builtin/rebase.c:1642 msgid "could not read index" msgstr "" -#: add-interactive.c:584 git-add--interactive.perl:269 +#: add-interactive.c:588 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "" -#: add-interactive.c:642 git-add--interactive.perl:278 +#: add-interactive.c:646 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "" -#: add-interactive.c:643 git-add--interactive.perl:314 +#: add-interactive.c:647 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "" -#: add-interactive.c:680 git-add--interactive.perl:641 +#: add-interactive.c:684 git-add--interactive.perl:641 msgid "Update" msgstr "" -#: add-interactive.c:697 add-interactive.c:885 +#: add-interactive.c:701 add-interactive.c:889 #, c-format msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 msgid "could not write index" msgstr "" -#: add-interactive.c:706 git-add--interactive.perl:626 +#: add-interactive.c:710 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:724 git-add--interactive.perl:676 +#: add-interactive.c:728 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "" -#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 -#: builtin/reset.c:145 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 +#: builtin/reset.c:151 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: add-interactive.c:759 git-add--interactive.perl:653 +#: add-interactive.c:763 git-add--interactive.perl:653 msgid "Revert" msgstr "" -#: add-interactive.c:775 +#: add-interactive.c:779 msgid "Could not parse HEAD^{tree}" msgstr "" -#: add-interactive.c:813 git-add--interactive.perl:629 +#: add-interactive.c:817 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:864 git-add--interactive.perl:693 +#: add-interactive.c:868 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "" -#: add-interactive.c:868 git-add--interactive.perl:687 +#: add-interactive.c:872 git-add--interactive.perl:687 msgid "Add untracked" msgstr "" -#: add-interactive.c:895 git-add--interactive.perl:623 +#: add-interactive.c:899 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:925 +#: add-interactive.c:929 #, c-format msgid "ignoring unmerged: %s" msgstr "" -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "" -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "" -#: add-interactive.c:943 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1379 msgid "Patch update" msgstr "" -#: add-interactive.c:982 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1792 msgid "Review diff" msgstr "" -#: add-interactive.c:1010 +#: add-interactive.c:1014 msgid "show paths with changes" msgstr "" -#: add-interactive.c:1012 +#: add-interactive.c:1016 msgid "add working tree state to the staged set of changes" msgstr "" -#: add-interactive.c:1014 +#: add-interactive.c:1018 msgid "revert staged set of changes back to the HEAD version" msgstr "" -#: add-interactive.c:1016 +#: add-interactive.c:1020 msgid "pick hunks and update selectively" msgstr "" -#: add-interactive.c:1018 +#: add-interactive.c:1022 msgid "view diff between HEAD and index" msgstr "" -#: add-interactive.c:1020 +#: add-interactive.c:1024 msgid "add contents of untracked files to the staged set of changes" msgstr "" -#: add-interactive.c:1028 add-interactive.c:1077 +#: add-interactive.c:1032 add-interactive.c:1081 msgid "Prompt help:" msgstr "" -#: add-interactive.c:1030 +#: add-interactive.c:1034 msgid "select a single item" msgstr "" -#: add-interactive.c:1032 +#: add-interactive.c:1036 msgid "select a range of items" msgstr "" -#: add-interactive.c:1034 +#: add-interactive.c:1038 msgid "select multiple ranges" msgstr "" -#: add-interactive.c:1036 add-interactive.c:1081 +#: add-interactive.c:1040 add-interactive.c:1085 msgid "select item based on unique prefix" msgstr "" -#: add-interactive.c:1038 +#: add-interactive.c:1042 msgid "unselect specified items" msgstr "" -#: add-interactive.c:1040 +#: add-interactive.c:1044 msgid "choose all items" msgstr "" -#: add-interactive.c:1042 +#: add-interactive.c:1046 msgid "(empty) finish selecting" msgstr "" -#: add-interactive.c:1079 +#: add-interactive.c:1083 msgid "select a numbered item" msgstr "" -#: add-interactive.c:1083 +#: add-interactive.c:1087 msgid "(empty) select nothing" msgstr "" -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "" -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "staged" msgstr "" -#: add-interactive.c:1144 git-add--interactive.perl:213 +#: add-interactive.c:1148 git-add--interactive.perl:213 msgid "unstaged" msgstr "" -#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 -#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 #: git-add--interactive.perl:213 msgid "path" msgstr "" -#: add-interactive.c:1151 +#: add-interactive.c:1155 msgid "could not refresh index" msgstr "" -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "" @@ -244,32 +245,32 @@ msgid "Stage this hunk [y,n,a,q,d%s,?]? " msgstr "" -#: add-patch.c:342 +#: add-patch.c:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "" -#: add-patch.c:361 add-patch.c:365 +#: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "" -#: add-patch.c:419 +#: add-patch.c:420 msgid "could not parse diff" msgstr "" -#: add-patch.c:438 +#: add-patch.c:439 msgid "could not parse colored diff" msgstr "" -#: add-patch.c:790 +#: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:805 +#: add-patch.c:806 #, c-format msgid "" "hunks do not overlap:\n" @@ -278,11 +279,11 @@ "%.*s" msgstr "" -#: add-patch.c:1081 git-add--interactive.perl:1115 +#: add-patch.c:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: add-patch.c:1085 +#: add-patch.c:1086 #, c-format msgid "" "---\n" @@ -298,18 +299,18 @@ msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1099 git-add--interactive.perl:1129 +#: add-patch.c:1100 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -#: add-patch.c:1132 +#: add-patch.c:1133 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1177 +#: add-patch.c:1178 msgid "'git apply --cached' failed" msgstr "" @@ -325,7 +326,7 @@ #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1246 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -339,7 +340,7 @@ "d - do not stage this hunk nor any of the remaining hunks\n" msgstr "" -#: add-patch.c:1354 +#: add-patch.c:1355 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -352,121 +353,121 @@ "? - print help\n" msgstr "" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "" -#: add-patch.c:1521 add-patch.c:1531 +#: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "" -#: add-patch.c:1537 +#: add-patch.c:1538 msgid "No other hunks to goto" msgstr "" -#: add-patch.c:1548 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " msgstr "" -#: add-patch.c:1549 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "" -#: add-patch.c:1560 +#: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "" -#: add-patch.c:1565 +#: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "" msgstr[1] "" -#: add-patch.c:1574 +#: add-patch.c:1575 msgid "No other hunks to search" msgstr "" -#: add-patch.c:1580 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "" -#: add-patch.c:1595 +#: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "" -#: add-patch.c:1612 +#: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "" -#: add-patch.c:1619 +#: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "" -#: add-patch.c:1623 +#: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "" -#: add-patch.c:1627 +#: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "" -#: advice.c:159 +#: advice.c:94 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:250 +#: advice.c:178 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:252 +#: advice.c:180 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:254 +#: advice.c:182 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:256 +#: advice.c:184 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:258 +#: advice.c:186 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:260 +#: advice.c:188 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:268 +#: advice.c:196 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:276 +#: advice.c:204 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:281 builtin/merge.c:1370 +#: advice.c:209 builtin/merge.c:1379 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:283 +#: advice.c:211 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:284 +#: advice.c:212 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:290 +#: advice.c:242 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -497,82 +498,82 @@ msgid "unclosed quote" msgstr "" -#: apply.c:69 +#: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:85 +#: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:135 +#: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:137 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:140 +#: apply.c:139 msgid "--3way outside a repository" msgstr "" -#: apply.c:151 +#: apply.c:150 msgid "--index outside a repository" msgstr "" -#: apply.c:154 +#: apply.c:153 msgid "--cached outside a repository" msgstr "" -#: apply.c:801 +#: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:810 +#: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:884 +#: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:922 +#: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:928 +#: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:929 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:934 +#: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:963 +#: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1282 +#: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1372 +#: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -583,45 +584,45 @@ msgstr[0] "" msgstr[1] "" -#: apply.c:1385 +#: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1481 +#: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1550 +#: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" @@ -726,7 +727,7 @@ msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" @@ -737,370 +738,372 @@ msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3442 apply.c:3685 +#: apply.c:3442 apply.c:3709 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3528 apply.c:3700 +#: apply.c:3549 apply.c:3724 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3537 apply.c:3708 apply.c:3952 +#: apply.c:3558 apply.c:3732 apply.c:3976 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3572 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3575 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3591 apply.c:3595 +#: apply.c:3612 apply.c:3616 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3607 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3621 +#: apply.c:3642 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3626 +#: apply.c:3647 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3652 +#: apply.c:3676 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3725 +#: apply.c:3749 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3727 +#: apply.c:3751 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 -#: read-cache.c:1313 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 +#: read-cache.c:1368 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3950 +#: apply.c:3974 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3954 +#: apply.c:3978 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3974 +#: apply.c:3998 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3979 +#: apply.c:4003 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3999 +#: apply.c:4023 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:4003 +#: apply.c:4027 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4018 +#: apply.c:4042 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4110 +#: apply.c:4134 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4117 +#: apply.c:4141 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4120 +#: apply.c:4144 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4129 +#: apply.c:4153 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4139 +#: apply.c:4163 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4277 +#: apply.c:4301 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4311 +#: apply.c:4335 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4317 +#: apply.c:4341 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4325 +#: apply.c:4349 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4331 apply.c:4476 +#: apply.c:4355 apply.c:4500 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4374 builtin/bisect--helper.c:523 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 +#: builtin/gc.c:2276 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4378 +#: apply.c:4402 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4448 +#: apply.c:4472 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4546 +#: apply.c:4570 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4554 +#: apply.c:4578 msgid "internal error" msgstr "" -#: apply.c:4557 +#: apply.c:4581 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4568 +#: apply.c:4592 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4590 +#: apply.c:4614 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4594 +#: apply.c:4618 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4718 +#: apply.c:4747 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4726 +#: apply.c:4755 msgid "unrecognized input" msgstr "" -#: apply.c:4746 +#: apply.c:4775 msgid "unable to read index file" msgstr "" -#: apply.c:4903 +#: apply.c:4932 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4930 +#: apply.c:4959 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4936 apply.c:4951 +#: apply.c:4965 apply.c:4980 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4944 +#: apply.c:4973 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 msgid "Unable to write new index file" msgstr "" -#: apply.c:4988 +#: apply.c:5017 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4991 +#: apply.c:5020 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4993 builtin/am.c:2266 +#: apply.c:5022 builtin/am.c:2320 msgid "num" msgstr "" -#: apply.c:4994 +#: apply.c:5023 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4997 +#: apply.c:5026 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4999 +#: apply.c:5028 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:5003 +#: apply.c:5032 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:5005 +#: apply.c:5034 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:5007 +#: apply.c:5036 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:5009 +#: apply.c:5038 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:5011 +#: apply.c:5040 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5013 +#: apply.c:5042 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:5015 +#: apply.c:5044 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:5018 +#: apply.c:5047 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5020 +#: apply.c:4952 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5022 +#: apply.c:5051 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 +#: apply.c:5054 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5027 +#: apply.c:5056 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 +#: builtin/rebase.c:1051 msgid "action" msgstr "" -#: apply.c:5029 +#: apply.c:5058 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5032 apply.c:5035 +#: apply.c:5061 apply.c:5064 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5038 +#: apply.c:5067 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5040 +#: apply.c:5069 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5042 +#: apply.c:5071 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5044 +#: apply.c:5073 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 -#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 msgid "be verbose" msgstr "" -#: apply.c:5047 +#: apply.c:5076 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5050 +#: apply.c:5079 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5052 builtin/am.c:2254 +#: apply.c:5081 builtin/am.c:2308 msgid "root" msgstr "" -#: apply.c:5053 +#: apply.c:5082 msgid "prepend to all filenames" msgstr "" @@ -1121,119 +1124,119 @@ msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:454 +#: archive.c:450 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:460 +#: archive.c:456 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:473 +#: archive.c:469 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:485 +#: archive.c:481 msgid "current working directory is untracked" msgstr "" -#: archive.c:555 +#: archive.c:551 msgid "fmt" msgstr "" -#: archive.c:555 +#: archive.c:551 msgid "archive format" msgstr "" -#: archive.c:556 builtin/log.c:1764 +#: archive.c:552 builtin/log.c:1775 msgid "prefix" msgstr "" -#: archive.c:557 +#: archive.c:553 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 -#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "" -#: archive.c:562 builtin/archive.c:90 +#: archive.c:558 builtin/archive.c:88 msgid "write the archive to this file" msgstr "" -#: archive.c:564 +#: archive.c:560 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:565 +#: archive.c:561 msgid "report archived files on stderr" msgstr "" -#: archive.c:465 +#: archive.c:444 msgid "store only" msgstr "" -#: archive.c:466 +#: archive.c:445 msgid "compress faster" msgstr "" -#: archive.c:474 +#: archive.c:453 msgid "compress better" msgstr "" -#: archive.c:570 +#: archive.c:566 msgid "list supported archive formats" msgstr "" -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 msgid "repo" msgstr "" -#: archive.c:573 builtin/archive.c:92 +#: archive.c:569 builtin/archive.c:90 msgid "retrieve the archive from remote repository " msgstr "Preuzimanje arhive s udaljenog repozitorij " -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 -#: builtin/notes.c:498 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: builtin/notes.c:496 msgid "command" msgstr "" -#: archive.c:575 builtin/archive.c:94 +#: archive.c:571 builtin/archive.c:92 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:582 +#: archive.c:578 msgid "Unexpected option --remote" msgstr "" -#: archive.c:584 +#: archive.c:580 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:586 +#: archive.c:582 msgid "Unexpected option --output" msgstr "" -#: archive.c:610 +#: archive.c:606 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:619 +#: archive.c:615 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" @@ -1248,7 +1251,7 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive.c:192 +#: archive.c:188 #, c-format msgid "cannot read %s" msgstr "" @@ -1277,7 +1280,7 @@ msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368 #, c-format msgid "deflate error (%d)" msgstr "" @@ -1287,59 +1290,59 @@ msgid "timestamp too large for this system: %" msgstr "" -#: attr.c:202 +#: attr.c:203 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:359 +#: attr.c:364 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:399 +#: attr.c:404 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:489 +#: bisect.c:488 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:699 +#: bisect.c:698 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:766 +#: bisect.c:764 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:791 +#: bisect.c:789 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:796 +#: bisect.c:794 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:801 +#: bisect.c:799 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:809 +#: bisect.c:807 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1347,7 +1350,7 @@ "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:822 +#: bisect.c:820 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1355,43 +1358,43 @@ "We continue anyway." msgstr "" -#: bisect.c:861 +#: bisect.c:859 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:911 +#: bisect.c:909 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 +#: bisect.c:939 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:987 builtin/merge.c:153 +#: bisect.c:985 builtin/merge.c:154 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:1027 +#: bisect.c:1025 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1057 +#: bisect.c:1055 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1066 +#: bisect.c:977 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1095 +#: bisect.c:1093 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1401,44 +1404,45 @@ #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1101 +#: bisect.c:1099 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2777 +#: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2791 +#: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2812 +#: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 -#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 -#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 -#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "" -#: blame.c:2839 +#: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2850 +#: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2861 +#: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1558,94 +1562,94 @@ msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:365 +#: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:388 +#: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:36 +#: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:110 +#: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 -#: builtin/commit.c:814 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: builtin/commit.c:862 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:189 +#: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:192 +#: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:243 +#: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:250 +#: bundle.c:264 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:252 +#: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:319 +#: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:326 +#: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:337 +#: bundle.c:351 msgid "pack-objects died" msgstr "" -#: bundle.c:379 +#: bundle.c:311 msgid "rev-list died" msgstr "" -#: bundle.c:386 +#: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:539 +#: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:549 +#: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:574 +#: bundle.c:588 msgid "index-pack died" msgstr "" @@ -1654,18 +1658,18 @@ msgid "invalid color value: %.*s" msgstr "" -#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:54 +#: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:194 +#: commit.c:196 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1677,48 +1681,48 @@ "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1223 +#: commit.c:1239 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1227 +#: commit.c:1243 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1230 +#: commit.c:1246 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1233 +#: commit.c:1249 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1487 +#: commit.c:1503 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: commit-graph.c:255 +#: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:348 +#: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:355 +#: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:362 +#: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" @@ -1727,81 +1731,81 @@ msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:361 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:433 +#: commit-graph.c:286 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:472 +#: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:482 +#: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:530 +#: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:554 +#: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:735 commit-graph.c:772 +#: commit-graph.c:746 commit-graph.c:783 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:756 +#: commit-graph.c:767 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1065 builtin/am.c:1292 +#: commit-graph.c:1105 builtin/am.c:1342 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1327 builtin/pack-objects.c:2872 +#: commit-graph.c:1367 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1358 +#: commit-graph.c:1398 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1375 +#: commit-graph.c:1415 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1395 +#: commit-graph.c:1435 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1467 +#: commit-graph.c:1507 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1650 +#: commit-graph.c:1690 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1663 +#: commit-graph.c:1703 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1667 +#: commit-graph.c:1707 #, c-format msgid "error opening index for %s" msgstr "" @@ -1818,7 +1822,7 @@ msgid "invalid commit object id: %s" msgstr "" -#: commit-graph.c:1704 +#: commit-graph.c:1744 msgid "Finding commits for commit graph among packed objects" msgstr "" @@ -1826,44 +1830,44 @@ msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1722 +#: commit-graph.c:1762 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1771 +#: commit-graph.c:1811 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1802 midx.c:794 +#: commit-graph.c:1842 midx.c:1146 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: builtin/index-pack.c:342 +#: wrapper.c:203 #, c-format msgid "unable to create '%s'" msgstr "" -#: commit-graph.c:1879 +#: commit-graph.c:1917 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1915 +#: commit-graph.c:1953 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1931 +#: commit-graph.c:1969 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1951 +#: commit-graph.c:1989 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:2084 +#: commit-graph.c:2122 msgid "Scanning merged commits" msgstr "" @@ -1872,7 +1876,7 @@ msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:2128 +#: commit-graph.c:2166 msgid "Merging commit-graph" msgstr "" @@ -1881,76 +1885,76 @@ msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:2342 +#: commit-graph.c:2381 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2440 +#: commit-graph.c:2479 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2450 +#: commit-graph.c:2489 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2460 commit-graph.c:2475 +#: commit-graph.c:2499 commit-graph.c:2514 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2467 +#: commit-graph.c:2506 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2485 +#: commit-graph.c:2524 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2500 +#: commit-graph.c:2539 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2507 +#: commit-graph.c:2546 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2517 +#: commit-graph.c:2556 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2526 +#: commit-graph.c:2565 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2540 +#: commit-graph.c:2579 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2545 +#: commit-graph.c:2584 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2549 +#: commit-graph.c:2588 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2432 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2572 +#: commit-graph.c:2611 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "" @@ -1959,7 +1963,7 @@ msgid "memory exhausted" msgstr "" -#: config.c:126 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1969,20 +1973,20 @@ "This might be due to circular includes." msgstr "" -#: config.c:142 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:153 +#: config.c:152 msgid "relative config includes must come from files" msgstr "" -#: config.c:199 +#: config.c:201 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:442 +#: config.c:443 #, c-format msgid "key does not contain a section: %s" msgstr "" @@ -1992,266 +1996,266 @@ msgid "key does not contain variable name: %s" msgstr "" -#: config.c:472 sequencer.c:2588 +#: config.c:470 sequencer.c:2804 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:478 +#: config.c:475 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:529 config.c:541 +#: config.c:513 config.c:525 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:555 config.c:572 config.c:579 config.c:588 +#: config.c:539 config.c:556 config.c:563 config.c:572 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:995 +#: config.c:979 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:999 +#: config.c:983 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:1003 +#: config.c:987 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:1007 +#: config.c:991 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:1011 +#: config.c:995 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:1015 +#: config.c:999 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:1152 +#: config.c:1136 msgid "out of range" msgstr "" -#: config.c:1152 +#: config.c:1136 msgid "invalid unit" msgstr "" -#: config.c:1153 +#: config.c:1137 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:1163 +#: config.c:1147 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1166 +#: config.c:1150 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1169 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1172 +#: config.c:1156 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1175 +#: config.c:1159 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1178 +#: config.c:1162 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1289 +#: config.c:1259 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1298 +#: config.c:1268 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1391 +#: config.c:1361 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1405 config.c:1416 +#: config.c:1375 config.c:1386 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1508 +#: config.c:1476 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1541 +#: config.c:1509 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1613 +#: config.c:1581 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1639 +#: config.c:1607 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1640 +#: config.c:1608 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1701 builtin/pack-objects.c:3666 +#: config.c:1669 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1823 +#: config.c:1792 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1826 +#: config.c:1795 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1843 +#: config.c:1813 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1873 +#: config.c:1858 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1927 +#: config.c:1914 msgid "unable to parse command-line config" msgstr "" -#: config.c:2290 +#: config.c:2282 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2464 +#: config.c:2456 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2509 +#: config.c:2501 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2555 +#: config.c:2547 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2557 +#: config.c:2549 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2641 +#: config.c:2633 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2673 +#: config.c:2665 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2702 +#: config.c:2694 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2954 config.c:3280 +#: config.c:2946 config.c:3273 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2965 +#: config.c:2957 #, c-format msgid "opening %s" msgstr "" -#: config.c:3002 builtin/config.c:361 +#: config.c:2994 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:3027 +#: config.c:3019 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:3040 config.c:3293 +#: config.c:3032 config.c:3286 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:3051 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:3060 config.c:3298 +#: config.c:3053 config.c:3291 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:3145 config.c:3395 +#: config.c:3138 config.c:3388 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:3179 +#: config.c:3172 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3271 +#: config.c:3264 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3438 +#: config.c:3431 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2282,63 +2286,63 @@ msgid "expected flush after capabilities" msgstr "" -#: connect.c:263 +#: connect.c:265 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" -#: connect.c:284 +#: connect.c:286 msgid "protocol error: unexpected capabilities^{}" msgstr "" -#: connect.c:306 +#: connect.c:308 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" -#: connect.c:308 +#: connect.c:310 msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:347 +#: connect.c:349 msgid "invalid packet" msgstr "" -#: connect.c:367 +#: connect.c:369 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:526 +#: connect.c:528 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:530 +#: connect.c:532 msgid "expected flush after ref listing" msgstr "" -#: connect.c:666 +#: connect.c:670 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:717 +#: connect.c:721 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:757 connect.c:820 +#: connect.c:761 connect.c:824 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:761 +#: connect.c:765 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:765 connect.c:836 +#: connect.c:769 connect.c:840 #, c-format msgid "" "done.\n" @@ -2347,7 +2351,7 @@ "završeno.\n" "Povezivanje s %s (ulaz %s) ... " -#: connect.c:787 connect.c:864 +#: connect.c:791 connect.c:868 #, c-format msgid "" "unable to connect to %s:\n" @@ -2355,189 +2359,189 @@ msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:793 connect.c:870 +#: connect.c:797 connect.c:874 msgid "done." msgstr "završeno." -#: connect.c:824 +#: connect.c:828 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:830 +#: connect.c:834 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:967 connect.c:1299 +#: connect.c:971 connect.c:1303 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:969 +#: connect.c:973 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:979 +#: connect.c:983 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:1050 +#: connect.c:1054 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1247 +#: connect.c:1251 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1259 +#: connect.c:1263 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1276 +#: connect.c:1280 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1388 +#: connect.c:1392 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1436 +#: connect.c:1440 msgid "unable to fork" msgstr "" -#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Provjeravanje povezivosti" -#: connected.c:120 +#: connected.c:122 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:144 +#: connected.c:146 msgid "failed write to rev-list" msgstr "" -#: connected.c:149 +#: connected.c:151 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:194 +#: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:209 +#: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:217 +#: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:219 +#: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:284 +#: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:462 +#: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:665 +#: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:685 +#: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:692 +#: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:727 convert.c:730 +#: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:733 convert.c:788 +#: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:837 +#: convert.c:826 msgid "unexpected filter type" msgstr "" -#: convert.c:848 +#: convert.c:837 msgid "path name too long for external filter" msgstr "" -#: convert.c:940 +#: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1240 +#: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1428 convert.c:1462 +#: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1508 +#: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -2639,641 +2643,641 @@ msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:786 +#: diffcore-rename.c:1564 msgid "Performing inexact rename detection" msgstr "" -#: diff-no-index.c:238 +#: diff-no-index.c:237 msgid "git diff --no-index [] " msgstr "" -#: diff-no-index.c:263 +#: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "" -#: diff.c:156 +#: diff.c:157 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:161 +#: diff.c:162 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:297 +#: diff.c:298 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:325 +#: diff.c:326 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -#: diff.c:333 +#: diff.c:334 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:410 +#: diff.c:411 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:470 +#: diff.c:471 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:4276 +#: diff.c:4290 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4628 +#: diff.c:4642 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4631 +#: diff.c:4645 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4710 +#: diff.c:4730 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4758 +#: diff.c:4778 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4795 +#: diff.c:4815 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4880 +#: diff.c:4900 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4904 +#: diff.c:4924 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4918 +#: diff.c:4938 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4968 diff.c:4974 +#: diff.c:4988 diff.c:4994 #, c-format msgid "%s expects / form" msgstr "" -#: diff.c:4986 +#: diff.c:5006 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:5007 +#: diff.c:5027 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:5026 +#: diff.c:5046 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5066 +#: diff.c:5086 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5102 diff.c:5122 +#: diff.c:5122 diff.c:5142 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5275 +#: diff.c:5295 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5331 +#: diff.c:5351 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5367 +#: diff.c:5387 msgid "Diff output format options" msgstr "" -#: diff.c:5369 diff.c:5375 +#: diff.c:5389 diff.c:5395 msgid "generate patch" msgstr "" -#: diff.c:5372 builtin/log.c:179 +#: diff.c:5392 builtin/log.c:179 msgid "suppress diff output" msgstr "" -#: diff.c:5377 diff.c:5491 diff.c:5498 +#: diff.c:5397 diff.c:5511 diff.c:5518 msgid "" msgstr "" -#: diff.c:5378 diff.c:5381 +#: diff.c:5398 diff.c:5401 msgid "generate diffs with lines context" msgstr "" -#: diff.c:5383 +#: diff.c:5403 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5386 +#: diff.c:5406 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5390 +#: diff.c:5410 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5394 +#: diff.c:5414 msgid "machine friendly --stat" msgstr "" -#: diff.c:5397 +#: diff.c:5417 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5399 diff.c:5407 +#: diff.c:5419 diff.c:5427 msgid "..." msgstr "" -#: diff.c:5400 +#: diff.c:5420 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5404 +#: diff.c:5424 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5408 +#: diff.c:5428 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5412 +#: diff.c:5432 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5415 +#: diff.c:5435 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5418 +#: diff.c:5438 msgid "show only names of changed files" msgstr "" -#: diff.c:5421 +#: diff.c:5441 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5423 +#: diff.c:5443 msgid "[,[,]]" msgstr "" -#: diff.c:5424 +#: diff.c:5444 msgid "generate diffstat" msgstr "" -#: diff.c:5426 diff.c:5429 diff.c:5432 +#: diff.c:5446 diff.c:5449 diff.c:5452 msgid "" msgstr "" -#: diff.c:5427 +#: diff.c:5447 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5430 +#: diff.c:5450 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5433 +#: diff.c:5453 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5435 +#: diff.c:5455 msgid "" msgstr "" -#: diff.c:5436 +#: diff.c:5456 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5439 +#: diff.c:5459 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5442 +#: diff.c:5462 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5445 +#: diff.c:5465 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5447 +#: diff.c:5467 msgid "show colored diff" msgstr "" -#: diff.c:5448 +#: diff.c:5468 msgid "" msgstr "" -#: diff.c:5449 +#: diff.c:5469 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5452 +#: diff.c:5472 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or -" "-numstat" msgstr "" -#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 msgid "" msgstr "" -#: diff.c:5456 +#: diff.c:5476 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5459 +#: diff.c:5479 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5462 +#: diff.c:5482 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5465 +#: diff.c:5485 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5468 +#: diff.c:5488 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5472 diff.c:5477 diff.c:5482 +#: diff.c:5492 diff.c:5497 diff.c:5502 msgid "" msgstr "" -#: diff.c:5473 +#: diff.c:5493 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5478 +#: diff.c:5498 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5483 +#: diff.c:5503 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5486 +#: diff.c:5506 msgid "Diff rename options" msgstr "" -#: diff.c:5487 +#: diff.c:5507 msgid "[/]" msgstr "" -#: diff.c:5488 +#: diff.c:5508 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5492 +#: diff.c:5512 msgid "detect renames" msgstr "" -#: diff.c:5496 +#: diff.c:5516 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5499 +#: diff.c:5519 msgid "detect copies" msgstr "" -#: diff.c:5503 +#: diff.c:5523 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5505 +#: diff.c:5525 msgid "disable rename detection" msgstr "" -#: diff.c:5508 +#: diff.c:5528 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5510 +#: diff.c:5530 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5513 +#: diff.c:5533 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5515 +#: diff.c:5535 msgid "Diff algorithm options" msgstr "" -#: diff.c:5517 +#: diff.c:5537 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5520 +#: diff.c:5540 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5523 +#: diff.c:5543 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5526 +#: diff.c:5546 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5529 +#: diff.c:5549 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5532 +#: diff.c:5552 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5538 +#: diff.c:5558 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5541 +#: diff.c:5561 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5545 +#: diff.c:5565 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5547 +#: diff.c:5567 msgid "" msgstr "" -#: diff.c:5548 +#: diff.c:5568 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5550 +#: diff.c:5570 msgid "" msgstr "" -#: diff.c:5551 +#: diff.c:5571 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5553 diff.c:5562 diff.c:5565 +#: diff.c:5573 diff.c:5582 diff.c:5585 msgid "" msgstr "" -#: diff.c:5554 +#: diff.c:5574 msgid "show word diff, using to delimit changed words" msgstr "" -#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 msgid "" msgstr "" -#: diff.c:5557 +#: diff.c:5577 msgid "use to decide what a word is" msgstr "" -#: diff.c:5560 +#: diff.c:5580 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "" -#: diff.c:5563 +#: diff.c:5583 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5566 +#: diff.c:5586 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5569 +#: diff.c:5589 msgid "Other diff options" msgstr "" -#: diff.c:5571 +#: diff.c:5591 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5575 +#: diff.c:5595 msgid "treat all files as text" msgstr "" -#: diff.c:5577 +#: diff.c:5597 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5579 +#: diff.c:5599 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5581 +#: diff.c:5601 msgid "disable all output of the program" msgstr "" -#: diff.c:5583 +#: diff.c:5603 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5585 +#: diff.c:5605 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5587 +#: diff.c:5607 msgid "" msgstr "" -#: diff.c:5588 +#: diff.c:5608 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5591 +#: diff.c:5611 msgid "" msgstr "" -#: diff.c:5592 +#: diff.c:5612 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5596 +#: diff.c:5616 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5599 +#: diff.c:5619 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5601 +#: diff.c:5621 msgid "" msgstr "" -#: diff.c:5602 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5605 +#: diff.c:5625 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5608 +#: diff.c:5628 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5611 +#: diff.c:5631 msgid "treat in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5614 +#: diff.c:5634 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5621 +#: diff.c:5641 msgid "" msgstr "" -#: diff.c:5622 +#: diff.c:5642 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5624 +#: diff.c:5644 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5625 +#: diff.c:5645 msgid "select files by diff type" msgstr "" -#: diff.c:5627 +#: diff.c:5647 msgid "" msgstr "" -#: diff.c:5628 +#: diff.c:5648 msgid "Output to a specific file" msgstr "" -#: diff.c:6285 +#: diff.c:5493 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6288 +#: diff.c:6309 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6291 +#: diff.c:6312 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:578 +#: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:718 dir.c:747 dir.c:760 +#: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "" -#: dir.c:777 dir.c:791 +#: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "" -#: dir.c:809 +#: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:819 +#: dir.c:830 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1198 +#: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2305 +#: dir.c:2464 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2605 +#: dir.c:2766 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2729 +#: dir.c:2890 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3534 +#: dir.c:3837 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3579 dir.c:3584 +#: dir.c:3884 dir.c:3889 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3613 +#: dir.c:3918 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:74 +#: editor.c:77 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -3282,17 +3286,17 @@ msgid "Filtering content" msgstr "" -#: entry.c:478 +#: entry.c:498 #, c-format msgid "could not stat file '%s'" msgstr "" -#: environment.c:152 +#: environment.c:143 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:335 +#: environment.c:334 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -3302,337 +3306,338 @@ msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:177 +#: fetch-pack.c:193 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:180 +#: fetch-pack.c:196 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:191 +#: fetch-pack.c:207 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:211 +#: fetch-pack.c:227 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:222 +#: fetch-pack.c:238 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:283 +#: fetch-pack.c:299 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:378 fetch-pack.c:1457 +#: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:384 fetch-pack.c:1463 +#: fetch-pack.c:400 fetch-pack.c:1440 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:386 fetch-pack.c:1465 +#: fetch-pack.c:402 fetch-pack.c:1442 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:389 fetch-pack.c:1468 +#: fetch-pack.c:405 fetch-pack.c:1445 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:391 fetch-pack.c:1470 +#: fetch-pack.c:407 fetch-pack.c:1447 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:394 fetch-pack.c:1474 +#: fetch-pack.c:410 fetch-pack.c:1451 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:450 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:451 +#: fetch-pack.c:467 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:482 +#: fetch-pack.c:498 msgid "giving up" msgstr "" -#: fetch-pack.c:495 progress.c:339 +#: fetch-pack.c:511 progress.c:339 msgid "done" msgstr "završeno" -#: fetch-pack.c:507 +#: fetch-pack.c:523 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:543 +#: fetch-pack.c:559 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:758 +#: fetch-pack.c:774 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:844 +#: fetch-pack.c:860 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:852 +#: fetch-pack.c:868 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:946 +#: fetch-pack.c:962 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:985 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:971 +#: fetch-pack.c:987 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:1031 +#: fetch-pack.c:1030 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 -#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 -#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 -#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:1041 +#: fetch-pack.c:1040 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1101 +#: fetch-pack.c:1100 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1106 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1110 +#: fetch-pack.c:1109 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1125 +#: fetch-pack.c:1124 msgid "no common commits" msgstr "" -#: fetch-pack.c:1138 fetch-pack.c:1682 +#: fetch-pack.c:1139 fetch-pack.c:1671 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1289 +#: fetch-pack.c:1290 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1296 +#: fetch-pack.c:1297 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1335 +#: fetch-pack.c:1340 fetch-pack.c:2053 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1353 +#: fetch-pack.c:1358 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1359 +#: fetch-pack.c:1364 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1420 +#: fetch-pack.c:1398 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1425 +#: fetch-pack.c:1403 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1435 +#: fetch-pack.c:1413 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1437 +#: fetch-pack.c:1415 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1479 +#: fetch-pack.c:1456 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1526 +#: fetch-pack.c:1505 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1531 +#: fetch-pack.c:1510 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1536 +#: fetch-pack.c:1515 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1960 +#: fetch-pack.c:1949 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1983 builtin/clone.c:693 +#: fetch-pack.c:1972 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:2010 +#: fetch-pack.c:2098 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:2013 +#: fetch-pack.c:2101 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:273 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 +#: gpg-interface.c:918 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:276 +#: gpg-interface.c:332 gpg-interface.c:454 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: gpg-interface.c:470 +#: gpg-interface.c:874 msgid "gpg failed to sign the data" msgstr "" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:543 +#: grep.c:533 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:1906 +#: grep.c:1928 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 -#: builtin/rm.c:135 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1934 +#: grep.c:1956 #, c-format msgid "'%s': short read" msgstr "" -#: help.c:23 +#: help.c:24 msgid "start a working area (see also: git help tutorial)" msgstr "" -#: help.c:24 +#: help.c:25 msgid "work on the current change (see also: git help everyday)" msgstr "" -#: help.c:25 +#: help.c:26 msgid "examine the history and state (see also: git help revisions)" msgstr "" -#: help.c:26 +#: help.c:27 msgid "grow, mark and tweak your common history" msgstr "" -#: help.c:27 +#: help.c:28 msgid "collaborate (see also: git help workflows)" msgstr "" -#: help.c:31 +#: help.c:32 msgid "Main Porcelain Commands" msgstr "" -#: help.c:32 +#: help.c:33 msgid "Ancillary Commands / Manipulators" msgstr "" -#: help.c:33 +#: help.c:34 msgid "Ancillary Commands / Interrogators" msgstr "" -#: help.c:34 +#: help.c:35 msgid "Interacting with Others" msgstr "" -#: help.c:35 +#: help.c:36 msgid "Low-level Commands / Manipulators" msgstr "" -#: help.c:36 +#: help.c:37 msgid "Low-level Commands / Interrogators" msgstr "" -#: help.c:37 +#: help.c:38 msgid "Low-level Commands / Syncing Repositories" msgstr "" -#: help.c:38 +#: help.c:39 msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:300 +#: help.c:313 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:307 +#: help.c:320 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:316 +#: help.c:329 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:365 git.c:100 +#: help.c:378 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "" @@ -3641,50 +3646,50 @@ msgid "The common Git guides are:" msgstr "" -#: help.c:429 +#: help.c:442 msgid "See 'git help ' to read about a specific subcommand" msgstr "" -#: help.c:434 +#: help.c:447 msgid "External commands" msgstr "" -#: help.c:449 +#: help.c:462 msgid "Command aliases" msgstr "" -#: help.c:527 +#: help.c:543 #, 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:591 +#: help.c:613 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:613 +#: help.c:635 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:618 +#: help.c:640 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:623 +#: help.c:654 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:543 help.c:631 +#: help.c:565 help.c:662 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:635 +#: help.c:666 msgid "" "\n" "The most similar command is" @@ -3694,16 +3699,16 @@ msgstr[0] "" msgstr[1] "" -#: help.c:675 +#: help.c:706 msgid "git version []" msgstr "" -#: help.c:730 +#: help.c:761 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:734 +#: help.c:765 msgid "" "\n" "Did you mean this?" @@ -3756,7 +3761,7 @@ msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:454 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:648 #, c-format msgid "invalid date format: %s" msgstr "" @@ -3771,44 +3776,44 @@ msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:375 +#: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "" -#: list-objects-filter.c:492 +#: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "" -#: list-objects-filter.c:495 +#: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "" -#: list-objects-filter-options.c:81 +#: list-objects-filter-options.c:83 msgid "expected 'tree:'" msgstr "" -#: list-objects-filter-options.c:96 +#: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:109 +#: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects-filter-options.c:125 +#: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -#: list-objects-filter-options.c:167 +#: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:249 +#: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "" @@ -3833,110 +3838,110 @@ msgid "failed to read the cache" msgstr "" -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 -#: builtin/stash.c:265 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: builtin/stash.c:269 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:356 +#: merge-recursive.c:353 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:379 +#: merge-recursive.c:381 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:388 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:908 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:956 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:954 +#: merge-recursive.c:961 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:979 +#: merge-recursive.c:986 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:997 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:995 +#: merge-recursive.c:1002 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-ort.c:888 merge-recursive.c:1191 +#: merge-ort.c:1584 merge-recursive.c:1211 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-ort.c:897 merge-recursive.c:1198 +#: merge-ort.c:1593 merge-recursive.c:1218 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-ort.c:906 merge-recursive.c:1205 +#: merge-ort.c:1602 merge-recursive.c:1225 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1233 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1236 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1251 +#: merge-recursive.c:1273 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1277 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1256 +#: merge-recursive.c:1278 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-ort.c:955 merge-recursive.c:1259 +#: merge-ort.c:1653 merge-recursive.c:1281 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3947,108 +3952,108 @@ "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1268 +#: merge-recursive.c:1290 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-ort.c:1127 merge-recursive.c:1341 +#: merge-ort.c:1887 merge-recursive.c:1372 msgid "Failed to execute internal merge" msgstr "" -#: merge-ort.c:1132 merge-recursive.c:1346 +#: merge-ort.c:1892 merge-recursive.c:1377 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-ort.c:1139 merge-recursive.c:1378 +#: merge-ort.c:1899 merge-recursive.c:1410 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1402 +#: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1474 +#: merge-recursive.c:1506 #, 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:1479 +#: merge-recursive.c:1511 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1486 +#: merge-recursive.c:1518 #, 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:1491 +#: merge-recursive.c:1523 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1558 msgid "rename" msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1558 msgid "renamed" msgstr "" -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1587 +#: merge-recursive.c:1619 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1677 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1676 +#: merge-recursive.c:1708 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1681 +#: merge-recursive.c:1713 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1708 +#: merge-recursive.c:1740 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1745 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:1837 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2068 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4056,189 +4061,188 @@ "getting a majority of the files." msgstr "" -#: merge-ort.c:1278 merge-recursive.c:2100 +#: merge-ort.c:2038 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-ort.c:1288 merge-recursive.c:2110 +#: merge-ort.c:2048 merge-recursive.c:2142 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2202 +#: merge-recursive.c:2234 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-ort.c:1637 merge-recursive.c:2447 +#: merge-ort.c:2260 merge-recursive.c:2478 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2973 +#: merge-ort.c:3212 merge-recursive.c:3022 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2976 +#: merge-ort.c:3215 merge-recursive.c:3025 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3089 msgid "modify" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3089 msgid "modified" msgstr "" -#: merge-ort.c:2907 merge-recursive.c:3052 +#: merge-ort.c:3819 merge-recursive.c:3101 msgid "content" msgstr "" -#: merge-ort.c:2909 merge-recursive.c:3056 +#: merge-ort.c:3821 merge-recursive.c:3105 msgid "add/add" msgstr "" -#: merge-recursive.c:3079 +#: merge-recursive.c:3128 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-ort.c:2911 merge-recursive.c:3101 +#: merge-ort.c:3823 merge-recursive.c:3150 msgid "submodule" msgstr "" -#: merge-ort.c:2913 merge-recursive.c:3102 +#: merge-ort.c:3825 merge-recursive.c:3151 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3132 +#: merge-recursive.c:3181 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-ort.c:1781 merge-recursive.c:3215 +#: merge-ort.c:2400 merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-ort.c:1801 merge-recursive.c:3218 +#: merge-ort.c:2420 merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-ort.c:1788 merge-recursive.c:3222 +#: merge-ort.c:2407 merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-ort.c:1809 merge-recursive.c:3225 +#: merge-ort.c:2428 merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3339 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "" -#: merge-recursive.c:3367 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "" -#: merge-recursive.c:3374 +#: merge-recursive.c:3420 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3383 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3392 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-ort-wrappers.c:33 merge-recursive.c:3436 -#, c-format +#: merge-recursive.c:1991 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3445 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3539 +#: merge-recursive.c:3585 msgid "Merging:" msgstr "" -#: merge-recursive.c:3552 +#: merge-recursive.c:3598 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3602 +#: merge-recursive.c:3648 msgid "merge returned no commit" msgstr "" -#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" -#: merge-recursive.c:3758 +#: merge-recursive.c:3816 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 -#: builtin/stash.c:471 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: builtin/stash.c:489 msgid "Unable to write index." msgstr "" -#: midx.c:93 +#: midx.c:109 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:109 +#: midx.c:125 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:114 +#: midx.c:130 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" @@ -4248,41 +4252,41 @@ msgid "hash version %u does not match" msgstr "" -#: midx.c:123 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:147 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:136 +#: midx.c:152 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:138 +#: midx.c:154 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:140 +#: midx.c:156 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:142 +#: midx.c:158 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:158 +#: midx.c:174 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:202 +#: midx.c:221 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:252 +#: midx.c:271 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" @@ -4290,108 +4294,108 @@ msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:467 +#: midx.c:502 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:473 +#: midx.c:508 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:533 +#: midx.c:576 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:821 +#: midx.c:1201 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:855 +#: midx.c:1321 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:982 +#: midx.c:973 msgid "Writing chunks to multi-pack-index" msgstr "" -#: midx.c:965 +#: midx.c:1517 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1029 +#: midx.c:1588 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1044 +#: midx.c:1603 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "" -#: midx.c:1058 +#: midx.c:1617 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1067 +#: midx.c:1626 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1087 +#: midx.c:1646 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1094 +#: midx.c:1653 msgid "Verifying object offsets" msgstr "" -#: midx.c:1110 +#: midx.c:1669 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1116 +#: midx.c:1675 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1125 +#: midx.c:1684 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "" -#: midx.c:1150 +#: midx.c:1709 msgid "Counting referenced objects" msgstr "" -#: midx.c:1160 +#: midx.c:1719 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1351 +#: midx.c:1911 msgid "could not start pack-objects" msgstr "" -#: midx.c:1371 +#: midx.c:1931 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:538 +#: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:560 +#: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:566 +#: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -4442,66 +4446,66 @@ msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:233 +#: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:246 +#: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:266 object.c:278 +#: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:625 +#: packfile.c:626 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1934 +#: packfile.c:1923 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1938 +#: packfile.c:1927 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:38 +#: parse-options.c:58 #, c-format msgid "%s requires a value" msgstr "" -#: parse-options.c:73 +#: parse-options.c:93 #, c-format msgid "%s is incompatible with %s" msgstr "" -#: parse-options.c:78 +#: parse-options.c:98 #, c-format msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:112 parse-options.c:116 #, c-format msgid "%s takes no value" msgstr "" -#: parse-options.c:94 +#: parse-options.c:114 #, c-format msgid "%s isn't available" msgstr "" -#: parse-options.c:217 +#: parse-options.c:237 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:386 +#: parse-options.c:393 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" @@ -4511,26 +4515,26 @@ msgid "did you mean `--%s` (with two dashes ?)" msgstr "" -#: parse-options.c:862 +#: parse-options.c:891 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:864 +#: parse-options.c:893 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:866 +#: parse-options.c:895 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:890 +#: parse-options.c:919 msgid "..." msgstr "" -#: parse-options.c:909 +#: parse-options.c:933 #, c-format msgid "usage: %s" msgstr "" @@ -4538,26 +4542,26 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:915 +#: parse-options.c:948 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:918 +#: parse-options.c:992 #, c-format msgid " %s" msgstr "" -#: parse-options.c:957 +#: parse-options.c:1039 msgid "-NUM" msgstr "" -#: parse-options.c:666 parse-options.c:971 +#: parse-options.c:677 parse-options.c:1053 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options-cb.c:20 parse-options-cb.c:24 +#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "" @@ -4577,83 +4581,83 @@ msgid "malformed object name '%s'" msgstr "" -#: path.c:915 +#: path.c:922 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:130 +#: pathspec.c:150 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:148 +#: pathspec.c:168 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:151 +#: pathspec.c:171 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:194 +#: pathspec.c:214 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:259 +#: pathspec.c:279 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:266 +#: pathspec.c:286 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:306 +#: pathspec.c:326 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:327 +#: pathspec.c:347 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:332 +#: pathspec.c:352 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:370 +#: pathspec.c:390 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:429 +#: pathspec.c:449 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:442 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:521 +#: pathspec.c:541 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:531 +#: pathspec.c:551 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:598 +#: pathspec.c:618 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:643 +#: pathspec.c:663 #, c-format msgid "line is badly quoted: %s" msgstr "" @@ -4670,7 +4674,7 @@ msgid "flush packet write failed" msgstr "" -#: pkt-line.c:153 pkt-line.c:239 +#: pkt-line.c:153 msgid "protocol error: impossibly long line" msgstr "" @@ -4678,33 +4682,33 @@ msgid "packet write with format failed" msgstr "" -#: pkt-line.c:203 +#: pkt-line.c:204 pkt-line.c:252 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:210 pkt-line.c:217 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "" -#: pkt-line.c:302 +#: pkt-line.c:349 pkt-line.c:350 msgid "read error" msgstr "" -#: pkt-line.c:310 +#: pkt-line.c:360 pkt-line.c:361 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:338 +#: pkt-line.c:390 pkt-line.c:392 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:352 pkt-line.c:357 +#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:373 sideband.c:165 +#: pkt-line.c:434 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "" @@ -4718,236 +4722,236 @@ msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:984 +#: pretty.c:1051 msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:23 +#: fetch-object.c:17 msgid "Remote with no URL" msgstr "" -#: promisor-remote.c:53 +#: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" -#: range-diff.c:78 +#: range-diff.c:67 msgid "could not start `log`" msgstr "" -#: range-diff.c:80 +#: range-diff.c:69 msgid "could not read `log` output" msgstr "" -#: range-diff.c:101 sequencer.c:5318 +#: range-diff.c:97 sequencer.c:5605 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:140 +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:306 +#: range-diff.c:304 msgid "failed to generate diff" msgstr "" -#: range-diff.c:561 range-diff.c:563 +#: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:682 +#: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:698 +#: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:720 +#: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:725 +#: read-cache.c:753 builtin/submodule--helper.c:3241 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:777 +#: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:796 +#: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:807 +#: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1318 +#: read-cache.c:1373 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1532 +#: read-cache.c:1588 msgid "Refresh index" msgstr "" -#: read-cache.c:1657 +#: read-cache.c:1720 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1667 +#: read-cache.c:1730 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1786 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1726 +#: read-cache.c:1789 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1735 +#: read-cache.c:1798 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1765 +#: read-cache.c:1832 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1767 +#: read-cache.c:1834 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1804 +#: read-cache.c:1871 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1820 +#: read-cache.c:1887 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1877 +#: read-cache.c:1944 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1880 +#: read-cache.c:1947 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1883 +#: read-cache.c:1950 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 +#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 +#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 msgid "index file corrupt" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2209 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2146 +#: read-cache.c:2222 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2179 +#: read-cache.c:2255 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2183 +#: read-cache.c:2259 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2263 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2191 +#: read-cache.c:2177 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2233 +#: read-cache.c:2310 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2260 +#: read-cache.c:2337 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2292 +#: read-cache.c:2375 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2339 +#: read-cache.c:2434 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 +#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 +#: read-cache.c:3179 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3151 +#: read-cache.c:3192 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3163 +#: read-cache.c:3204 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3188 +#: read-cache.c:3233 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3337 +#: read-cache.c:3390 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -4958,7 +4962,7 @@ "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -4980,26 +4984,26 @@ "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: rebase-interactive.c:63 +#: rebase-interactive.c:66 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 +#: rebase-interactive.c:75 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 +#: rebase-interactive.c:78 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 +#: rebase-interactive.c:84 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5008,7 +5012,7 @@ "\n" msgstr "" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 +#: rebase-interactive.c:89 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5019,8 +5023,9 @@ msgid "Note that empty commits are commented out" msgstr "" -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 +#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" msgstr "" @@ -5030,14 +5035,14 @@ msgid "could not copy '%s' to '%s'." msgstr "" -#: rebase-interactive.c:193 +#: rebase-interactive.c:196 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:200 +#: rebase-interactive.c:203 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5048,17 +5053,17 @@ "\n" msgstr "" -#: refs.c:264 +#: refs.c:261 #, c-format msgid "%s does not point to a valid object!" msgstr "" -#: refs.c:674 +#: refs.c:671 #, c-format msgid "ignoring dangling symref %s" msgstr "" -#: ref-filter.c:2090 refs.c:676 +#: ref-filter.c:2250 refs.c:673 #, c-format msgid "ignoring broken ref %s" msgstr "" @@ -5083,14 +5088,14 @@ msgid "unexpected object ID when writing '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 -#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 +#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 -#: builtin/rebase.c:866 +#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -5100,62 +5105,62 @@ msgid "unexpected object ID when deleting '%s'" msgstr "" -#: refs.c:922 +#: refs.c:920 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:929 +#: refs.c:927 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:994 +#: refs.c:992 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1086 +#: refs.c:1084 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1157 +#: refs.c:1155 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2051 +#: refs.c:2062 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2131 +#: refs.c:2142 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2242 refs.c:2272 +#: refs.c:2253 refs.c:2283 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2248 refs.c:2283 +#: refs.c:2259 refs.c:2294 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1271 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1242 refs/packed-backend.c:1542 -#: refs/packed-backend.c:1552 +#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#: refs/files-backend.c:1288 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "" @@ -5165,7 +5170,7 @@ msgid "invalid refspec '%s'" msgstr "" -#: ref-filter.c:42 wt-status.c:1975 +#: ref-filter.c:42 wt-status.c:2036 msgid "gone" msgstr "" @@ -5184,212 +5189,212 @@ msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:175 +#: ref-filter.c:235 #, c-format msgid "expected format: %%(color:)" msgstr "" -#: ref-filter.c:177 +#: ref-filter.c:237 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:199 +#: ref-filter.c:259 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:203 +#: ref-filter.c:263 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:205 +#: ref-filter.c:265 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:260 +#: ref-filter.c:320 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:282 +#: ref-filter.c:344 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:290 +#: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:302 +#: ref-filter.c:364 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:301 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:336 +#: ref-filter.c:398 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:367 +#: ref-filter.c:429 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:373 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:432 +#: ref-filter.c:506 #, c-format msgid "expected format: %%(align:,)" msgstr "" -#: ref-filter.c:444 +#: ref-filter.c:518 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:451 +#: ref-filter.c:525 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:460 +#: ref-filter.c:534 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:468 +#: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:486 +#: ref-filter.c:560 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:588 +#: ref-filter.c:680 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:615 +#: ref-filter.c:707 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:619 +#: ref-filter.c:711 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:743 +#: ref-filter.c:844 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:806 +#: ref-filter.c:910 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:808 +#: ref-filter.c:912 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:810 +#: ref-filter.c:914 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:838 +#: ref-filter.c:946 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:840 +#: ref-filter.c:948 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:842 +#: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:857 +#: ref-filter.c:965 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:914 +#: ref-filter.c:1027 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1549 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1552 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1555 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1565 +#: ref-filter.c:1504 msgid "no branch" msgstr "" -#: ref-filter.c:1603 ref-filter.c:1812 +#: ref-filter.c:1754 ref-filter.c:1972 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1613 +#: ref-filter.c:1764 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1996 +#: ref-filter.c:2155 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2085 +#: ref-filter.c:2245 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2430 +#: ref-filter.c:2623 #, c-format msgid "format: %%(end) atom missing" msgstr "" @@ -5404,12 +5409,12 @@ msgid "option `%s' is incompatible with --no-merged" msgstr "" -#: ref-filter.c:2529 +#: ref-filter.c:2726 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2534 +#: ref-filter.c:2731 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -5679,7 +5684,7 @@ msgid "there were errors while writing '%s' (%s)" msgstr "" -#: rerere.c:482 +#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 #, c-format msgid "failed to flush '%s'" msgstr "" @@ -5724,8 +5729,8 @@ msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 +#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -5759,158 +5764,159 @@ msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2668 +#: revision.c:2690 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2671 +#: revision.c:2693 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2708 +#: revision.c:2477 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: revision.c:2877 +#: revision.c:2895 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:767 +#: run-command.c:766 msgid "open /dev/null failed" msgstr "" -#: run-command.c:1274 +#: run-command.c:1278 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1338 +#: hook.c:27 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:146 +#: send-pack.c:150 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:148 +#: send-pack.c:152 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:150 +#: send-pack.c:154 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:374 +#: send-pack.c:378 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:476 +#: send-pack.c:537 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:478 +#: send-pack.c:539 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:490 +#: send-pack.c:546 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:495 +#: send-pack.c:551 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:195 +#: sequencer.c:197 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:323 +#: sequencer.c:325 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 +#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:408 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:353 +#: sequencer.c:355 msgid "revert" msgstr "" -#: sequencer.c:355 +#: sequencer.c:357 msgid "cherry-pick" msgstr "" -#: sequencer.c:327 +#: sequencer.c:271 msgid "rebase -i" msgstr "" -#: sequencer.c:359 +#: sequencer.c:361 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:418 +#: sequencer.c:420 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:421 +#: sequencer.c:422 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:434 sequencer.c:3070 +#: sequencer.c:448 sequencer.c:3290 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:441 +#: sequencer.c:455 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 -#: sequencer.c:3353 +#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3574 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 -#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1139 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 +#: builtin/merge.c:1145 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:485 +#: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:489 +#: sequencer.c:503 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:521 +#: sequencer.c:535 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:560 builtin/tag.c:598 +#: sequencer.c:574 builtin/tag.c:610 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -5918,61 +5924,61 @@ #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:670 +#: sequencer.c:685 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:684 +#: sequencer.c:699 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:698 +#: sequencer.c:713 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:778 +#: sequencer.c:793 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:789 +#: sequencer.c:804 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 +#: builtin/am.c:822 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:836 +#: sequencer.c:851 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:841 +#: sequencer.c:856 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:846 +#: sequencer.c:861 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:850 +#: sequencer.c:865 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:855 +#: sequencer.c:870 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:857 +#: sequencer.c:872 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:859 +#: sequencer.c:874 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" @@ -5980,7 +5986,7 @@ msgid "malformed ident line" msgstr "" -#: sequencer.c:924 +#: sequencer.c:939 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5997,11 +6003,11 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:1211 +#: sequencer.c:1229 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1217 +#: sequencer.c:1235 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6016,7 +6022,7 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1230 +#: sequencer.c:1248 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6030,40 +6036,40 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1272 +#: sequencer.c:1290 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1274 +#: sequencer.c:1292 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1320 +#: sequencer.c:1338 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1322 +#: sequencer.c:1340 msgid "detached HEAD" msgstr "" -#: sequencer.c:1326 +#: sequencer.c:1344 msgid " (root-commit)" msgstr "" -#: sequencer.c:1347 +#: sequencer.c:1365 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1349 +#: sequencer.c:1367 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 +#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1409 sequencer.c:2108 +#: sequencer.c:1427 sequencer.c:2312 msgid "unable to parse commit author" msgstr "" @@ -6071,137 +6077,137 @@ msgid "corrupted author without date information" msgstr "" -#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 +#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1453 sequencer.c:1573 +#: sequencer.c:1471 sequencer.c:1591 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 -#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 +#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1605 +#: sequencer.c:1623 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1610 +#: sequencer.c:1628 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1693 sequencer.c:1804 +#: sequencer.c:1711 sequencer.c:1992 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1751 sequencer.c:1776 +#: sequencer.c:1757 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1761 +#: sequencer.c:1951 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1763 sequencer.c:3380 +#: sequencer.c:1953 sequencer.c:3601 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1765 +#: sequencer.c:1955 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1771 +#: sequencer.c:1904 sequencer.c:1961 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1753 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1786 +#: sequencer.c:1979 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1793 +#: sequencer.c:1754 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1799 +#: sequencer.c:1756 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1887 +#: sequencer.c:2089 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1894 +#: sequencer.c:2096 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1913 +#: sequencer.c:2115 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1921 sequencer.c:1929 +#: sequencer.c:2123 sequencer.c:2131 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1935 +#: sequencer.c:2137 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1954 +#: sequencer.c:2156 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:2019 +#: sequencer.c:2222 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:2079 +#: sequencer.c:2282 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:2080 +#: sequencer.c:2283 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2158 +#: sequencer.c:2362 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2165 +#: sequencer.c:2370 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2242 +#: sequencer.c:2450 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2251 +#: sequencer.c:2459 #, c-format msgid "missing arguments for %s" msgstr "" @@ -6211,170 +6217,169 @@ msgid "could not parse '%.*s'" msgstr "" -#: sequencer.c:2343 +#: sequencer.c:2563 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2354 +#: sequencer.c:2574 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 -#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 -#: builtin/rebase.c:266 +#: sequencer.c:2622 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2440 +#: sequencer.c:2660 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2449 +#: sequencer.c:2669 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2493 +#: sequencer.c:2709 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2495 +#: sequencer.c:2711 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2500 +#: sequencer.c:2716 msgid "no commits parsed." msgstr "" -#: sequencer.c:2511 +#: sequencer.c:2727 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2513 +#: sequencer.c:2729 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2591 +#: sequencer.c:2807 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2698 +#: sequencer.c:2916 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2718 +#: sequencer.c:2936 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2811 sequencer.c:4644 +#: sequencer.c:3031 sequencer.c:4905 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2828 +#: sequencer.c:3048 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2830 +#: sequencer.c:3050 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2833 +#: sequencer.c:3053 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2835 +#: sequencer.c:3055 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2849 +#: sequencer.c:3069 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2864 +#: sequencer.c:3084 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2924 sequencer.c:4379 +#: sequencer.c:3144 sequencer.c:4615 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2926 sequencer.c:2937 +#: sequencer.c:3146 sequencer.c:3157 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2928 sequencer.c:2972 +#: sequencer.c:3148 sequencer.c:3192 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2958 builtin/grep.c:757 +#: sequencer.c:3178 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2960 +#: sequencer.c:3180 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2961 +#: sequencer.c:3181 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2967 +#: sequencer.c:3187 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2978 +#: sequencer.c:3198 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:3019 +#: sequencer.c:3239 msgid "no revert in progress" msgstr "" -#: sequencer.c:3028 +#: sequencer.c:3248 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:3038 +#: sequencer.c:3258 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:3045 +#: sequencer.c:3265 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3048 +#: sequencer.c:3268 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 +#: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:3210 sequencer.c:4271 +#: sequencer.c:3430 sequencer.c:4506 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3227 +#: sequencer.c:3447 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3235 +#: sequencer.c:3455 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6386,22 +6391,22 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:3245 +#: sequencer.c:3465 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3252 +#: sequencer.c:3472 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 +#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3297 +#: sequencer.c:3517 #, c-format msgid "" "execution failed: %s\n" @@ -6411,11 +6416,11 @@ "\n" msgstr "" -#: sequencer.c:3303 +#: sequencer.c:3523 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3309 +#: sequencer.c:3529 #, c-format msgid "" "execution succeeded: %s\n" @@ -6426,67 +6431,67 @@ "\n" msgstr "" -#: sequencer.c:3370 +#: sequencer.c:3591 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3424 +#: sequencer.c:3664 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3429 +#: sequencer.c:3669 msgid "writing squash-onto" msgstr "" -#: reset.c:70 reset.c:76 sequencer.c:3468 +#: reset.c:70 reset.c:76 sequencer.c:3705 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:3513 +#: sequencer.c:3748 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3546 +#: sequencer.c:3780 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3568 +#: sequencer.c:3802 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3577 +#: sequencer.c:3811 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3589 +#: sequencer.c:3823 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3605 +#: sequencer.c:3878 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3788 +#: sequencer.c:4024 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3804 +#: sequencer.c:4040 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3919 +#: sequencer.c:4162 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3931 +#: sequencer.c:4174 #, c-format msgid "cannot store %s" msgstr "" @@ -6508,21 +6513,21 @@ msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4255 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:4048 +#: sequencer.c:4270 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:4050 +#: sequencer.c:4272 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4058 +#: sequencer.c:4304 #, c-format msgid "" "Could not execute the todo command\n" @@ -6535,86 +6540,86 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:4149 +#: sequencer.c:4396 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4220 +#: sequencer.c:4466 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4279 +#: sequencer.c:4514 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4284 +#: sequencer.c:4519 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4298 +#: sequencer.c:4533 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4391 +#: sequencer.c:4645 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4400 +#: sequencer.c:4654 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4402 +#: sequencer.c:4656 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4404 +#: sequencer.c:4658 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4407 +#: sequencer.c:4661 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4443 sequencer.c:4482 +#: sequencer.c:4697 sequencer.c:4736 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4498 +#: sequencer.c:4752 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4505 +#: sequencer.c:4762 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4621 +#: sequencer.c:4882 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4625 +#: sequencer.c:4886 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4660 +#: sequencer.c:4921 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:5137 +#: sequencer.c:5408 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5140 +#: sequencer.c:5411 msgid "make_script: error preparing revisions" msgstr "" @@ -6625,19 +6630,19 @@ "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:5382 sequencer.c:5399 +#: sequencer.c:5669 sequencer.c:5686 msgid "nothing to do" msgstr "" -#: sequencer.c:5418 +#: sequencer.c:5705 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5512 +#: sequencer.c:5805 msgid "the script was already rearranged." msgstr "" -#: setup.c:124 +#: setup.c:122 #, c-format msgid "'%s' is outside repository" msgstr "" @@ -6674,379 +6679,379 @@ msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:423 +#: setup.c:423 builtin/rev-parse.c:895 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:661 +#: setup.c:658 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:669 +#: setup.c:514 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:700 +#: setup.c:701 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:702 +#: setup.c:703 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:704 +#: setup.c:705 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:706 +#: setup.c:707 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:708 +#: setup.c:709 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:710 +#: setup.c:711 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:812 +#: setup.c:813 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:826 +#: setup.c:827 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:855 setup.c:857 setup.c:888 +#: setup.c:856 setup.c:858 setup.c:889 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 msgid "cannot come back to cwd" msgstr "" -#: setup.c:987 +#: setup.c:988 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1225 +#: setup.c:1231 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1234 setup.c:1240 +#: setup.c:1240 setup.c:1246 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1245 +#: setup.c:1251 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1251 +#: setup.c:1257 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1362 +#: setup.c:1381 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1409 +#: setup.c:1430 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1424 +#: setup.c:1443 msgid "fork failed" msgstr "" -#: setup.c:1429 +#: setup.c:1448 msgid "setsid failed" msgstr "" -#: object-file.c:480 +#: object-file.c:459 #, c-format msgid "" "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: object-file.c:531 +#: object-file.c:517 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: object-file.c:603 +#: object-file.c:591 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: object-file.c:610 +#: object-file.c:598 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: object-file.c:653 +#: object-file.c:641 msgid "unable to fdopen alternates lockfile" msgstr "" -#: object-file.c:671 +#: object-file.c:659 msgid "unable to read alternates file" msgstr "" -#: object-file.c:678 +#: object-file.c:666 msgid "unable to move new alternates file into place" msgstr "" -#: object-file.c:713 +#: object-file.c:701 #, c-format msgid "path '%s' does not exist" msgstr "" -#: object-file.c:734 +#: object-file.c:722 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: object-file.c:740 +#: object-file.c:728 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: object-file.c:746 +#: object-file.c:734 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: object-file.c:754 +#: object-file.c:742 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: object-file.c:814 +#: object-file.c:823 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: object-file.c:964 +#: object-file.c:973 #, c-format msgid "attempting to mmap % over limit %" msgstr "" -#: object-file.c:985 +#: sha1-file.c:964 msgid "mmap failed" msgstr "" -#: object-file.c:1149 +#: object-file.c:1174 #, c-format msgid "object file %s is empty" msgstr "" -#: object-file.c:1284 object-file.c:2477 +#: object-file.c:1293 object-file.c:2499 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: object-file.c:1286 object-file.c:2481 +#: object-file.c:1295 object-file.c:2503 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: object-file.c:1328 +#: object-file.c:1419 msgid "invalid object type" msgstr "" -#: object-file.c:1412 +#: object-file.c:1481 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1415 +#: object-file.c:1430 #, c-format msgid "unable to unpack %s header" msgstr "" -#: object-file.c:1421 +#: object-file.c:1490 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: object-file.c:1424 +#: object-file.c:1417 #, c-format msgid "unable to parse %s header" msgstr "" -#: object-file.c:1651 +#: object-file.c:1664 #, c-format msgid "failed to read object %s" msgstr "" -#: object-file.c:1655 +#: object-file.c:1668 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: object-file.c:1659 +#: object-file.c:1672 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1663 +#: object-file.c:1676 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: object-file.c:1768 +#: object-file.c:1781 #, c-format msgid "unable to write file %s" msgstr "" -#: object-file.c:1775 +#: object-file.c:1788 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: object-file.c:1782 +#: object-file.c:1795 msgid "file write error" msgstr "" -#: object-file.c:1802 +#: object-file.c:1815 msgid "error when closing loose object file" msgstr "" -#: object-file.c:1867 +#: object-file.c:1882 #, c-format msgid "" "insufficient permission for adding an object to repository database %s" msgstr "" -#: object-file.c:1869 +#: object-file.c:1884 msgid "unable to create temporary file" msgstr "" -#: object-file.c:1893 +#: object-file.c:1908 msgid "unable to write loose object file" msgstr "" -#: object-file.c:1899 +#: object-file.c:1914 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: object-file.c:1903 +#: object-file.c:1918 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: object-file.c:1907 +#: object-file.c:1922 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: object-file.c:1917 builtin/pack-objects.c:1097 +#: object-file.c:1933 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "" -#: object-file.c:1994 +#: object-file.c:2011 #, c-format msgid "cannot read object for %s" msgstr "" -#: object-file.c:2045 +#: object-file.c:2062 msgid "corrupt commit" msgstr "" -#: object-file.c:2053 +#: object-file.c:2070 msgid "corrupt tag" msgstr "" -#: object-file.c:2153 +#: object-file.c:2170 #, c-format msgid "read error while indexing %s" msgstr "" -#: object-file.c:2156 +#: object-file.c:2173 #, c-format msgid "short read while indexing %s" msgstr "" -#: object-file.c:2229 object-file.c:2239 +#: object-file.c:2246 object-file.c:2256 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: object-file.c:2245 +#: object-file.c:2262 #, c-format msgid "%s: unsupported file type" msgstr "" -#: object-file.c:2269 +#: object-file.c:2286 builtin/fetch.c:1445 #, c-format msgid "%s is not a valid object" msgstr "" -#: object-file.c:2271 +#: object-file.c:2288 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: object-file.c:2298 builtin/index-pack.c:192 +#: object-file.c:2315 #, c-format msgid "unable to open %s" msgstr "" -#: object-file.c:2488 object-file.c:2541 +#: object-file.c:2510 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: object-file.c:2512 +#: object-file.c:2533 #, c-format msgid "unable to mmap %s" msgstr "" -#: object-file.c:2517 +#: object-file.c:2539 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: object-file.c:2523 +#: object-file.c:2544 #, c-format msgid "unable to parse header of %s" msgstr "" -#: object-file.c:2534 +#: object-file.c:2555 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:486 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: object-name.c:497 +#: object-name.c:491 msgid "The candidates are:" msgstr "" -#: object-name.c:796 +#: object-name.c:790 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" @@ -7060,43 +7065,43 @@ msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:848 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:850 +#: strbuf.c:852 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:858 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:860 +#: strbuf.c:862 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:867 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:869 +#: strbuf.c:871 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:875 +#: strbuf.c:877 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7104,14 +7109,14 @@ msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:877 +#: strbuf.c:879 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1175 +#: strbuf.c:1183 #, c-format msgid "could not edit '%s'" msgstr "" @@ -7134,22 +7139,22 @@ msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:327 +#: submodule.c:358 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:358 +#: submodule.c:389 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:920 +#: submodule.c:954 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 +#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 msgid "Failed to resolve HEAD as a valid ref." msgstr "" @@ -7158,58 +7163,58 @@ msgid "Could not access submodule '%s'" msgstr "" -#: submodule.c:1677 +#: submodule.c:1705 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1810 +#: submodule.c:1838 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1823 +#: submodule.c:1851 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1838 +#: submodule.c:1868 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1928 +#: submodule.c:1959 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1980 +#: submodule.c:2013 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2048 +#: submodule.c:2081 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2069 +#: submodule.c:2102 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2081 submodule.c:2140 +#: submodule.c:2114 submodule.c:2174 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2085 +#: submodule.c:2118 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2092 +#: submodule.c:2124 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7217,16 +7222,16 @@ "'%s'\n" msgstr "" -#: submodule.c:1865 submodule.c:2175 +#: submodule.c:1895 submodule.c:2210 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:2220 +#: submodule.c:2255 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2260 +#: submodule.c:2295 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -7250,61 +7255,62 @@ msgid "invalid value for %s" msgstr "" -#: submodule-config.c:766 +#: submodule-config.c:767 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: trailer.c:236 +#: trailer.c:244 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 -#: trailer.c:555 +#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 +#: trailer.c:570 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 +#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:299 +#: builtin/remote.c:327 #, c-format msgid "more than one %s" msgstr "" -#: trailer.c:728 +#: trailer.c:743 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:748 +#: trailer.c:763 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:751 builtin/mktag.c:91 +#: trailer.c:766 builtin/mktag.c:89 imap-send.c:1573 msgid "could not read from stdin" msgstr "" -#: trailer.c:1009 wrapper.c:676 +#: trailer.c:1024 wrapper.c:684 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:1011 +#: trailer.c:1026 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:1013 +#: trailer.c:1028 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:1025 +#: trailer.c:1040 msgid "could not open temporary file" msgstr "" -#: trailer.c:1065 +#: trailer.c:1080 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -7319,49 +7325,49 @@ msgid "could not read bundle '%s'" msgstr "" -#: transport.c:220 +#: transport.c:227 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:269 +#: transport.c:279 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:270 +#: transport.c:280 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:727 +#: transport.c:759 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:802 +#: transport.c:834 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:936 +#: transport.c:967 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:1002 +#: transport.c:1033 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:1055 +#: transport.c:1082 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1157 +#: transport.c:1185 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1161 +#: transport.c:1189 #, c-format msgid "" "\n" @@ -7377,15 +7383,15 @@ "\n" msgstr "" -#: transport.c:1169 +#: transport.c:1197 msgid "Aborting." msgstr "" -#: transport.c:1316 +#: transport.c:1344 msgid "failed to push all needed submodules" msgstr "" -#: transport-helper.c:661 transport.c:1447 +#: transport-helper.c:661 transport.c:1475 msgid "operation not supported by protocol" msgstr "" @@ -7431,7 +7437,7 @@ msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1237 +#: transport-helper.c:549 transport-helper.c:1251 #, c-format msgid "could not read ref %s" msgstr "" @@ -7454,55 +7460,55 @@ msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:788 +#: transport-helper.c:798 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:845 +#: transport-helper.c:859 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:928 +#: transport-helper.c:942 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:931 +#: transport-helper.c:945 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:934 +#: transport-helper.c:948 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:939 +#: transport-helper.c:953 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:1050 +#: transport-helper.c:1064 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1055 +#: transport-helper.c:1069 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1102 +#: transport-helper.c:1116 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1107 +#: transport-helper.c:1121 msgid "error while running fast-export" msgstr "" @@ -7513,47 +7519,47 @@ "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1223 +#: transport-helper.c:1237 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1375 +#: transport-helper.c:1389 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1402 +#: transport-helper.c:1416 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1451 +#: transport-helper.c:1465 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1455 +#: transport-helper.c:1469 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1474 transport-helper.c:1478 +#: transport-helper.c:1488 transport-helper.c:1492 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1515 +#: transport-helper.c:1529 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1519 +#: transport-helper.c:1533 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1537 transport-helper.c:1546 +#: transport-helper.c:1551 transport-helper.c:1560 msgid "can't start thread for copying data" msgstr "" @@ -7578,98 +7584,98 @@ msgid "too-short tree file" msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:127 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:130 +#: unpack-trees.c:132 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:148 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7677,7 +7683,7 @@ "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7685,47 +7691,47 @@ "%%s" msgstr "" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:164 +#: unpack-trees.c:166 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:174 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:168 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:170 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7733,7 +7739,7 @@ "%s" msgstr "" -#: unpack-trees.c:176 +#: unpack-trees.c:172 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7741,30 +7747,30 @@ "%s" msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:177 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:262 +#: unpack-trees.c:264 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:350 +#: unpack-trees.c:352 msgid "Updating files" msgstr "" -#: unpack-trees.c:382 +#: unpack-trees.c:384 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1498 +#: unpack-trees.c:1620 msgid "Updating index flags" msgstr "" @@ -7797,47 +7803,47 @@ msgid "invalid '..' path segment" msgstr "" -#: worktree.c:238 builtin/am.c:2103 +#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:303 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:314 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:326 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:332 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:197 wrapper.c:367 +#: wrapper.c:205 wrapper.c:375 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:398 wrapper.c:599 +#: wrapper.c:406 wrapper.c:607 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:607 +#: wrapper.c:615 msgid "unable to get current working directory" msgstr "" @@ -7870,11 +7876,11 @@ msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1125 msgid "Changes to be committed:" msgstr "Promjene koje će biti učinjene:" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1134 msgid "Changes not staged for commit:" msgstr "" @@ -7972,28 +7978,28 @@ msgid "untracked content, " msgstr "" -#: wt-status.c:905 +#: wt-status.c:958 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:936 +#: wt-status.c:989 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:938 +#: wt-status.c:991 msgid "Submodule changes to be committed:" msgstr "Promjene podmodula koje će biti učinjene:" -#: wt-status.c:1020 +#: wt-status.c:1073 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1112 +#: wt-status.c:1165 #, c-format msgid "" "\n" @@ -8001,245 +8007,245 @@ "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1142 +#: wt-status.c:1195 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1145 +#: wt-status.c:1198 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1200 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1151 +#: wt-status.c:1204 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1154 +#: wt-status.c:1207 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1163 +#: wt-status.c:1216 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1166 +#: wt-status.c:1219 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1170 +#: wt-status.c:1223 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1225 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1227 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1307 +#: wt-status.c:1360 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1362 msgid "No commands done." msgstr "" -#: wt-status.c:1312 +#: wt-status.c:1365 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1323 +#: wt-status.c:1376 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1381 msgid "No commands remaining." msgstr "" -#: wt-status.c:1331 +#: wt-status.c:1384 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1339 +#: wt-status.c:1392 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1351 +#: wt-status.c:1404 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1356 +#: wt-status.c:1409 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1422 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1424 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1426 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1380 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1437 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1389 +#: wt-status.c:1442 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1392 +#: wt-status.c:1445 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1449 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1401 +#: wt-status.c:1454 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1404 +#: wt-status.c:1457 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1459 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1417 +#: wt-status.c:1470 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1420 +#: wt-status.c:1473 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1427 +#: wt-status.c:1480 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1430 +#: wt-status.c:1483 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1433 +#: wt-status.c:1486 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1488 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1490 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1500 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1450 +#: wt-status.c:1503 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1509 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1512 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1515 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1517 msgid " (use \"git revert --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1466 +#: wt-status.c:1519 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1476 +#: wt-status.c:1529 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1480 +#: wt-status.c:1533 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1483 +#: wt-status.c:1536 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1733 +#: wt-status.c:1794 msgid "On branch " msgstr "" -#: wt-status.c:1740 +#: wt-status.c:1801 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1742 +#: wt-status.c:1803 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1752 +#: wt-status.c:1813 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1769 +#: wt-status.c:1830 msgid "Initial commit" msgstr "" -#: wt-status.c:1770 +#: wt-status.c:1831 msgid "No commits yet" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1845 msgid "Untracked files" msgstr "" -#: wt-status.c:1786 +#: wt-status.c:1847 msgid "Ignored files" msgstr "" -#: wt-status.c:1790 +#: wt-status.c:1851 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8247,98 +8253,98 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1796 +#: wt-status.c:1857 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1798 +#: wt-status.c:1859 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1804 +#: wt-status.c:1865 msgid "No changes" msgstr "" -#: wt-status.c:1809 +#: wt-status.c:1870 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1813 +#: wt-status.c:1874 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1817 +#: wt-status.c:1878 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1821 +#: wt-status.c:1882 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1825 +#: wt-status.c:1886 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1829 wt-status.c:1835 +#: wt-status.c:1890 wt-status.c:1896 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1832 +#: wt-status.c:1893 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1837 +#: wt-status.c:1898 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1942 +#: wt-status.c:2003 msgid "No commits yet on " msgstr "" -#: wt-status.c:1946 +#: wt-status.c:2007 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1977 +#: wt-status.c:2038 msgid "different" msgstr "" -#: wt-status.c:1979 wt-status.c:1987 +#: wt-status.c:2040 wt-status.c:2048 msgid "behind " msgstr "" -#: wt-status.c:1982 wt-status.c:1985 +#: wt-status.c:2043 wt-status.c:2046 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2507 +#: wt-status.c:2569 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2513 +#: wt-status.c:2575 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2515 +#: wt-status.c:2577 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#: compat/precompose_utf8.c:58 builtin/clone.c:347 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -8347,122 +8353,122 @@ msgid "git add [] [--] ..." msgstr "" -#: builtin/add.c:96 +#: builtin/add.c:106 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:101 builtin/commit.c:285 +#: builtin/add.c:111 builtin/commit.c:298 msgid "updating files failed" msgstr "" -#: builtin/add.c:111 +#: builtin/add.c:121 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:186 +#: builtin/add.c:205 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:280 builtin/rev-parse.c:991 +#: builtin/add.c:317 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "" -#: builtin/add.c:291 +#: builtin/add.c:318 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:330 msgid "Could not write patch" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:333 msgid "editing patch failed" msgstr "" -#: builtin/add.c:301 +#: builtin/add.c:336 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:338 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:308 +#: builtin/add.c:343 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:316 +#: builtin/add.c:351 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 -#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 +#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 +#: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "" -#: builtin/add.c:339 +#: builtin/add.c:374 msgid "interactive picking" msgstr "" -#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 +#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:341 +#: builtin/add.c:376 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:342 +#: builtin/add.c:377 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:343 +#: builtin/add.c:378 msgid "update tracked files" msgstr "" -#: builtin/add.c:344 +#: builtin/add.c:379 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:345 +#: builtin/add.c:380 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:346 +#: builtin/add.c:381 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:384 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:386 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:352 +#: builtin/add.c:387 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:388 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:355 builtin/update-index.c:1004 +#: builtin/add.c:391 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:357 +#: builtin/add.c:393 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:377 +#: builtin/add.c:413 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8480,184 +8486,184 @@ "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:405 +#: builtin/add.c:442 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:393 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:433 +#: builtin/add.c:477 msgid "adding files failed" msgstr "" -#: builtin/add.c:461 builtin/commit.c:345 +#: builtin/add.c:515 builtin/commit.c:358 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "" -#: builtin/add.c:478 +#: builtin/add.c:532 msgid "--pathspec-from-file is incompatible with --edit" msgstr "" -#: builtin/add.c:490 +#: builtin/add.c:544 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:493 +#: builtin/add.c:547 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:497 +#: builtin/add.c:551 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 +#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 +#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "" -#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 +#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 +#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" -#: builtin/add.c:526 +#: builtin/add.c:583 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:483 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/am.c:352 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "" -#: builtin/am.c:436 +#: builtin/am.c:456 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:478 +#: builtin/am.c:498 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:516 +#: builtin/am.c:536 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:542 +#: builtin/am.c:562 msgid "fseek failed" msgstr "" -#: builtin/am.c:730 +#: builtin/am.c:750 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:795 +#: builtin/am.c:815 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:843 +#: builtin/am.c:863 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:868 builtin/am.c:880 msgid "invalid Date line" msgstr "" -#: builtin/am.c:855 +#: builtin/am.c:875 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:948 +#: builtin/am.c:968 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:953 builtin/clone.c:410 +#: builtin/am.c:973 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:958 +#: builtin/am.c:978 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1089 +#: builtin/am.c:1127 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1090 +#: builtin/am.c:1128 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1091 +#: builtin/am.c:1129 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1174 +#: builtin/am.c:1224 msgid "" "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1202 +#: builtin/am.c:1252 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1267 +#: builtin/am.c:1317 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1270 +#: builtin/am.c:1320 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1489 +#: builtin/am.c:1539 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1491 +#: builtin/am.c:1541 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1510 +#: builtin/am.c:1560 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1516 +#: builtin/am.c:1566 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1542 +#: builtin/am.c:1592 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1574 +#: builtin/am.c:1624 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1626 builtin/am.c:1630 +#: builtin/am.c:1676 builtin/am.c:1680 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1648 +#: builtin/am.c:1698 msgid "Commit Body is:" msgstr "" @@ -8665,46 +8671,46 @@ #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1658 +#: builtin/am.c:1708 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1704 builtin/commit.c:395 +#: builtin/am.c:1754 builtin/commit.c:409 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1708 +#: builtin/am.c:1758 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1748 builtin/am.c:1816 +#: builtin/am.c:1798 builtin/am.c:1865 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1765 +#: builtin/am.c:1815 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1771 +#: builtin/am.c:1821 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1766 +#: builtin/am.c:1838 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1819 +#: builtin/am.c:1868 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1826 +#: builtin/am.c:1875 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8712,187 +8718,187 @@ "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 -#: builtin/reset.c:355 +#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 +#: builtin/reset.c:361 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1985 +#: builtin/am.c:2035 builtin/am.c:2111 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2029 +#: builtin/am.c:2079 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2136 +#: builtin/am.c:2187 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2264 msgid "git am [] [( | )...]" msgstr "" -#: builtin/am.c:2214 +#: builtin/am.c:2265 msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2220 +#: builtin/am.c:2271 msgid "run interactively" msgstr "" -#: builtin/am.c:2222 +#: builtin/am.c:2273 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2275 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:334 builtin/stash.c:882 +#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:640 builtin/stash.c:961 msgid "be quiet" msgstr "" -#: builtin/am.c:2167 +#: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2281 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2283 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2234 +#: builtin/am.c:2285 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2236 +#: builtin/am.c:2287 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2289 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2292 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2244 +#: builtin/am.c:2295 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2273 +#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 +#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 +#: builtin/am.c:2327 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 -#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 -#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 -#: parse-options.h:316 +#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 +#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 +#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 +#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 +#: parse-options.h:315 msgid "n" msgstr "" -#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2324 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2276 +#: builtin/am.c:2330 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2332 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2335 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2338 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2287 +#: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2290 +#: builtin/am.c:2287 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2290 msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2299 +#: builtin/am.c:2353 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2355 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 -#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 +#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 +#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "" -#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 +#: builtin/am.c:2358 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2361 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2379 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2332 +#: builtin/am.c:2386 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2347 +#: builtin/am.c:2401 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2371 +#: builtin/am.c:2425 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2377 +#: builtin/am.c:2431 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2387 +#: builtin/am.c:2441 msgid "interactive mode requires patches on the command line" msgstr "" @@ -8905,54 +8911,54 @@ msgid "could not create archive file '%s'" msgstr "" -#: builtin/archive.c:20 +#: builtin/archive.c:18 msgid "could not redirect output" msgstr "" -#: builtin/archive.c:37 +#: builtin/archive.c:35 msgid "git archive: Remote with no URL" msgstr "" -#: builtin/archive.c:61 +#: builtin/archive.c:59 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "" -#: builtin/archive.c:64 +#: builtin/archive.c:62 #, c-format msgid "git archive: NACK %s" msgstr "" -#: builtin/archive.c:65 +#: builtin/archive.c:63 msgid "git archive: protocol error" msgstr "" -#: builtin/archive.c:69 +#: builtin/archive.c:67 msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:22 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:13 msgid "git bisect--helper --write-terms " msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:14 msgid "git bisect--helper --bisect-clean-state" msgstr "" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-reset []" msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-write [--no-log] " "" msgstr "" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-check-and-set-terms " "" @@ -8975,73 +8981,73 @@ "{new,bad}=][--no-checkout] [ [...]] [--] [...]" msgstr "" -#: builtin/bisect--helper.c:153 +#: builtin/bisect--helper.c:170 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:174 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:184 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:177 +#: builtin/bisect--helper.c:194 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:118 +#: builtin/bisect--helper.c:78 msgid "could not open the file BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:193 +#: builtin/bisect--helper.c:210 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:201 +#: builtin/bisect--helper.c:218 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c:227 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "" -#: builtin/bisect--helper.c:254 +#: builtin/bisect--helper.c:271 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:276 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:271 +#: builtin/bisect--helper.c:288 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:297 +#: builtin/bisect--helper.c:314 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:324 +#: builtin/bisect--helper.c:341 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:328 +#: builtin/bisect--helper.c:345 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9049,7 +9055,7 @@ "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:348 +#: builtin/bisect--helper.c:365 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -9058,133 +9064,133 @@ #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:356 +#: builtin/bisect--helper.c:373 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:417 +#: builtin/bisect--helper.c:434 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:420 +#: builtin/bisect--helper.c:437 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:430 +#: builtin/bisect--helper.c:447 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:661 +#: builtin/bisect--helper.c:678 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:665 +#: builtin/bisect--helper.c:682 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:713 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:728 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" -#: builtin/bisect--helper.c:732 +#: builtin/bisect--helper.c:749 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:735 +#: builtin/bisect--helper.c:752 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:755 +#: builtin/bisect--helper.c:772 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:122 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:124 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:126 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:1047 +#: builtin/bisect--helper.c:1192 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:926 +#: builtin/bisect--helper.c:641 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:928 +#: builtin/bisect--helper.c:643 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:1049 +#: builtin/bisect--helper.c:1194 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:1051 +#: builtin/bisect--helper.c:1196 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:1053 +#: builtin/bisect--helper.c:1198 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/bisect--helper.c:1065 +#: builtin/bisect--helper.c:1214 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:143 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:147 msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/bisect--helper.c:1080 +#: builtin/bisect--helper.c:1229 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:961 +#: builtin/bisect--helper.c:685 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:967 +#: builtin/bisect--helper.c:691 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:1085 +#: builtin/bisect--helper.c:1094 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:1091 +#: builtin/bisect--helper.c:1234 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" @@ -9196,146 +9202,146 @@ msgid " are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:410 +#: builtin/blame.c:406 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:417 +#: builtin/blame.c:413 msgid "must end with a color" msgstr "" -#: builtin/blame.c:728 +#: builtin/blame.c:724 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:746 +#: builtin/blame.c:742 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:841 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:677 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:678 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:871 +#: builtin/blame.c:679 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:872 +#: builtin/blame.c:680 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:681 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:682 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:683 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:684 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:685 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:686 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:879 +#: builtin/blame.c:687 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:880 +#: builtin/blame.c:688 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:881 +#: builtin/blame.c:689 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:882 +#: builtin/blame.c:690 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:883 +#: builtin/blame.c:691 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:884 +#: builtin/blame.c:692 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:883 builtin/log.c:1812 +#: builtin/blame.c:879 builtin/log.c:1823 msgid "rev" msgstr "" -#: builtin/blame.c:885 +#: builtin/blame.c:860 msgid "Ignore when blaming" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:861 msgid "Ignore revisions from " msgstr "" -#: builtin/blame.c:885 +#: builtin/blame.c:881 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:882 msgid "color lines by age" msgstr "" -#: builtin/blame.c:889 +#: builtin/blame.c:701 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:890 +#: builtin/blame.c:702 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:891 +#: builtin/blame.c:703 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:886 builtin/blame.c:887 msgid "score" msgstr "" -#: builtin/blame.c:892 +#: builtin/blame.c:704 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:893 +#: builtin/blame.c:705 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:706 msgid "n,m" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:706 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:945 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -9347,22 +9353,22 @@ #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:996 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1112 +#: builtin/blame.c:1111 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1157 +#: builtin/blame.c:1156 msgid "Blaming lines" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:27 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "" @@ -9443,12 +9449,12 @@ msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:271 +#: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:272 +#: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "" @@ -9463,74 +9469,74 @@ msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:438 builtin/tag.c:61 +#: builtin/branch.c:441 builtin/tag.c:63 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:469 +#: builtin/branch.c:472 msgid "could not resolve HEAD" msgstr "" -#: builtin/branch.c:475 +#: builtin/branch.c:478 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "" -#: builtin/branch.c:490 +#: builtin/branch.c:493 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:494 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:511 +#: builtin/branch.c:514 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:513 +#: builtin/branch.c:516 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:524 +#: builtin/branch.c:527 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:553 +#: builtin/branch.c:556 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:555 +#: builtin/branch.c:558 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:559 +#: builtin/branch.c:562 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:562 +#: builtin/branch.c:565 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:568 +#: builtin/branch.c:571 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:577 +#: builtin/branch.c:580 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:582 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:598 #, c-format msgid "" "Please edit the description for the branch\n" @@ -9538,216 +9544,216 @@ "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:629 +#: builtin/branch.c:632 msgid "Generic options" msgstr "" -#: builtin/branch.c:631 +#: builtin/branch.c:634 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:635 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:633 +#: builtin/branch.c:636 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:635 +#: builtin/branch.c:638 msgid "do not use" msgstr "" -#: builtin/branch.c:637 builtin/rebase.c:534 +#: builtin/branch.c:640 msgid "upstream" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:640 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:641 msgid "unset the upstream info" msgstr "" -#: builtin/branch.c:639 +#: builtin/branch.c:642 msgid "use colored output" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:643 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:642 builtin/branch.c:644 +#: builtin/branch.c:645 builtin/branch.c:647 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:643 builtin/branch.c:645 +#: builtin/branch.c:646 builtin/branch.c:648 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:651 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:649 +#: builtin/branch.c:652 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:654 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:652 +#: builtin/branch.c:655 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:656 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:657 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:655 +#: builtin/branch.c:658 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:656 +#: builtin/branch.c:659 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:657 +#: builtin/branch.c:660 msgid "list branch names" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:661 msgid "show current branch name" msgstr "" -#: builtin/branch.c:659 +#: builtin/branch.c:662 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:661 +#: builtin/branch.c:664 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:662 +#: builtin/branch.c:665 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:663 +#: builtin/branch.c:666 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:664 +#: builtin/branch.c:667 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:665 +#: builtin/branch.c:668 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:466 +#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 +#: builtin/tag.c:475 msgid "object" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:671 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 +#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 +#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:693 builtin/clone.c:790 +#: builtin/branch.c:696 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:717 +#: builtin/branch.c:720 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 +#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 msgid "branch name required" msgstr "" -#: builtin/branch.c:764 +#: builtin/branch.c:768 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:769 +#: builtin/branch.c:773 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:776 +#: builtin/branch.c:780 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:783 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:794 +#: builtin/branch.c:798 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:803 +#: builtin/branch.c:807 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:812 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:812 +#: builtin/branch.c:816 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:815 builtin/branch.c:838 +#: builtin/branch.c:819 builtin/branch.c:842 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:823 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:832 +#: builtin/branch.c:836 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:836 +#: builtin/branch.c:840 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:842 +#: builtin/branch.c:846 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:852 +#: builtin/branch.c:856 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" msgstr "" -#: builtin/branch.c:856 +#: builtin/branch.c:860 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9769,23 +9775,23 @@ msgid "git bundle unbundle [...]" msgstr "" -#: builtin/bundle.c:67 builtin/pack-objects.c:3495 +#: builtin/bundle.c:65 builtin/pack-objects.c:3876 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:69 builtin/pack-objects.c:3497 +#: builtin/bundle.c:67 builtin/bundle.c:167 builtin/pack-objects.c:3878 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:71 builtin/pack-objects.c:3499 +#: builtin/bundle.c:69 builtin/pack-objects.c:3880 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:74 builtin/pack-objects.c:3502 +#: builtin/bundle.c:72 builtin/pack-objects.c:3883 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/bundle.c:96 +#: builtin/bundle.c:94 msgid "Need a repository to create a bundle." msgstr "" @@ -9793,101 +9799,101 @@ msgid "do not show bundle details" msgstr "" -#: builtin/bundle.c:122 +#: builtin/bundle.c:126 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:163 +#: builtin/bundle.c:182 msgid "Need a repository to unbundle." msgstr "" -#: builtin/bundle.c:171 builtin/remote.c:1700 +#: builtin/remote.c:1702 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/bundle.c:193 builtin/remote.c:1731 +#: builtin/bundle.c:219 builtin/remote.c:1733 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/cat-file.c:598 +#: builtin/cat-file.c:622 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " msgstr "" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:524 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:620 +#: builtin/cat-file.c:644 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:662 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:663 msgid "show object type" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:664 msgid "show object size" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:666 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:667 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:669 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:671 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:672 msgid "blob" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:673 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:675 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:652 +#: builtin/cat-file.c:676 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:678 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:682 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:686 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:664 +#: builtin/cat-file.c:688 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:666 +#: builtin/cat-file.c:690 msgid "do not order --batch-all-objects output" msgstr "" @@ -9907,7 +9913,7 @@ msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 +#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "" @@ -9915,8 +9921,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 -#: builtin/worktree.c:489 +#: builtin/check-ignore.c:21 builtin/checkout.c:1513 builtin/gc.c:549 +#: builtin/worktree.c:494 msgid "suppress progress reporting" msgstr "" @@ -9928,27 +9934,27 @@ msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:165 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:168 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:170 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:174 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:176 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:179 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -9977,207 +9983,208 @@ msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:187 +#: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:197 +#: builtin/checkout-index.c:198 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:199 +#: builtin/checkout-index.c:200 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:200 builtin/column.c:31 -#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 -#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:717 +#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 +#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "string" msgstr "" -#: builtin/checkout-index.c:201 +#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202 msgid "when creating files, prepend " msgstr "" -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:204 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:31 +#: builtin/checkout.c:33 msgid "git checkout [] " msgstr "" -#: builtin/checkout.c:32 +#: builtin/checkout.c:34 msgid "git checkout [] [] -- ..." msgstr "" -#: builtin/checkout.c:37 +#: builtin/checkout.c:39 msgid "git switch [] []" msgstr "" -#: builtin/checkout.c:42 +#: builtin/checkout.c:44 msgid "git restore [] [--source=] ..." msgstr "" -#: builtin/checkout.c:188 builtin/checkout.c:227 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:192 builtin/checkout.c:231 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:206 +#: builtin/checkout.c:208 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:275 +#: builtin/checkout.c:278 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:291 +#: builtin/checkout.c:294 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:396 +#: builtin/checkout.c:411 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:401 +#: builtin/checkout.c:416 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:408 +#: builtin/checkout.c:423 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 -#: builtin/checkout.c:441 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 +#: builtin/checkout.c:456 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:444 builtin/checkout.c:447 +#: builtin/checkout.c:459 builtin/checkout.c:462 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:451 +#: builtin/checkout.c:466 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:455 +#: builtin/checkout.c:470 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:459 +#: builtin/checkout.c:474 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:464 builtin/checkout.c:469 +#: builtin/checkout.c:479 builtin/checkout.c:484 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:543 builtin/checkout.c:550 +#: builtin/checkout.c:558 builtin/checkout.c:565 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:718 +#: builtin/checkout.c:736 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:772 +#: builtin/checkout.c:786 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:865 +#: builtin/checkout.c:879 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:907 +#: builtin/checkout.c:921 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:915 +#: builtin/checkout.c:929 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:918 +#: builtin/checkout.c:932 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:922 +#: builtin/checkout.c:936 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:924 builtin/checkout.c:1355 +#: builtin/checkout.c:938 builtin/checkout.c:1369 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:926 +#: builtin/checkout.c:940 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:977 +#: builtin/checkout.c:991 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:983 +#: builtin/checkout.c:997 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10192,7 +10199,7 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1002 +#: builtin/checkout.c:1016 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10209,195 +10216,197 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1051 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1041 +#: builtin/checkout.c:1055 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1081 builtin/checkout.c:1350 +#: builtin/checkout.c:1095 builtin/checkout.c:1364 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1260 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1277 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1177 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 +#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1322 builtin/checkout.c:1688 +#: builtin/checkout.c:1336 builtin/checkout.c:1705 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1383 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1371 +#: builtin/checkout.c:1385 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1372 builtin/checkout.c:1380 +#: builtin/checkout.c:1386 builtin/checkout.c:1394 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1375 +#: builtin/checkout.c:1389 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1391 +#: builtin/checkout.c:1405 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1409 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1399 +#: builtin/checkout.c:1413 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1403 +#: builtin/checkout.c:1417 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1421 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1425 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1418 +#: builtin/checkout.c:1432 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 +#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 -#: builtin/checkout.c:1444 builtin/checkout.c:1449 +#: builtin/checkout.c:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 +#: builtin/checkout.c:1458 builtin/checkout.c:1463 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1446 +#: builtin/checkout.c:1460 #, c-format msgid "'%s' cannot take " msgstr "" -#: builtin/checkout.c:1454 +#: builtin/checkout.c:1468 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1461 +#: builtin/checkout.c:1475 msgid "missing branch or commit argument" msgstr "" -#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 -#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 -#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 -#: builtin/push.c:575 builtin/send-pack.c:198 +#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 +#: builtin/merge.c:298 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 +#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 +#: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1518 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 +#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 msgid "style" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1520 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1518 builtin/worktree.c:486 +#: builtin/checkout.c:1532 builtin/worktree.c:489 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1519 +#: builtin/checkout.c:1533 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1521 +#: builtin/checkout.c:1535 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1537 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1523 +#: builtin/checkout.c:1537 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1525 builtin/merge.c:301 +#: builtin/checkout.c:1539 builtin/merge.c:302 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1542 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1541 +#: builtin/checkout.c:1555 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1544 +#: builtin/checkout.c:1558 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1548 +#: builtin/checkout.c:1562 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1168 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1607 +#: builtin/checkout.c:1624 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1644 +#: builtin/checkout.c:1661 msgid "--track needs a branch name" msgstr "" @@ -10405,40 +10414,40 @@ msgid "missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1681 +#: builtin/checkout.c:1698 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1714 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1721 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1708 +#: builtin/checkout.c:1725 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1734 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 +#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1733 +#: builtin/checkout.c:1750 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1755 msgid "you must specify path(s) to restore" msgstr "" @@ -10459,66 +10468,67 @@ "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 -#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 -#: builtin/worktree.c:484 +#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 +#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2958 +#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 +#: builtin/worktree.c:487 msgid "branch" msgstr "" -#: builtin/checkout.c:1765 +#: builtin/checkout.c:1782 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1767 +#: builtin/checkout.c:1784 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1785 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1787 msgid "second guess 'git checkout ' (default)" msgstr "" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1788 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1816 +#: builtin/checkout.c:1833 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1818 +#: builtin/checkout.c:1835 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1837 msgid "second guess 'git switch '" msgstr "" -#: builtin/checkout.c:1822 +#: builtin/checkout.c:1839 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1856 +#: builtin/checkout.c:1873 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1858 +#: builtin/checkout.c:1875 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1860 +#: builtin/checkout.c:1877 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1862 +#: builtin/checkout.c:1879 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1880 msgid "use overlay mode" msgstr "" @@ -10547,7 +10557,7 @@ msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:37 +#: midx.c:1486 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" @@ -10557,7 +10567,7 @@ msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:302 git-add--interactive.perl:593 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10566,7 +10576,7 @@ " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:306 git-add--interactive.perl:602 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10579,33 +10589,33 @@ " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:568 +#: builtin/clean.c:519 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:661 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:696 +#: builtin/clean.c:693 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:717 +#: builtin/clean.c:714 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:758 +#: builtin/clean.c:755 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:789 +#: builtin/clean.c:786 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10616,62 +10626,62 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:825 +#: builtin/clean.c:822 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:841 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:903 +#: builtin/clean.c:900 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:905 +#: builtin/clean.c:902 msgid "force" msgstr "" -#: builtin/clean.c:906 +#: builtin/clean.c:903 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:905 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:907 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:908 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:910 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:940 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:929 +#: builtin/clean.c:925 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:932 +#: builtin/clean.c:928 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10681,337 +10691,339 @@ msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:98 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 +#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:107 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:105 +#: builtin/clone.c:109 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "pathspec" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:111 +#: builtin/clone.c:115 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:116 builtin/init-db.c:539 msgid "template-directory" msgstr "" -#: builtin/clone.c:113 builtin/init-db.c:553 +#: builtin/clone.c:117 builtin/init-db.c:540 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 -#: builtin/submodule--helper.c:2336 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 msgid "reference repository" msgstr "" -#: builtin/clone.c:119 builtin/submodule--helper.c:1833 -#: builtin/submodule--helper.c:2338 +#: builtin/clone.c:123 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:2515 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 +#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 +#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 -#: builtin/pull.c:208 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 +#: builtin/pull.c:212 msgid "depth" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:131 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 -#: builtin/pull.c:211 +#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 +#: builtin/pull.c:215 msgid "time" msgstr "" -#: builtin/clone.c:129 +#: builtin/clone.c:133 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 +#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "" -#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 +#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:133 builtin/submodule--helper.c:1843 -#: builtin/submodule--helper.c:2352 +#: builtin/clone.c:137 builtin/submodule--helper.c:1882 +#: builtin/submodule--helper.c:2529 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:139 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:142 builtin/init-db.c:548 msgid "gitdir" msgstr "" -#: builtin/clone.c:139 builtin/init-db.c:562 +#: builtin/clone.c:143 builtin/init-db.c:549 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:140 +#: builtin/clone.c:144 msgid "key=value" msgstr "" -#: builtin/clone.c:141 +#: builtin/clone.c:145 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 -#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 -#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 +#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "" -#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 -#: builtin/push.c:585 +#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 +#: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 -#: builtin/push.c:587 +#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 +#: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:150 +#: builtin/clone.c:154 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:152 +#: builtin/clone.c:156 msgid "initialize sparse-checkout file to include only files at root" msgstr "" -#: builtin/clone.c:288 +#: dir.c:3158 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:341 +#: builtin/clone.c:231 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:414 +#: builtin/clone.c:304 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:432 +#: builtin/clone.c:322 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:463 +#: builtin/clone.c:353 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:467 +#: builtin/clone.c:357 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:472 +#: builtin/clone.c:362 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:499 +#: builtin/clone.c:389 #, c-format msgid "done.\n" msgstr "završeno.\n" -#: builtin/clone.c:513 +#: builtin/clone.c:403 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:590 +#: builtin/clone.c:480 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:709 +#: builtin/clone.c:597 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:757 +#: builtin/clone.c:645 msgid "failed to initialize sparse-checkout" msgstr "" -#: builtin/clone.c:780 +#: builtin/clone.c:668 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:812 +#: builtin/clone.c:701 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:887 +#: builtin/clone.c:779 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:950 +#: builtin/clone.c:842 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:952 +#: builtin/clone.c:844 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:993 builtin/receive-pack.c:2493 +#: builtin/clone.c:886 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:997 +#: builtin/clone.c:890 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:1010 +#: builtin/clone.c:903 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:1013 +#: builtin/clone.c:906 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:1026 +#: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1030 builtin/fetch.c:1951 +#: builtin/clone.c:924 builtin/fetch.c:2029 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1040 +#: builtin/clone.c:934 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1060 +#: builtin/clone.c:954 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 -#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 +#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1080 +#: builtin/clone.c:974 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1100 +#: builtin/clone.c:994 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Kloniranje u izolirani repozitorij '%s'...\n" -#: builtin/clone.c:1102 +#: builtin/clone.c:996 #, c-format msgid "Cloning into '%s'...\n" msgstr "Kloniranje u '%s'...\n" -#: builtin/clone.c:1126 +#: builtin/clone.c:1025 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1211 +#: builtin/clone.c:1121 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1213 +#: builtin/clone.c:1123 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1215 +#: builtin/clone.c:1125 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1217 +#: builtin/clone.c:1127 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1220 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1225 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1315 builtin/clone.c:1323 +#: builtin/clone.c:1228 builtin/clone.c:1239 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1326 +#: builtin/clone.c:1242 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11058,7 +11070,7 @@ msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11068,67 +11080,67 @@ msgid "git commit-tree: failed to open '%s'" msgstr "" -#: builtin/commit-tree.c:96 +#: builtin/commit-tree.c:94 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "" -#: builtin/commit-tree.c:98 +#: builtin/commit-tree.c:96 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "" -#: builtin/commit-tree.c:111 +#: builtin/commit-tree.c:109 msgid "parent" msgstr "" -#: builtin/commit-tree.c:112 +#: builtin/commit-tree.c:110 msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 -#: builtin/tag.c:445 +#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/tag.c:454 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1504 +#: builtin/commit-tree.c:113 builtin/commit.c:1626 msgid "commit message" msgstr "" -#: builtin/commit-tree.c:118 +#: builtin/commit-tree.c:116 msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 -#: builtin/pull.c:176 builtin/revert.c:118 +#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 +#: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" -#: builtin/commit-tree.c:133 +#: builtin/commit-tree.c:131 msgid "must give exactly one tree" msgstr "" -#: builtin/commit-tree.c:140 +#: builtin/commit-tree.c:138 msgid "git commit-tree: failed to read" msgstr "" -#: builtin/commit.c:41 +#: builtin/commit.c:42 msgid "git commit [] [--] ..." msgstr "" -#: builtin/commit.c:46 +#: builtin/commit.c:47 msgid "git status [] [--] ..." msgstr "" -#: builtin/commit.c:51 +#: builtin/commit.c:52 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:56 +#: builtin/commit.c:57 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -11137,11 +11149,11 @@ "\n" msgstr "" -#: builtin/commit.c:66 +#: builtin/commit.c:67 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "" -#: builtin/commit.c:69 +#: builtin/commit.c:70 msgid "" "and then use:\n" "\n" @@ -11154,106 +11166,106 @@ "\n" msgstr "" -#: builtin/commit.c:312 +#: builtin/commit.c:325 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:348 +#: builtin/commit.c:361 msgid "--pathspec-from-file with -a does not make sense" msgstr "" -#: builtin/commit.c:361 +#: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:373 +#: builtin/commit.c:387 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:382 +#: builtin/commit.c:396 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:397 +#: builtin/commit.c:411 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:399 +#: builtin/commit.c:413 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 +#: builtin/commit.c:438 builtin/commit.c:461 builtin/commit.c:509 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:476 +#: builtin/commit.c:490 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:478 +#: builtin/commit.c:492 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:488 +#: builtin/commit.c:502 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:507 +#: builtin/commit.c:521 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:605 +#: builtin/commit.c:619 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:607 +#: builtin/commit.c:621 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:626 +#: builtin/commit.c:640 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:679 +#: builtin/commit.c:693 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 +#: builtin/commit.c:747 builtin/commit.c:781 builtin/commit.c:1166 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:729 builtin/shortlog.c:413 +#: builtin/commit.c:759 builtin/shortlog.c:416 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:731 +#: builtin/commit.c:761 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:735 +#: builtin/commit.c:765 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:766 builtin/commit.c:782 +#: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:773 +#: builtin/commit.c:821 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:833 +#: builtin/commit.c:881 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:849 +#: builtin/commit.c:787 #, c-format msgid "" "\n" @@ -11263,7 +11275,7 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:854 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -11273,14 +11285,14 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:868 +#: builtin/commit.c:896 #, 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:876 +#: builtin/commit.c:904 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11288,323 +11300,323 @@ "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:893 +#: builtin/commit.c:948 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:901 +#: builtin/commit.c:956 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:908 +#: builtin/commit.c:963 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:926 +#: builtin/commit.c:981 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:997 +#: builtin/commit.c:1066 msgid "Error building trees" msgstr "" -#: builtin/commit.c:1011 builtin/tag.c:308 +#: builtin/commit.c:1080 builtin/tag.c:317 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1124 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1069 +#: builtin/commit.c:1138 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1087 builtin/commit.c:1331 +#: builtin/commit.c:1156 builtin/commit.c:1450 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1127 +#: builtin/commit.c:1196 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1253 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1260 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1263 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1265 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1190 +#: builtin/commit.c:1270 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1280 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1202 +#: builtin/commit.c:1282 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1211 +#: builtin/commit.c:1291 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1229 +#: builtin/commit.c:1309 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1235 +#: builtin/commit.c:1354 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1366 builtin/commit.c:1527 +#: builtin/commit.c:1485 builtin/commit.c:1654 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1487 builtin/commit.c:1656 msgid "show branch information" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1489 msgid "show stash information" msgstr "" -#: builtin/commit.c:1372 builtin/commit.c:1531 +#: builtin/commit.c:1491 builtin/commit.c:1658 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1493 msgid "version" msgstr "" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:679 +#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 +#: builtin/worktree.c:691 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1377 builtin/commit.c:1535 +#: builtin/commit.c:1496 builtin/commit.c:1662 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1380 builtin/commit.c:1538 +#: builtin/commit.c:1499 builtin/commit.c:1665 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 -#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 +#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 msgid "mode" msgstr "" -#: builtin/commit.c:1383 builtin/commit.c:1541 +#: builtin/commit.c:1502 builtin/commit.c:1668 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1387 +#: builtin/commit.c:1506 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1389 parse-options.h:192 +#: builtin/commit.c:1508 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1390 +#: builtin/commit.c:1509 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1392 +#: builtin/commit.c:1511 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1393 +#: builtin/commit.c:1512 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1395 +#: builtin/commit.c:1514 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1415 +#: builtin/commit.c:1537 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1497 +#: builtin/commit.c:1619 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1620 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1622 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 +#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 msgid "read message from file" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1624 msgid "author" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1624 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1503 builtin/gc.c:550 +#: builtin/commit.c:1625 builtin/gc.c:550 msgid "date" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1625 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 +#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 +#: parse-options.h:327 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1627 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1506 +#: builtin/commit.c:1628 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1423 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1634 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1509 +#: builtin/commit.c:1635 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1511 +#: builtin/commit.c:1638 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1512 +#: builtin/commit.c:1639 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1514 +#: builtin/commit.c:1641 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1646 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1647 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1648 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1649 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1523 +#: builtin/commit.c:1650 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1524 +#: builtin/commit.c:1651 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1525 +#: builtin/commit.c:1652 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1526 +#: builtin/commit.c:1653 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1539 +#: builtin/commit.c:1666 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1540 +#: builtin/commit.c:1667 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1547 +#: builtin/commit.c:1674 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1549 +#: builtin/commit.c:1676 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1752 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1629 +#: builtin/commit.c:1759 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1650 +#: builtin/commit.c:1780 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1657 +#: builtin/commit.c:1787 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1662 +#: builtin/commit.c:1792 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1696 +#: builtin/commit.c:1839 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" @@ -11615,54 +11627,53 @@ "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] " msgstr "" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 +#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 msgid "dir" msgstr "" -#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 -#: builtin/commit-graph.c:317 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:83 +#: builtin/commit-graph.c:73 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:100 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:213 +#: builtin/commit-graph.c:205 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:207 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:217 +#: builtin/commit-graph.c:209 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:219 +#: builtin/commit-graph.c:211 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:224 +#: builtin/commit-graph.c:215 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:228 +#: builtin/commit-graph.c:219 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:230 +#: builtin/commit-graph.c:221 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:255 +#: builtin/commit-graph.c:251 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -11715,15 +11726,15 @@ msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "" @@ -11731,7 +11742,7 @@ msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" @@ -11739,11 +11750,11 @@ msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "" @@ -11990,12 +12001,12 @@ msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:279 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:281 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" @@ -12142,7 +12153,7 @@ msgid "Not a git repository" msgstr "" -#: builtin/diff.c:532 builtin/grep.c:682 +#: builtin/diff.c:532 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "" @@ -12157,51 +12168,51 @@ msgid "unhandled object '%s' given." msgstr "" -#: builtin/difftool.c:30 +#: builtin/difftool.c:31 msgid "git difftool [] [ []] [--] [...]" msgstr "" -#: builtin/difftool.c:260 +#: builtin/difftool.c:651 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:302 +#: builtin/difftool.c:293 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:304 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:312 +#: builtin/difftool.c:303 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "" @@ -12233,7 +12244,7 @@ msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:712 +#: builtin/difftool.c:715 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12247,23 +12258,23 @@ msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:738 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:741 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:750 msgid "no given for --tool=" msgstr "" -#: builtin/difftool.c:756 +#: builtin/difftool.c:757 msgid "no given for --extcmd=" msgstr "" @@ -12271,7 +12282,7 @@ msgid "git env--helper --type=[bool|ulong] " msgstr "" -#: builtin/env--helper.c:42 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:96 msgid "type" msgstr "" @@ -12300,79 +12311,79 @@ msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:868 +#: builtin/fast-export.c:869 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -#: builtin/fast-export.c:1197 +#: builtin/fast-export.c:1198 msgid "show progress after objects" msgstr "" -#: builtin/fast-export.c:1199 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1202 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1205 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1208 +#: builtin/fast-export.c:1006 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1210 +#: builtin/fast-export.c:1008 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1214 +#: builtin/fast-export.c:1169 msgid "Import marks from this file if it exists" msgstr "" -#: builtin/fast-export.c:1216 +#: builtin/fast-export.c:1010 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1218 +#: builtin/fast-export.c:1012 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1220 +#: builtin/fast-export.c:1014 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1015 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1222 builtin/log.c:1815 +#: builtin/fast-export.c:1223 builtin/log.c:1826 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1223 +#: builtin/fast-export.c:1017 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1229 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1231 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1233 +#: builtin/fast-export.c:1185 msgid "Label tags with mark ids" msgstr "" -#: builtin/fast-export.c:1271 +#: builtin/fast-export.c:1272 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" @@ -12392,106 +12403,106 @@ msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:120 +#: builtin/fetch.c:122 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:143 builtin/pull.c:185 +#: builtin/fetch.c:145 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:145 builtin/pull.c:245 +#: builtin/fetch.c:147 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:147 builtin/pull.c:188 +#: builtin/fetch.c:149 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:151 builtin/pull.c:191 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:154 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:154 +#: builtin/fetch.c:156 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:195 +#: builtin/fetch.c:158 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:158 +#: builtin/fetch.c:160 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:160 +#: builtin/fetch.c:162 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:162 builtin/pull.c:198 +#: builtin/fetch.c:166 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:164 +#: builtin/fetch.c:168 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 +#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 msgid "on-demand" msgstr "" -#: builtin/fetch.c:166 +#: builtin/fetch.c:170 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:206 +#: builtin/fetch.c:176 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:174 +#: builtin/fetch.c:178 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 -#: builtin/pull.c:218 +#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:179 builtin/pull.c:212 +#: builtin/fetch.c:183 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:185 builtin/pull.c:221 +#: builtin/fetch.c:189 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:188 +#: builtin/fetch.c:192 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:191 +#: builtin/fetch.c:195 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:195 builtin/pull.c:224 +#: builtin/fetch.c:199 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:196 builtin/pull.c:226 +#: builtin/fetch.c:200 builtin/pull.c:230 msgid "refmap" msgstr "" -#: builtin/fetch.c:197 builtin/pull.c:227 +#: builtin/fetch.c:201 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:204 builtin/pull.c:240 +#: builtin/fetch.c:208 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "" @@ -12499,81 +12510,81 @@ msgid "run 'gc --auto' after fetching" msgstr "" -#: builtin/fetch.c:211 builtin/pull.c:243 +#: builtin/fetch.c:217 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:213 +#: builtin/fetch.c:219 msgid "write the commit-graph after fetching" msgstr "" -#: builtin/fetch.c:526 +#: builtin/fetch.c:586 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:697 +#: builtin/fetch.c:760 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:796 +#: builtin/fetch.c:862 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:800 +#: builtin/fetch.c:866 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 +#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:814 +#: builtin/fetch.c:880 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:824 +#: builtin/fetch.c:890 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 -#: builtin/fetch.c:896 +#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 +#: builtin/fetch.c:962 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:829 +#: builtin/fetch.c:895 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:851 +#: builtin/fetch.c:917 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:854 +#: builtin/fetch.c:920 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:857 +#: builtin/fetch.c:923 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:896 +#: builtin/fetch.c:962 msgid "forced update" msgstr "" -#: builtin/fetch.c:901 +#: builtin/fetch.c:967 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1070 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:1009 +#: builtin/fetch.c:1074 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12582,142 +12593,142 @@ " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:1041 +#: builtin/fetch.c:1105 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:1069 +#: builtin/fetch.c:804 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1146 builtin/fetch.c:1297 +#: builtin/fetch.c:1223 builtin/fetch.c:1371 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1168 +#: builtin/fetch.c:1244 #, 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:1267 +#: builtin/fetch.c:1341 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1268 +#: builtin/fetch.c:1342 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1300 +#: builtin/fetch.c:1374 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1301 builtin/remote.c:1118 +#: builtin/fetch.c:1375 builtin/remote.c:1128 msgid "(none)" msgstr "" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1398 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1343 +#: builtin/fetch.c:1417 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1420 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1558 +#: builtin/fetch.c:1633 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1573 +#: builtin/fetch.c:1648 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1575 +#: builtin/fetch.c:1650 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1577 +#: builtin/fetch.c:1652 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1579 +#: builtin/fetch.c:1654 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1708 builtin/fetch.c:1771 +#: builtin/fetch.c:1783 builtin/fetch.c:1846 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 +#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1805 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1909 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:1870 +#: builtin/fetch.c:1945 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1935 +#: builtin/fetch.c:2013 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1937 +#: builtin/fetch.c:2015 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1942 +#: builtin/fetch.c:2020 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1944 +#: builtin/fetch.c:2022 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1961 +#: builtin/fetch.c:2039 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1963 +#: builtin/fetch.c:2041 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1972 +#: builtin/fetch.c:2050 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1979 +#: builtin/fetch.c:2057 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1997 +#: builtin/fetch.c:2097 msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" @@ -12764,287 +12775,287 @@ msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "" -#: builtin/for-each-ref.c:28 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for shells" msgstr "" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for perl" msgstr "" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for python" msgstr "" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for Tcl" msgstr "" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c:39 msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:472 +#: builtin/for-each-ref.c:41 builtin/tag.c:481 msgid "respect format colors" msgstr "" -#: builtin/for-each-ref.c:42 +#: builtin/for-each-ref.c:44 msgid "print only refs which points at the given object" msgstr "" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are merged" msgstr "" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs that are not merged" msgstr "" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:48 msgid "print only refs which contain the commit" msgstr "" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:49 msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 +#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c:83 builtin/fsck.c:103 +#: builtin/fsck.c:78 builtin/fsck.c:100 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: -#: builtin/fsck.c:97 +#: builtin/fsck.c:94 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:126 builtin/fsck.c:129 +#: builtin/fsck.c:124 builtin/fsck.c:127 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:138 +#: builtin/fsck.c:136 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:154 +#: builtin/fsck.c:152 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:265 +#: builtin/fsck.c:264 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:292 +#: builtin/fsck.c:291 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:312 +#: builtin/fsck.c:311 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:322 +#: builtin/fsck.c:321 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:333 +#: builtin/fsck.c:332 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:350 +#: builtin/fsck.c:349 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:388 +#: builtin/fsck.c:387 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:407 +#: builtin/fsck.c:406 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:412 +#: builtin/fsck.c:411 msgid "broken links" msgstr "" -#: builtin/fsck.c:421 +#: builtin/fsck.c:420 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:429 +#: builtin/fsck.c:428 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:458 +#: builtin/fsck.c:457 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:483 +#: builtin/fsck.c:482 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:497 +#: builtin/fsck.c:496 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:531 +#: builtin/fsck.c:530 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:538 +#: builtin/fsck.c:537 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:592 +#: builtin/fsck.c:591 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:607 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:620 +#: builtin/fsck.c:644 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:640 +#: builtin/fsck.c:664 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:655 +#: builtin/fsck.c:685 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:658 +#: builtin/fsck.c:688 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:673 +#: builtin/fsck.c:704 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:678 builtin/index-pack.c:865 +#: builtin/fsck.c:709 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:716 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:691 +#: builtin/fsck.c:722 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:695 +#: builtin/fsck.c:726 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:707 +#: builtin/fsck.c:738 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:743 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:721 +#: builtin/fsck.c:752 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:752 +#: builtin/fsck.c:783 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:758 +#: builtin/fsck.c:789 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:759 +#: builtin/fsck.c:790 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:760 +#: builtin/fsck.c:791 msgid "report tags" msgstr "" -#: builtin/fsck.c:761 +#: builtin/fsck.c:792 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:762 +#: builtin/fsck.c:793 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:763 +#: builtin/fsck.c:794 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:764 +#: builtin/fsck.c:795 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:765 +#: builtin/fsck.c:796 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:766 builtin/mktag.c:78 +#: builtin/fsck.c:797 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:768 +#: builtin/fsck.c:799 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:769 builtin/prune.c:134 +#: builtin/fsck.c:800 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:770 +#: builtin/fsck.c:801 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:829 builtin/index-pack.c:261 +#: builtin/fsck.c:861 builtin/index-pack.c:261 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:857 +#: builtin/fsck.c:889 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:868 +#: builtin/fsck.c:900 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" @@ -13063,12 +13074,12 @@ msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:487 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 +#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 #, c-format msgid "cannot read '%s'" msgstr "" @@ -13143,12 +13154,12 @@ msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" -#: builtin/grep.c:223 +#: builtin/grep.c:239 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:277 +#: builtin/grep.c:293 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" @@ -13157,242 +13168,242 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 -#: builtin/pack-objects.c:2944 +#: builtin/grep.c:301 builtin/index-pack.c:1582 builtin/index-pack.c:1785 +#: builtin/pack-objects.c:3142 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 +#: builtin/grep.c:488 builtin/grep.c:617 builtin/grep.c:657 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:656 +#: builtin/grep.c:672 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:752 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:851 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:838 +#: builtin/grep.c:853 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:840 +#: builtin/grep.c:855 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:842 +#: builtin/grep.c:857 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:844 +#: builtin/grep.c:859 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:862 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:864 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:866 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:853 +#: builtin/grep.c:868 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:870 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:873 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:875 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:877 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:881 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:884 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:887 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:890 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:893 msgid "show line numbers" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:894 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:895 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:896 msgid "show filenames" msgstr "" -#: builtin/grep.c:883 +#: builtin/grep.c:898 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:900 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:902 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:905 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:907 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:910 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:912 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:913 msgid "highlight matches" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:915 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:917 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:920 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:923 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:910 +#: builtin/grep.c:925 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:927 msgid "use worker threads" msgstr "" -#: builtin/grep.c:913 +#: builtin/grep.c:928 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:931 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:933 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:921 +#: builtin/grep.c:936 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:923 +#: builtin/grep.c:938 msgid "match " msgstr "" -#: builtin/grep.c:925 +#: builtin/grep.c:940 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:937 +#: builtin/grep.c:952 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:939 +#: builtin/grep.c:954 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:940 +#: builtin/grep.c:890 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:942 +#: builtin/grep.c:957 msgid "pager" msgstr "" -#: builtin/grep.c:942 +#: builtin/grep.c:957 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:946 +#: builtin/grep.c:961 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1012 +#: builtin/grep.c:1027 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1048 +#: builtin/grep.c:1063 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1056 +#: builtin/grep.c:1071 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1090 +#: builtin/grep.c:1105 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1093 builtin/pack-objects.c:3672 +#: builtin/grep.c:1108 builtin/pack-objects.c:4059 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 +#: builtin/grep.c:1111 builtin/index-pack.c:1579 builtin/pack-objects.c:3139 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1130 +#: builtin/grep.c:1145 msgid "--open-files-in-pager only works on the worktree" msgstr "" @@ -13400,82 +13411,82 @@ msgid "option not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1156 +#: builtin/grep.c:1171 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1165 +#: builtin/grep.c:1180 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1173 +#: builtin/grep.c:1188 msgid "both --cached and trees are given" msgstr "" -#: builtin/hash-object.c:85 +#: builtin/hash-object.c:83 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] [--" "] ..." msgstr "" -#: builtin/hash-object.c:86 +#: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:96 msgid "object type" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:105 +#: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:55 msgid "print all available commands" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:57 msgid "exclude guides" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:65 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:50 +#: builtin/help.c:67 msgid "print all configuration variable names" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:58 msgid "show man page" msgstr "" -#: builtin/help.c:53 +#: builtin/help.c:59 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:55 +#: builtin/help.c:61 msgid "show info page" msgstr "" -#: builtin/help.c:57 +#: builtin/help.c:63 msgid "print command description" msgstr "" @@ -13483,72 +13494,72 @@ msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "" -#: builtin/help.c:163 +#: builtin/help.c:196 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:190 +#: builtin/help.c:223 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:203 +#: builtin/help.c:236 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:211 +#: builtin/help.c:244 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 +#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:307 +#: builtin/help.c:340 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:319 +#: builtin/help.c:352 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:436 +#: builtin/help.c:467 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:453 +#: builtin/help.c:483 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:461 +#: builtin/help.c:490 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:520 builtin/help.c:531 git.c:340 +#: builtin/help.c:551 builtin/help.c:562 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:534 git.c:372 +#: builtin/help.c:565 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "" -#: builtin/help.c:563 builtin/help.c:593 +#: builtin/help.c:602 builtin/help.c:629 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:577 +#: builtin/help.c:624 msgid "'git help config' for more information" msgstr "" @@ -13586,7 +13597,7 @@ msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:324 builtin/pack-objects.c:624 +#: builtin/index-pack.c:324 builtin/pack-objects.c:756 msgid "pack too large for current definition of off_t" msgstr "" @@ -13594,353 +13605,353 @@ msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:348 +#: builtin/index-pack.c:349 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c:358 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c:360 #, c-format msgid "pack version % unsupported" msgstr "" -#: builtin/index-pack.c:382 +#: builtin/index-pack.c:376 #, c-format msgid "pack has bad object at offset %: %s" msgstr "" -#: builtin/index-pack.c:488 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:584 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:586 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:612 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 -#: builtin/index-pack.c:826 builtin/index-pack.c:835 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:781 +#: builtin/index-pack.c:820 builtin/index-pack.c:829 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:760 builtin/pack-objects.c:171 -#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 +#: builtin/index-pack.c:754 builtin/pack-objects.c:292 +#: builtin/pack-objects.c:352 builtin/pack-objects.c:458 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:818 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:832 +#: builtin/index-pack.c:826 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:840 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:849 builtin/index-pack.c:868 +#: builtin/index-pack.c:843 builtin/index-pack.c:862 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:870 +#: builtin/index-pack.c:864 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:931 builtin/index-pack.c:978 +#: builtin/index-pack.c:925 builtin/index-pack.c:972 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1156 msgid "Receiving objects" msgstr "Primanje objekata" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c:1156 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1190 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c:1195 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c:1198 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c:1210 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c:1233 msgid "Resolving deltas" msgstr "Razrješavanja delta" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 +#: builtin/index-pack.c:1244 builtin/pack-objects.c:2905 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c:1277 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c:1283 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c:1295 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c:1299 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c:1323 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1424 +#: builtin/index-pack.c:1419 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1397 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1464 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1472 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1503 +#: builtin/index-pack.c:1514 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1517 +#: builtin/index-pack.c:1516 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1524 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 +#: builtin/index-pack.c:1573 builtin/pack-objects.c:3150 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1643 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1652 +#: builtin/index-pack.c:1645 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1700 +#: builtin/index-pack.c:1693 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1707 +#: builtin/index-pack.c:1700 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1742 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 -#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1799 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1823 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1867 +#: builtin/index-pack.c:1848 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1869 +#: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1886 +#: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1933 builtin/unpack-objects.c:584 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:64 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:69 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:81 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:83 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:93 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:124 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:139 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:367 +#: builtin/init-db.c:354 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:370 +#: builtin/init-db.c:357 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:410 builtin/init-db.c:413 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:476 +#: builtin/init-db.c:463 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:477 +#: builtin/init-db.c:464 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:468 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:482 +#: builtin/init-db.c:469 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:531 +#: builtin/init-db.c:518 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:557 +#: builtin/init-db.c:544 msgid "permissions" msgstr "" -#: builtin/init-db.c:558 +#: builtin/init-db.c:545 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:602 builtin/init-db.c:607 +#: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:611 builtin/init-db.c:666 +#: builtin/init-db.c:600 builtin/init-db.c:655 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:638 +#: builtin/init-db.c:627 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:690 +#: builtin/init-db.c:679 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -13991,7 +14002,7 @@ msgid "do not treat --- specially" msgstr "" -#: builtin/interpret-trailers.c:111 +#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "" @@ -14024,7 +14035,7 @@ msgid "show source" msgstr "" -#: builtin/log.c:180 +#: builtin/log.c:155 msgid "Use mail map file" msgstr "" @@ -14040,112 +14051,112 @@ msgid "decorate options" msgstr "" -#: builtin/log.c:183 +#: builtin/log.c:163 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:303 +#: builtin/log.c:306 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:566 +#: builtin/log.c:571 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:581 builtin/log.c:671 +#: builtin/log.c:586 builtin/log.c:676 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:696 +#: builtin/log.c:701 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:841 +#: builtin/log.c:846 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:848 +#: builtin/log.c:853 msgid "format.headers without value" msgstr "" -#: builtin/log.c:936 +#: builtin/log.c:865 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:977 +#: builtin/log.c:982 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:994 +#: builtin/log.c:999 msgid "need exactly one range" msgstr "" -#: builtin/log.c:1004 +#: builtin/log.c:1009 msgid "not a range" msgstr "" -#: builtin/log.c:1168 +#: builtin/log.c:1173 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1174 +#: builtin/log.c:1179 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1266 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1288 +#: builtin/log.c:1293 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1346 +#: builtin/log.c:1351 msgid "two output directories?" msgstr "" -#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 +#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1517 +#: builtin/log.c:1522 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1527 +#: builtin/log.c:1532 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base= manually" msgstr "" -#: builtin/log.c:1550 +#: builtin/log.c:1555 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1572 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1577 +#: builtin/log.c:1582 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1635 +#: builtin/log.c:1640 msgid "cannot get patch id" msgstr "" @@ -14153,361 +14164,361 @@ msgid "failed to infer range-diff ranges" msgstr "" -#: builtin/log.c:1738 +#: builtin/log.c:1749 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1741 +#: builtin/log.c:1752 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1745 +#: builtin/log.c:1756 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1747 +#: builtin/log.c:1758 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1749 +#: builtin/log.c:1760 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1750 +#: builtin/log.c:1761 msgid "sfx" msgstr "" -#: builtin/log.c:1751 +#: builtin/log.c:1762 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1753 +#: builtin/log.c:1764 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1755 +#: builtin/log.c:1766 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1760 +#: builtin/log.c:1460 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1762 +#: builtin/log.c:1773 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1763 +#: builtin/log.c:1774 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1766 +#: builtin/log.c:1463 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1768 +#: builtin/log.c:1779 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1771 +#: builtin/log.c:1782 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1774 +#: builtin/log.c:1785 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1776 +#: builtin/log.c:1787 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1778 +#: builtin/log.c:1789 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1780 +#: builtin/log.c:1791 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1782 +#: builtin/log.c:1793 msgid "Messaging" msgstr "" -#: builtin/log.c:1783 +#: builtin/log.c:1794 msgid "header" msgstr "" -#: builtin/log.c:1784 +#: builtin/log.c:1795 msgid "add email header" msgstr "" -#: builtin/log.c:1785 builtin/log.c:1786 +#: builtin/log.c:1796 builtin/log.c:1797 msgid "email" msgstr "" -#: builtin/log.c:1785 +#: builtin/log.c:1796 msgid "add To: header" msgstr "" -#: builtin/log.c:1786 +#: builtin/log.c:1797 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1787 +#: builtin/log.c:1798 msgid "ident" msgstr "" -#: builtin/log.c:1788 +#: builtin/log.c:1799 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1790 +#: builtin/log.c:1801 msgid "message-id" msgstr "" -#: builtin/log.c:1791 +#: builtin/log.c:1802 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1792 builtin/log.c:1795 +#: builtin/log.c:1803 builtin/log.c:1806 msgid "boundary" msgstr "" -#: builtin/log.c:1793 +#: builtin/log.c:1804 msgid "attach the patch" msgstr "" -#: builtin/log.c:1796 +#: builtin/log.c:1807 msgid "inline the patch" msgstr "" -#: builtin/log.c:1800 +#: builtin/log.c:1811 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1802 +#: builtin/log.c:1813 msgid "signature" msgstr "" -#: builtin/log.c:1803 +#: builtin/log.c:1814 msgid "add a signature" msgstr "" -#: builtin/log.c:1804 +#: builtin/log.c:1815 msgid "base-commit" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1816 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1808 +#: builtin/log.c:1819 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1809 +#: builtin/log.c:1820 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1811 +#: builtin/log.c:1822 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1813 +#: builtin/log.c:1824 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1816 +#: builtin/log.c:1827 msgid "show changes against in cover letter or single patch" msgstr "" -#: builtin/log.c:1818 +#: builtin/log.c:1829 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1904 +#: builtin/log.c:1916 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1919 +#: builtin/log.c:1931 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1921 +#: builtin/log.c:1933 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1929 +#: builtin/log.c:1941 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1931 +#: builtin/log.c:1943 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1933 +#: builtin/log.c:1945 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1854 +#: builtin/log.c:1646 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:2078 +#: builtin/log.c:2089 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2082 +#: builtin/log.c:2093 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2083 +#: builtin/log.c:2094 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2089 +#: builtin/log.c:2100 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2093 +#: builtin/log.c:2104 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2101 +#: builtin/log.c:2112 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2102 +#: builtin/log.c:2113 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2113 +#: builtin/log.c:2124 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2149 +#: builtin/log.c:2160 msgid "Generating patches" msgstr "" -#: builtin/log.c:2193 +#: builtin/log.c:2204 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2252 +#: builtin/log.c:2263 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:2306 +#: builtin/log.c:2317 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/ls-files.c:486 +#: builtin/ls-files.c:561 msgid "git ls-files [] [...]" msgstr "" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:617 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:619 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:621 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:623 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:625 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:627 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:629 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:631 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:634 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:636 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:638 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:640 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:642 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:645 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:572 +#: builtin/ls-files.c:647 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:649 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:654 msgid "exclude patterns are read from " msgstr "" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:655 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:582 +#: builtin/ls-files.c:657 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:586 +#: builtin/ls-files.c:661 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:589 +#: builtin/ls-files.c:664 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:591 +#: builtin/ls-files.c:666 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:592 +#: builtin/ls-files.c:667 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:593 +#: builtin/ls-files.c:668 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:595 +#: builtin/ls-files.c:670 msgid "show debugging data" msgstr "" @@ -14522,7 +14533,7 @@ msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1103 msgid "exec" msgstr "" @@ -14590,378 +14601,378 @@ msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" -#: builtin/mailsplit.c:241 +#: builtin/mailsplit.c:239 #, c-format msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge [] [...]" msgstr "" -#: builtin/merge.c:59 +#: builtin/merge.c:50 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:60 +#: builtin/merge.c:51 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:123 +#: builtin/merge.c:124 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:206 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:256 builtin/pull.c:133 +#: builtin/merge.c:257 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:259 builtin/pull.c:136 +#: builtin/merge.c:260 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:260 builtin/pull.c:139 +#: builtin/merge.c:261 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:262 builtin/pull.c:142 +#: builtin/merge.c:263 builtin/pull.c:143 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:148 +#: builtin/merge.c:266 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:151 +#: builtin/merge.c:268 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:154 +#: builtin/merge.c:270 builtin/pull.c:155 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:273 builtin/pull.c:161 +#: builtin/merge.c:274 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:277 builtin/pull.c:164 +#: builtin/merge.c:278 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 +#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:279 builtin/pull.c:169 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:280 builtin/pull.c:172 +#: builtin/merge.c:281 builtin/pull.c:176 msgid "option=value" msgstr "" -#: builtin/merge.c:281 builtin/pull.c:173 +#: builtin/merge.c:282 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:283 +#: builtin/merge.c:284 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:292 +#: builtin/merge.c:293 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:294 +#: builtin/merge.c:295 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:296 builtin/pull.c:180 +#: builtin/merge.c:297 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:303 +#: builtin/merge.c:304 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:320 +#: builtin/merge.c:321 msgid "could not run stash." msgstr "" -#: builtin/merge.c:325 +#: builtin/merge.c:326 msgid "stash failed" msgstr "" -#: builtin/merge.c:330 +#: builtin/merge.c:331 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:352 builtin/merge.c:369 +#: builtin/merge.c:353 builtin/merge.c:370 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:399 +#: builtin/merge.c:345 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:410 +#: builtin/merge.c:415 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:460 +#: builtin/merge.c:465 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:511 +#: builtin/merge.c:515 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:598 +#: builtin/merge.c:603 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:724 +#: builtin/merge.c:730 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:742 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:808 +#: builtin/merge.c:814 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:817 +#: builtin/merge.c:823 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:823 +#: builtin/merge.c:829 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -#: builtin/merge.c:828 +#: builtin/merge.c:834 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:831 +#: builtin/merge.c:837 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:884 +#: builtin/merge.c:892 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:899 +#: builtin/merge.c:907 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:960 +#: builtin/merge.c:968 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:999 +#: builtin/merge.c:1007 msgid "No current branch." msgstr "" -#: builtin/merge.c:1001 +#: builtin/merge.c:1009 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1003 +#: builtin/merge.c:1011 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1008 +#: builtin/merge.c:1016 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1065 +#: builtin/merge.c:1073 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1168 +#: builtin/merge.c:1174 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1202 +#: builtin/merge.c:1208 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1312 +#: builtin/merge.c:1321 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1316 +#: builtin/merge.c:1325 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1343 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1347 +#: builtin/merge.c:1356 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1351 +#: builtin/merge.c:1360 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1367 +#: builtin/merge.c:1376 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1374 +#: builtin/merge.c:1383 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1377 +#: builtin/merge.c:1386 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1391 +#: builtin/merge.c:1400 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1393 +#: builtin/merge.c:1402 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1409 +#: builtin/merge.c:1418 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1426 +#: builtin/merge.c:1435 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1428 +#: builtin/merge.c:1437 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1433 +#: builtin/merge.c:1442 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1435 +#: builtin/merge.c:1444 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1516 +#: builtin/merge.c:1531 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1525 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1535 +#: builtin/merge.c:1550 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1581 +#: builtin/merge.c:1598 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1588 +#: builtin/merge.c:1605 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1613 +#: builtin/merge.c:1495 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1619 +#: advice.c:217 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1647 builtin/merge.c:1712 +#: builtin/merge.c:1664 builtin/merge.c:1730 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1651 +#: builtin/merge.c:1668 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1703 +#: builtin/merge.c:1720 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1705 +#: builtin/merge.c:1722 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1714 +#: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1728 +#: builtin/merge.c:1746 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15097,20 +15108,20 @@ "size=)" msgstr "" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:57 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:202 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 -#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 -#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 -#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 +#: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 +#: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 +#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 +#: builtin/prune-packed.c:25 builtin/tag.c:587 msgid "too many arguments" msgstr "" @@ -15118,7 +15129,7 @@ msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:69 +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -15149,68 +15160,68 @@ msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:170 +#: builtin/mv.c:172 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:181 +#: builtin/mv.c:184 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:185 +#: builtin/mv.c:190 msgid "bad source" msgstr "" -#: builtin/mv.c:188 +#: builtin/mv.c:193 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:191 +#: builtin/mv.c:196 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:200 +#: builtin/mv.c:205 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:225 +#: builtin/mv.c:231 msgid "not under version control" msgstr "" -#: builtin/mv.c:230 +#: builtin/mv.c:236 msgid "destination exists" msgstr "" -#: builtin/mv.c:238 +#: builtin/mv.c:244 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:241 +#: builtin/mv.c:247 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:244 +#: builtin/mv.c:250 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:246 +#: builtin/mv.c:252 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:253 +#: builtin/mv.c:280 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:274 +#: builtin/mv.c:308 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -15227,7 +15238,7 @@ msgid "git name-rev [] --stdin" msgstr "" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "" @@ -15382,47 +15393,47 @@ msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:197 +#: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:206 +#: builtin/notes.c:204 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:208 +#: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:565 +#: builtin/notes.c:240 builtin/tag.c:577 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 -#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 +#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313 +#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524 +#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:265 +#: builtin/notes.c:263 #, c-format msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:268 +#: builtin/notes.c:266 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:309 +#: builtin/notes.c:307 #, c-format msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:324 +#: builtin/notes.c:322 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "" @@ -15430,185 +15441,185 @@ #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:356 +#: builtin/notes.c:354 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 +#: builtin/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 msgid "too many parameters" msgstr "" -#: builtin/notes.c:389 builtin/notes.c:678 +#: builtin/notes.c:387 builtin/notes.c:676 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:410 builtin/notes.c:576 +#: builtin/notes.c:408 builtin/notes.c:574 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:413 builtin/notes.c:579 +#: builtin/notes.c:411 builtin/notes.c:577 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:416 builtin/notes.c:582 +#: builtin/notes.c:414 builtin/notes.c:580 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:419 builtin/notes.c:585 +#: builtin/notes.c:417 builtin/notes.c:583 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:422 builtin/notes.c:588 +#: builtin/notes.c:420 builtin/notes.c:586 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:423 builtin/notes.c:496 +#: builtin/notes.c:421 builtin/notes.c:494 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:448 +#: builtin/notes.c:446 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:463 builtin/notes.c:544 +#: builtin/notes.c:461 builtin/notes.c:542 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:497 +#: builtin/notes.c:495 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:499 +#: builtin/notes.c:497 msgid "load rewriting config for (implies --stdin)" msgstr "" -#: builtin/notes.c:517 +#: builtin/notes.c:508 msgid "too few parameters" msgstr "" -#: builtin/notes.c:538 +#: builtin/notes.c:536 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:550 +#: builtin/notes.c:548 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:603 +#: builtin/notes.c:601 #, 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:698 +#: builtin/notes.c:696 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:700 +#: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:702 +#: builtin/notes.c:700 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:722 +#: builtin/notes.c:720 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:724 +#: builtin/notes.c:722 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:726 +#: builtin/notes.c:724 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:739 +#: builtin/notes.c:737 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:742 +#: builtin/notes.c:740 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:768 +#: builtin/notes.c:766 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:784 +#: builtin/notes.c:782 msgid "General options" msgstr "" -#: builtin/notes.c:786 +#: builtin/notes.c:784 msgid "Merge options" msgstr "" -#: builtin/notes.c:788 +#: builtin/notes.c:786 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "" -#: builtin/notes.c:790 +#: builtin/notes.c:788 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:792 +#: builtin/notes.c:790 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:794 +#: builtin/notes.c:792 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:796 +#: builtin/notes.c:794 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:807 +#: builtin/notes.c:805 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:812 +#: builtin/notes.c:810 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:836 +#: builtin/notes.c:834 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:871 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:876 +#: builtin/notes.c:874 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:878 +#: builtin/notes.c:876 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -15616,71 +15627,71 @@ "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:578 +#: builtin/notes.c:895 builtin/tag.c:590 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:900 +#: builtin/notes.c:898 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:912 +#: builtin/notes.c:910 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:915 +#: builtin/notes.c:913 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 +#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:955 +#: builtin/notes.c:953 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:998 +#: builtin/notes.c:996 msgid "notes-ref" msgstr "" -#: builtin/notes.c:999 +#: builtin/notes.c:997 msgid "use notes from " msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1671 +#: builtin/notes.c:1032 builtin/stash.c:1752 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:182 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:55 +#: builtin/pack-objects.c:183 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:448 +#: builtin/pack-objects.c:580 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:459 +#: builtin/pack-objects.c:591 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:590 +#: builtin/pack-objects.c:722 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:941 #, c-format msgid "ordered %u objects, expected %" msgstr "" @@ -15703,315 +15714,315 @@ msgid "unable to read from reused packfile" msgstr "" -#: builtin/pack-objects.c:1015 +#: builtin/pack-objects.c:1160 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:1028 +#: builtin/pack-objects.c:1173 msgid "Writing objects" msgstr "Zapisivanje objekata" -#: builtin/pack-objects.c:1089 builtin/update-index.c:90 +#: builtin/pack-objects.c:1235 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1141 +#: builtin/pack-objects.c:1294 #, c-format msgid "wrote % objects while expecting %" msgstr "" -#: builtin/pack-objects.c:1358 +#: builtin/pack-objects.c:1536 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1806 +#: builtin/pack-objects.c:1984 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1815 +#: builtin/pack-objects.c:1993 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2096 +#: builtin/pack-objects.c:2274 msgid "Counting objects" msgstr "Prebrojavanje objekata" -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 +#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "" -#: builtin/pack-objects.c:2241 +#: builtin/pack-objects.c:2439 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 -#: builtin/pack-objects.c:2337 +#: builtin/pack-objects.c:2509 builtin/pack-objects.c:2525 +#: builtin/pack-objects.c:2535 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2512 builtin/pack-objects.c:2539 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "" -#: builtin/pack-objects.c:2351 +#: builtin/pack-objects.c:2549 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2666 +#: builtin/pack-objects.c:2864 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta sažimanje upoterebom %d cpu jezgri" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:3003 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:3089 msgid "Compressing objects" msgstr "Sažimanje objekata" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:3095 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:3008 +#: builtin/pack-objects.c:3408 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3414 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3112 +#: builtin/pack-objects.c:3507 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3532 builtin/pack-objects.c:3619 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3202 +#: builtin/pack-objects.c:3541 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3627 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3380 +#: builtin/pack-objects.c:3757 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3760 builtin/rev-parse.c:1061 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3408 +#: builtin/pack-objects.c:3788 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3841 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3465 +#: builtin/pack-objects.c:3845 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3503 +#: builtin/pack-objects.c:3884 msgid "[,]" msgstr "" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3885 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3888 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3890 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3892 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3894 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3896 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3898 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3900 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3902 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3904 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3906 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3908 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3529 +#: builtin/pack-objects.c:3910 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3912 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3915 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3537 +#: builtin/pack-objects.c:3918 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3540 +#: builtin/pack-objects.c:3921 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3926 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3928 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3930 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3932 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3934 msgid "unpack unreachable objects newer than