diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apparmor-parser.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apparmor-parser.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apparmor-parser.po 2020-01-23 16:55:08.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apparmor-parser.po 2020-07-08 13:57:18.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: 2020-01-23 11:40+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../parser_include.c:113 ../parser_include.c:111 msgid "Error: Out of memory.\n" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apparmor-utils.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apparmor-utils.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apparmor-utils.po 1970-01-01 00:00:00.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apparmor-utils.po 2020-07-08 13:57:17.000000000 +0000 @@ -0,0 +1,1261 @@ +# Afrikaans translation for apparmor +# Copyright (c) 2020 Rosetta Contributors and Canonical Ltd 2020 +# This file is distributed under the same license as the apparmor package. +# FIRST AUTHOR , 2020. +# +msgid "" +msgstr "" +"Project-Id-Version: apparmor\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2014-09-14 19:29+0530\n" +"PO-Revision-Date: 2020-03-05 01:48+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Afrikaans \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" + +#: ../aa-genprof:56 +msgid "Generate profile for the given program" +msgstr "Genereer profiel vir die gegewe programe" + +#: ../aa-genprof:57 ../aa-logprof:25 ../aa-cleanprof:24 ../aa-mergeprof:34 +#: ../aa-autodep:25 ../aa-audit:25 ../aa-complain:24 ../aa-enforce:24 +#: ../aa-disable:24 +msgid "path to profiles" +msgstr "pad- om profiele" + +#: ../aa-genprof:58 ../aa-logprof:26 +msgid "path to logfile" +msgstr "pad na loglêer" + +#: ../aa-genprof:59 +msgid "name of program to profile" +msgstr "naam van program na profiel" + +#: ../aa-genprof:69 ../aa-logprof:37 +#, python-format +msgid "The logfile %s does not exist. Please check the path" +msgstr "Die loglêer %s bestaan nie. Tjek asseblief die -pad" + +#: ../aa-genprof:75 ../aa-logprof:43 ../aa-unconfined:36 +msgid "" +"It seems AppArmor was not started. Please enable AppArmor and try again." +msgstr "" +"Dit lyk AppArmor was nie begin het. Aktiveer asseblief AppArmor en probeer " +"weer." + +#: ../aa-genprof:80 ../aa-mergeprof:47 +#, python-format +msgid "%s is not a directory." +msgstr "%s is nie 'n gids." + +#: ../aa-genprof:94 +#, python-format +msgid "" +"Can't find %(profiling)s in the system path list. If the name of the " +"application\n" +"is correct, please run 'which %(profiling)s' as a user with correct PATH\n" +"environment set up in order to find the fully-qualified path and\n" +"use the full path as parameter." +msgstr "" +"Kan nie vind %(profiling)s in die stelselpadlys. Indien die naam van die " +"aansoek is korrek, asseblief hardloop 'which %(profiling)s' as gebruiker met " +"korrekte PATH\n" +"omgewing opgestel in orde om die volle gekwalifiseerde pad te vind en\n" +"gebruik die volledige pad as parameter." + +#: ../aa-genprof:96 +#, python-format +msgid "%s does not exists, please double-check the path." +msgstr "%s nie bestaan, dubbel-tjek die pad." + +#: ../aa-genprof:124 +msgid "" +"\n" +"Before you begin, you may wish to check if a\n" +"profile already exists for the application you\n" +"wish to confine. See the following wiki page for\n" +"more information:" +msgstr "" +"\n" +"Voor jy begin, jy mag wens om tjek indien 'n\n" +"profiel bestaan ​​reeds vir die toepassing wat jy\n" +"wens om confine. Sien die volgende wiki bladsy vir\n" +"meer inligting:" + +#: ../aa-genprof:126 +msgid "" +"Please start the application to be profiled in\n" +"another window and exercise its functionality now.\n" +"\n" +"Once completed, select the \"Scan\" option below in \n" +"order to scan the system logs for AppArmor events. \n" +"\n" +"For each AppArmor event, you will be given the \n" +"opportunity to choose whether the access should be \n" +"allowed or denied." +msgstr "" +"Begin asseblief die aansoek om geprofileer te word in\n" +"'n ander venster en uitoefening funksionaliteit daarvan nou.\n" +"\n" +"Sodra dit voltooi is, kies die \"Scan\" opsie hieronder in \n" +"orde om skandering die die stelsel logs vir AppArmor gebeurtenise. \n" +"\n" +"Vir elke AppArmor gebeurtenis, jy sal gegee word om die \n" +"geleentheid om te kies whether die toegang behoort te wees \n" +"toegelaat of geweier." + +#: ../aa-genprof:147 +msgid "Profiling" +msgstr "Profilering" + +#: ../aa-genprof:165 +msgid "" +"\n" +"Reloaded AppArmor profiles in enforce mode." +msgstr "" +"\n" +"Weer gelaai AppArmor profiele in afdwing modus." + +#: ../aa-genprof:166 +msgid "" +"\n" +"Please consider contributing your new profile!\n" +"See the following wiki page for more information:" +msgstr "" +"\n" +"Oorweeg asseblief bydraende jou nuwe profiel!\n" +"Sien die volgende wiki bladsy vir meer inligting:" + +#: ../aa-genprof:167 +#, python-format +msgid "Finished generating profile for %s." +msgstr "Afgewerkte genererende profiel vir %s." + +#: ../aa-logprof:24 +msgid "Process log entries to generate profiles" +msgstr "Proses log inskrywings om profiele te genereer" + +#: ../aa-logprof:27 +msgid "mark in the log to start processing after" +msgstr "merk in die log te begin met die verwerking na" + +#: ../aa-cleanprof:23 +msgid "Cleanup the profiles for the given programs" +msgstr "Maak skoon die profiele vir die gegewe programme" + +#: ../aa-cleanprof:25 ../aa-autodep:26 ../aa-audit:27 ../aa-complain:25 +#: ../aa-enforce:25 ../aa-disable:25 +msgid "name of program" +msgstr "naam van programe" + +#: ../aa-cleanprof:26 +msgid "Silently overwrite with a clean profile" +msgstr "Oorskryf stilweg met 'n skoon profiel" + +#: ../aa-mergeprof:29 +msgid "Perform a 2-way or 3-way merge on the given profiles" +msgstr "Presteer 'n 2-manier of 3-manier saamsmelt op die gegewe profiele" + +#: ../aa-mergeprof:31 +msgid "your profile" +msgstr "jou profiel" + +#: ../aa-mergeprof:32 +msgid "base profile" +msgstr "base profiel" + +#: ../aa-mergeprof:33 +msgid "other profile" +msgstr "ander profiel" + +#: ../aa-mergeprof:67 ../apparmor/aa.py:2345 +msgid "" +"The following local profiles were changed. Would you like to save them?" +msgstr "Die volgende plaaslike profiele is verander. Wil jy hulle red?" + +#: ../aa-mergeprof:148 ../aa-mergeprof:430 ../apparmor/aa.py:1767 +msgid "Path" +msgstr "Pad" + +#: ../aa-mergeprof:149 +msgid "Select the appropriate mode" +msgstr "Kies die toepaslike modus" + +#: ../aa-mergeprof:166 +msgid "Unknown selection" +msgstr "Onbekend seleksie" + +#: ../aa-mergeprof:183 ../aa-mergeprof:209 +msgid "File includes" +msgstr "Lêer sluit in" + +#: ../aa-mergeprof:183 ../aa-mergeprof:209 +msgid "Select the ones you wish to add" +msgstr "Seleksie die wat jy wil byvoeg" + +#: ../aa-mergeprof:195 ../aa-mergeprof:222 +#, python-format +msgid "Adding %s to the file." +msgstr "Toevoeging van %s na die lêer." + +#: ../aa-mergeprof:199 ../apparmor/aa.py:2258 +msgid "unknown" +msgstr "onbekend" + +#: ../aa-mergeprof:224 ../aa-mergeprof:275 ../aa-mergeprof:516 +#: ../aa-mergeprof:558 ../aa-mergeprof:675 ../apparmor/aa.py:1620 +#: ../apparmor/aa.py:1859 ../apparmor/aa.py:1899 ../apparmor/aa.py:2012 +#, python-format +msgid "Deleted %s previous matching profile entries." +msgstr "Geskrap %s vorige ooreenstemmende profiel inskrywings." + +#: ../aa-mergeprof:244 ../aa-mergeprof:429 ../aa-mergeprof:629 +#: ../aa-mergeprof:656 ../apparmor/aa.py:992 ../apparmor/aa.py:1252 +#: ../apparmor/aa.py:1562 ../apparmor/aa.py:1603 ../apparmor/aa.py:1766 +#: ../apparmor/aa.py:1958 ../apparmor/aa.py:1994 +msgid "Profile" +msgstr "Profiel" + +#: ../aa-mergeprof:245 ../apparmor/aa.py:1563 ../apparmor/aa.py:1604 +msgid "Capability" +msgstr "Capvermoë" + +#: ../aa-mergeprof:246 ../aa-mergeprof:480 ../apparmor/aa.py:1258 +#: ../apparmor/aa.py:1564 ../apparmor/aa.py:1605 ../apparmor/aa.py:1817 +msgid "Severity" +msgstr "Ernstigheidsgraad" + +#: ../aa-mergeprof:273 ../aa-mergeprof:514 ../apparmor/aa.py:1618 +#: ../apparmor/aa.py:1857 +#, python-format +msgid "Adding %s to profile." +msgstr "Toevoeging van %s na profiel." + +#: ../aa-mergeprof:282 ../apparmor/aa.py:1627 +#, python-format +msgid "Adding capability %s to profile." +msgstr "Die capvermoë %s by profiel gevoeg." + +#: ../aa-mergeprof:289 ../apparmor/aa.py:1634 +#, python-format +msgid "Denying capability %s to profile." +msgstr "Weier die capvermoë %s om te profiel." + +#: ../aa-mergeprof:439 ../aa-mergeprof:470 ../apparmor/aa.py:1776 +#: ../apparmor/aa.py:1807 +msgid "(owner permissions off)" +msgstr "(toestemmings vir eienaars af)" + +#: ../aa-mergeprof:444 ../apparmor/aa.py:1781 +msgid "(force new perms to owner)" +msgstr "(dwing nuwe permitte aan die eienaar)" + +#: ../aa-mergeprof:447 ../apparmor/aa.py:1784 +msgid "(force all rule perms to owner)" +msgstr "(Dwing alle heerskappy perms om eienaar)" + +#: ../aa-mergeprof:459 ../apparmor/aa.py:1796 +msgid "Old Mode" +msgstr "Ou Modus" + +#: ../aa-mergeprof:460 ../apparmor/aa.py:1797 +msgid "New Mode" +msgstr "Nuwe Modus" + +#: ../aa-mergeprof:475 ../apparmor/aa.py:1812 +msgid "(force perms to owner)" +msgstr "(dwing perms aan eienaar)" + +#: ../aa-mergeprof:478 ../apparmor/aa.py:1815 +msgid "Mode" +msgstr "Modus" + +#: ../aa-mergeprof:556 +#, python-format +msgid "Adding %(path)s %(mod)s to profile" +msgstr "Toevoeging %(path)s %(mod)s om profiel" + +#: ../aa-mergeprof:574 ../apparmor/aa.py:1915 +msgid "Enter new path: " +msgstr "Voer nuwe pad in: " + +#: ../aa-mergeprof:630 ../aa-mergeprof:657 ../apparmor/aa.py:1959 +#: ../apparmor/aa.py:1995 +msgid "Network Family" +msgstr "Netwerk Familie" + +#: ../aa-mergeprof:631 ../aa-mergeprof:658 ../apparmor/aa.py:1960 +#: ../apparmor/aa.py:1996 +msgid "Socket Type" +msgstr "Socket Tipe" + +#: ../aa-mergeprof:673 ../apparmor/aa.py:2010 +#, python-format +msgid "Adding %s to profile" +msgstr "Voeg %s by profiel" + +#: ../aa-mergeprof:683 ../apparmor/aa.py:2020 +#, python-format +msgid "Adding network access %(family)s %(type)s to profile." +msgstr "Voeg netwerk toegang %(family)s %(type)s na profiel." + +#: ../aa-mergeprof:689 ../apparmor/aa.py:2026 +#, python-format +msgid "Denying network access %(family)s %(type)s to profile" +msgstr "Ontken netwerk toegang %(family)s %(type)s na profiel" + +#: ../aa-autodep:23 +msgid "Generate a basic AppArmor profile by guessing requirements" +msgstr "Genereer 'n basiese AppArmor profiel deur raai van vereistes" + +#: ../aa-autodep:24 +msgid "overwrite existing profile" +msgstr "Oorskryf bestaande profiel" + +#: ../aa-audit:24 +msgid "Switch the given programs to audit mode" +msgstr "Skakelaar die gegewe programme om oudit modus" + +#: ../aa-audit:26 +msgid "remove audit mode" +msgstr "verwyder oudit modus" + +#: ../aa-audit:28 +msgid "Show full trace" +msgstr "Wys volle spore" + +#: ../aa-complain:23 +msgid "Switch the given program to complain mode" +msgstr "Skakelaar die gegewe programe om te kla modus" + +#: ../aa-enforce:23 +msgid "Switch the given program to enforce mode" +msgstr "Skakelaar die gegewe programe om afdwing modus" + +#: ../aa-disable:23 +msgid "Disable the profile for the given programs" +msgstr "Deaktiveer die profiel vir die gegewe programes" + +#: ../aa-unconfined:28 +msgid "Lists unconfined processes having tcp or udp ports" +msgstr "Lys unconfined prosesse met tcp of udp poorte" + +#: ../aa-unconfined:29 +msgid "scan all processes from /proc" +msgstr "skandeer alle prosesse vanaf / proc" + +#: ../aa-unconfined:81 +#, python-format +msgid "%(pid)s %(program)s (%(commandline)s) not confined" +msgstr "%(pid)s %(program)s (%(commandline)s) nie confined" + +#: ../aa-unconfined:85 +#, python-format +msgid "%(pid)s %(program)s%(pname)s not confined" +msgstr "%(pid)s %(program)s%(pname)s nie confined" + +#: ../aa-unconfined:90 +#, python-format +msgid "%(pid)s %(program)s (%(commandline)s) confined by '%(attribute)s'" +msgstr "%(pid)s %(program)s (%(commandline)s) confined deur '%(attribute)s'" + +#: ../aa-unconfined:94 +#, python-format +msgid "%(pid)s %(program)s%(pname)s confined by '%(attribute)s'" +msgstr "%(pid)s %(program)s%(pname)s confined deur '%(attribute)s'" + +#: ../apparmor/aa.py:196 +#, python-format +msgid "Followed too many links while resolving %s" +msgstr "Gevolg te veel links terwyl reoplossing %s" + +#: ../apparmor/aa.py:252 ../apparmor/aa.py:259 +#, python-format +msgid "Can't find %s" +msgstr "Kan nie vind %s" + +#: ../apparmor/aa.py:264 ../apparmor/aa.py:548 +#, python-format +msgid "Setting %s to complain mode." +msgstr "Instelling %s om kla modus." + +#: ../apparmor/aa.py:271 +#, python-format +msgid "Setting %s to enforce mode." +msgstr "Instellings %s om afdwing modus." + +#: ../apparmor/aa.py:286 +#, python-format +msgid "Unable to find basename for %s." +msgstr "Nie in staat om vind basenaam vir %s." + +#: ../apparmor/aa.py:301 +#, python-format +msgid "Could not create %(link)s symlink to %(filename)s." +msgstr "Kon skep nie %(link)s symlink om %(filename)s." + +#: ../apparmor/aa.py:314 +#, python-format +msgid "Unable to read first line from %s: File Not Found" +msgstr "Nie in staat om lees eerste reël vanaf %s: Lêer Nie Gevind" + +#: ../apparmor/aa.py:328 +#, python-format +msgid "" +"Unable to fork: %(program)s\n" +"\t%(error)s" +msgstr "" +"Nie in staat vurk: %(program)s\n" +"\t%(error)s" + +#: ../apparmor/aa.py:449 ../apparmor/ui.py:303 +msgid "" +"Are you sure you want to abandon this set of profile changes and exit?" +msgstr "" +"Is jy seker jy wil hierdie stel laat vaar van profiel wysigings en uitgang?" + +#: ../apparmor/aa.py:451 ../apparmor/ui.py:305 +msgid "Abandoning all changes." +msgstr "Laat vaar alle veranderinge." + +#: ../apparmor/aa.py:464 +msgid "Connecting to repository..." +msgstr "Konnekteer tans na bewaarplek..." + +#: ../apparmor/aa.py:470 +msgid "WARNING: Error fetching profiles from the repository" +msgstr "WAARSKUWING: Fout haal tans profiele van die repository" + +#: ../apparmor/aa.py:550 +#, python-format +msgid "Error activating profiles: %s" +msgstr "Fout aktiveer profiele: %s" + +#: ../apparmor/aa.py:605 +#, python-format +msgid "%s contains no profile" +msgstr "%s bevat geen profiel" + +#: ../apparmor/aa.py:706 +#, python-format +msgid "" +"WARNING: Error synchronizing profiles with the repository:\n" +"%s\n" +msgstr "" +"WAARSKUWING: Fout sinchronisasie profiele met die bewaarplek:\n" +"%s\n" + +#: ../apparmor/aa.py:744 +#, python-format +msgid "" +"WARNING: Error synchronizing profiles with the repository\n" +"%s" +msgstr "" +"WAARSKUWING: Fout sinchronisasie profiele met die bewaarplek\n" +"%s" + +#: ../apparmor/aa.py:832 ../apparmor/aa.py:883 +#, python-format +msgid "" +"WARNING: An error occurred while uploading the profile %(profile)s\n" +"%(ret)s" +msgstr "" +"WAARSKUWING: 'N fout tydens die oplaai van die profiel %(profile)s\n" +"%(ret)s" + +#: ../apparmor/aa.py:833 +msgid "Uploaded changes to repository." +msgstr "Opgelaaide verander na repository." + +#: ../apparmor/aa.py:865 +msgid "Changelog Entry: " +msgstr "Verander log inskrywing: " + +#: ../apparmor/aa.py:885 +msgid "" +"Repository Error\n" +"Registration or Signin was unsuccessful. User login\n" +"information is required to upload profiles to the repository.\n" +"These changes could not be sent." +msgstr "" +"Bewaarplek Fout\n" +"Registrasie of Inlog was onsuksesvol. Gebruiker aanmelding\n" +"inligting word benodig om profiele na die bewaarplek op te laai.\n" +"Hierdie veranderinge kon nie gestuur word nie." + +#: ../apparmor/aa.py:995 +msgid "Default Hat" +msgstr "Verstek Hoed" + +#: ../apparmor/aa.py:997 +msgid "Requested Hat" +msgstr "Aangevraagde Hoed" + +#: ../apparmor/aa.py:1218 +#, python-format +msgid "%s has transition name but not transition mode" +msgstr "%s het oorgangsnaam maar nie oorgangsmodus" + +#: ../apparmor/aa.py:1232 +#, python-format +msgid "Target profile exists: %s\n" +msgstr "Teiken profiel bestaan: %s\n" + +#: ../apparmor/aa.py:1254 +msgid "Program" +msgstr "Program" + +#: ../apparmor/aa.py:1257 +msgid "Execute" +msgstr "Teregstel" + +#: ../apparmor/aa.py:1287 +msgid "Are you specifying a transition to a local profile?" +msgstr "Is jy spesifiseer 'n oorgang na 'n plaaslike profiel?" + +#: ../apparmor/aa.py:1299 +msgid "Enter profile name to transition to: " +msgstr "Betree profiel naam om oorgang na: " + +#: ../apparmor/aa.py:1308 +msgid "" +"Should AppArmor sanitise the environment when\n" +"switching profiles?\n" +"\n" +"Sanitising environment is more secure,\n" +"but some applications depend on the presence\n" +"of LD_PRELOAD or LD_LIBRARY_PATH." +msgstr "" +"Behoort AppArmor sanitize die omgewing wanneer\n" +"oorskakel tans profiele?\n" +"\n" +"Sanitising omgewing is meer beveilig,\n" +"maar sommige toepassings hang af van die teenwoordigheid\n" +"van LD_PRELOAD or LD_LIBRARY_PATH." + +#: ../apparmor/aa.py:1310 +msgid "" +"Should AppArmor sanitise the environment when\n" +"switching profiles?\n" +"\n" +"Sanitising environment is more secure,\n" +"but this application appears to be using LD_PRELOAD\n" +"or LD_LIBRARY_PATH and sanitising the environment\n" +"could cause functionality problems." +msgstr "" +"Behoort AppArmor sanitize die omgewing wanneer\n" +"oorskakel tans profiele?\n" +"\n" +"Sanitising omgewing is meer beveilig,\n" +"maar hierdie toepassing verskyn om deur gebruik van LD_PRELOAD\n" +"of LD_LIBRARY_PATH en die omgewing te sanitiseer\n" +"kon funksionaliteit probleme- veroorsaak." + +#: ../apparmor/aa.py:1318 +#, python-format +msgid "" +"Launching processes in an unconfined state is a very\n" +"dangerous operation and can cause serious security holes.\n" +"\n" +"Are you absolutely certain you wish to remove all\n" +"AppArmor protection when executing %s ?" +msgstr "" +"Lancering tans prosesse in 'n unconfined staat is 'n heel\n" +"gevaarlike operasie en kan ernstige sekuriteitsgate veroorsaak.\n" +"\n" +"Is jy absoluut seker jy wil alle verwyder\n" +"AppArmor beskerming wanneer teregstel %s?" + +#: ../apparmor/aa.py:1320 +msgid "" +"Should AppArmor sanitise the environment when\n" +"running this program unconfined?\n" +"\n" +"Not sanitising the environment when unconfining\n" +"a program opens up significant security holes\n" +"and should be avoided if at all possible." +msgstr "" +"Behoort AppArmor sanitize die omgewing wanneer\n" +"hardlooping hierdie program unconfined?\n" +"\n" +"Nie sanitising die omgewing wanneer unconfining\n" +"'n program oop op beduidende sekuriteit gate\n" +"en behoort deur vermy indien enigsins moontlik." + +#: ../apparmor/aa.py:1396 ../apparmor/aa.py:1414 +#, python-format +msgid "" +"A profile for %s does not exist.\n" +"Do you want to create one?" +msgstr "" +"'N Profiel vir %s bestaan nie.\n" +"Wil jy om een te skep?" + +#: ../apparmor/aa.py:1523 +msgid "Complain-mode changes:" +msgstr "Klagte-modus veranderinge:" + +#: ../apparmor/aa.py:1525 +msgid "Enforce-mode changes:" +msgstr "Afdwing-modus veranderinge:" + +#: ../apparmor/aa.py:1528 +#, python-format +msgid "Invalid mode found: %s" +msgstr "Ongeldige modus gevind: %s" + +#: ../apparmor/aa.py:1897 +#, python-format +msgid "Adding %(path)s %(mode)s to profile" +msgstr "Byvoeg tans %(path)s %(mode)s om profiel" + +#: ../apparmor/aa.py:1918 +#, python-format +msgid "" +"The specified path does not match this log entry:\n" +"\n" +" Log Entry: %(path)s\n" +" Entered Path: %(ans)s\n" +"Do you really want to use this path?" +msgstr "" +"Die gespesifiseerde pad kom nie ooreen met dié log inskrywing:\n" +"\n" +" Log Inskrywing: %(path)s\n" +" Betreeed Pad: %(ans)s\n" +"Wil jy regtig hierdie pad gebruik?" + +#: ../apparmor/aa.py:2251 +#, python-format +msgid "Reading log entries from %s." +msgstr "Lees tans log inskrywings vanaf %s." + +#: ../apparmor/aa.py:2254 +#, python-format +msgid "Updating AppArmor profiles in %s." +msgstr "Opdatering tans van AppArmor profiele in %s." + +#: ../apparmor/aa.py:2323 +msgid "" +"Select which profile changes you would like to save to the\n" +"local profile set." +msgstr "" +"Selekteer watter profielveranderings jy aan wil stoor om die\n" +"plaaslike profiel stel." + +#: ../apparmor/aa.py:2324 +msgid "Local profile changes" +msgstr "Plaaslike profiel veranderinge" + +#: ../apparmor/aa.py:2418 +msgid "Profile Changes" +msgstr "Profiel Veranderinge" + +#: ../apparmor/aa.py:2428 +#, python-format +msgid "Can't find existing profile %s to compare changes." +msgstr "Kon nie bestaande profiel vind %s om vergelyk veranderinge." + +#: ../apparmor/aa.py:2566 ../apparmor/aa.py:2581 +#, python-format +msgid "Can't read AppArmor profiles in %s" +msgstr "Kon nie AppArmor profiele in lees %s" + +#: ../apparmor/aa.py:2677 +#, python-format +msgid "" +"%(profile)s profile in %(file)s contains syntax errors in line: %(line)s." +msgstr "" +"%(profile)s profiel in %(file)s bevat sintaks foute in lyn: %(line)s." + +#: ../apparmor/aa.py:2734 +#, python-format +msgid "" +"Syntax Error: Unexpected End of Profile reached in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwagte Einde van Profiel bereik in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:2749 +#, python-format +msgid "" +"Syntax Error: Unexpected capability entry found in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwagte capvermoë inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:2770 +#, python-format +msgid "" +"Syntax Error: Unexpected link entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwagte skakel inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:2798 +#, python-format +msgid "" +"Syntax Error: Unexpected change profile entry found in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwagte verandering profiel inskrywing gevind in lêer: " +"%(file)s lyn: %(line)s" + +#: ../apparmor/aa.py:2820 +#, python-format +msgid "" +"Syntax Error: Unexpected rlimit entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwagte rlimit inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:2831 +#, python-format +msgid "" +"Syntax Error: Unexpected boolean definition found in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwagte boolean definisie gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:2871 +#, python-format +msgid "" +"Syntax Error: Unexpected bare file rule found in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwagte kaal lêer reël gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:2894 +#, python-format +msgid "" +"Syntax Error: Unexpected path entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags pad inskrywing in lêer gevind: %(file)s lyn: %(line)s" + +#: ../apparmor/aa.py:2922 +#, python-format +msgid "Syntax Error: Invalid Regex %(path)s in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Ongeldige Regex %(path)s in lêer: %(file)s lyn: %(line)s" + +#: ../apparmor/aa.py:2925 +#, python-format +msgid "Invalid mode %(mode)s in file: %(file)s line: %(line)s" +msgstr "Ongeldige modus %(mode)s in lêer: %(file)s lyn: %(line)s" + +#: ../apparmor/aa.py:2977 +#, python-format +msgid "" +"Syntax Error: Unexpected network entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags netwerk inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3007 +#, python-format +msgid "" +"Syntax Error: Unexpected dbus entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags dbus inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3030 +#, python-format +msgid "" +"Syntax Error: Unexpected mount entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags monteer inskrywing in lêer gevind: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3052 +#, python-format +msgid "" +"Syntax Error: Unexpected signal entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags sein inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3074 +#, python-format +msgid "" +"Syntax Error: Unexpected ptrace entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags ptrace inskrywing gevind in lêer: %(file)s lyn " +"%(line)s" + +#: ../apparmor/aa.py:3096 +#, python-format +msgid "" +"Syntax Error: Unexpected pivot_root entry found in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwags pivot_root inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3118 +#, python-format +msgid "" +"Syntax Error: Unexpected unix entry found in file: %(file)s line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwags unix inskrywing gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3140 +#, python-format +msgid "" +"Syntax Error: Unexpected change hat declaration found in file: %(file)s " +"line: %(line)s" +msgstr "" +"Sintaks Fout: Onverwagte verander hoed deklarasie gevind in lêer: %(file)s " +"lyn: %(line)s" + +#: ../apparmor/aa.py:3152 +#, python-format +msgid "" +"Syntax Error: Unexpected hat definition found in file: %(file)s line: " +"%(line)s" +msgstr "" +"Sintaks Fout: Onverwagte hoed definisie gevind in lêer: %(file)s lyn: " +"%(line)s" + +#: ../apparmor/aa.py:3168 +#, python-format +msgid "Error: Multiple definitions for hat %(hat)s in profile %(profile)s." +msgstr "" +"Fout: Veelvuldige definisies vir hoed %(hat)s in profiel %(profile)s." + +#: ../apparmor/aa.py:3185 +#, python-format +msgid "Warning: invalid \"REPOSITORY:\" line in %s, ignoring." +msgstr "Waarskuwing: ongeldig \"REPOSITORY:\" lyn in %s, ignoreer tans." + +#: ../apparmor/aa.py:3198 +#, python-format +msgid "Syntax Error: Unknown line found in file: %(file)s line: %(line)s" +msgstr "Sintaks Fout: Onbekende lyn gevind in lêer: %(file)s lyn: %(line)s" + +#: ../apparmor/aa.py:3211 +#, python-format +msgid "" +"Syntax Error: Missing '}' or ','. Reached end of file %(file)s while inside " +"profile %(profile)s" +msgstr "" +"Sintaks Fout: Ontbreek '}' of ','. Bereikd einde van lêer %(file)s terwyl " +"binnekant profiel %(profile)s" + +#: ../apparmor/aa.py:3277 +#, python-format +msgid "Redefining existing variable %(variable)s: %(value)s in %(file)s" +msgstr "" +"Herdefiniëring bestaande veranderlike %(variable)s: %(value)s in %(file)s" + +#: ../apparmor/aa.py:3282 +#, python-format +msgid "" +"Values added to a non-existing variable %(variable)s: %(value)s in %(file)s" +msgstr "" +"Waardes bygevoeg tot a nie-bestaande veranderlike %(variable)s: %(value)s in " +"%(file)s" + +#: ../apparmor/aa.py:3284 +#, python-format +msgid "" +"Unknown variable operation %(operation)s for variable %(variable)s in " +"%(file)s" +msgstr "" +"Onbekende veranderlike bewerking %(operation)s vir veranderlike %(variable)s " +"in %(file)s" + +#: ../apparmor/aa.py:3343 +#, python-format +msgid "Invalid allow string: %(allow)s" +msgstr "Ongeldig toelaat string: %(allow)s" + +#: ../apparmor/aa.py:3778 +msgid "Can't find existing profile to modify" +msgstr "Kon nie bestaande profiel vind modify" + +#: ../apparmor/aa.py:4347 +#, python-format +msgid "Writing updated profile for %s." +msgstr "Skryf opgedateer profiel vir %s." + +#: ../apparmor/aa.py:4481 +#, python-format +msgid "File Not Found: %s" +msgstr "Lêer nie gevind: %s" + +#: ../apparmor/aa.py:4591 +#, python-format +msgid "" +"%s is currently marked as a program that should not have its own\n" +"profile. Usually, programs are marked this way if creating a profile for \n" +"them is likely to break the rest of the system. If you know what you're\n" +"doing and are certain you want to create a profile for this program, edit\n" +"the corresponding entry in the [qualifiers] section in " +"/etc/apparmor/logprof.conf." +msgstr "" +"%s is tans gemerk as 'n program wat nie sy eie moet hê\n" +"profiel. Gewoonlik, programme word op hierdie manier gemerk indien 'n " +"profiel vir \n" +"hulle sal waarskynlik die res van die stelsel breek. Indien jy weet wat jy\n" +"doen en sekere jy wil 'n profiel te skep vir hierdie program, wysig\n" +"die ooreenstemmende inskrywing in die [qualifiers] gedeelte in " +"/etc/apparmor/logprof.conf." + +#: ../apparmor/logparser.py:127 ../apparmor/logparser.py:132 +#, python-format +msgid "Log contains unknown mode %s" +msgstr "Log bevat onbekende modus %s" + +#: ../apparmor/tools.py:84 ../apparmor/tools.py:126 +#, python-format +msgid "" +"Can't find %(program)s in the system path list. If the name of the " +"application\n" +"is correct, please run 'which %(program)s' as a user with correct PATH\n" +"environment set up in order to find the fully-qualified path and\n" +"use the full path as parameter." +msgstr "" +"Kan nie vind %(program)s in die stelselpadlys. As die naam van die aansoek\n" +"is korrek, asseblief hardloop 'which %(program)s' as gebruiker met korrekte " +"PATH\n" +"omgewing opgestel ten einde om vind die volledig gekwalifiseerde pad en\n" +"gebruik die volledige pad as parameter." + +#: ../apparmor/tools.py:86 ../apparmor/tools.py:102 ../apparmor/tools.py:128 +#, python-format +msgid "%s does not exist, please double-check the path." +msgstr "%s bestaan nie, asseblief dubbel seker die pad." + +#: ../apparmor/tools.py:100 +msgid "" +"The given program cannot be found, please try with the fully qualified path " +"name of the program: " +msgstr "" +"Die gegewe programe kan nie gevind, probeer asseblief met die volledig " +"gekwalifiseerde pad naam van die program: " + +#: ../apparmor/tools.py:113 ../apparmor/tools.py:137 ../apparmor/tools.py:157 +#: ../apparmor/tools.py:175 ../apparmor/tools.py:193 +#, python-format +msgid "Profile for %s not found, skipping" +msgstr "Profiel vir %s nie gevind, oorslaan" + +#: ../apparmor/tools.py:140 +#, python-format +msgid "Disabling %s." +msgstr "Deaktiveer tans %s." + +#: ../apparmor/tools.py:198 +#, python-format +msgid "Setting %s to audit mode." +msgstr "Instelling %s om oudit modus." + +#: ../apparmor/tools.py:200 +#, python-format +msgid "Removing audit mode from %s." +msgstr "Verwyder tans oudit modus vanaf %s." + +#: ../apparmor/tools.py:212 +#, python-format +msgid "" +"Please pass an application to generate a profile for, not a profile itself - " +"skipping %s." +msgstr "" +"Asseblief slaag 'n program om 'n profiel vir, nie 'n profiel self - huppel " +"tans %s." + +#: ../apparmor/tools.py:220 +#, python-format +msgid "Profile for %s already exists - skipping." +msgstr "Profiel vir %s bestaan alreeds - huppel tans." + +#: ../apparmor/tools.py:232 +#, python-format +msgid "" +"\n" +"Deleted %s rules." +msgstr "" +"\n" +"Geskrap %s reëls." + +#: ../apparmor/tools.py:240 +#, python-format +msgid "" +"The local profile for %(program)s in file %(file)s was changed. Would you " +"like to save it?" +msgstr "" +"Die plaaslike profiel vir %(program)s in lêer %(file)s was verander. Sou jy " +"hou om dit stoor?" + +#: ../apparmor/tools.py:260 +#, python-format +msgid "The profile for %s does not exists. Nothing to clean." +msgstr "Die profiel vir %s doen nie bestaan. Niks om skoon maak." + +#: ../apparmor/ui.py:61 +msgid "Invalid hotkey for" +msgstr "Ongeldig hotkey vir" + +#: ../apparmor/ui.py:77 ../apparmor/ui.py:121 ../apparmor/ui.py:275 +msgid "(Y)es" +msgstr "(J)a" + +#: ../apparmor/ui.py:78 ../apparmor/ui.py:122 ../apparmor/ui.py:276 +msgid "(N)o" +msgstr "(G)een" + +#: ../apparmor/ui.py:123 +msgid "(C)ancel" +msgstr "(K)anselleer" + +#: ../apparmor/ui.py:223 +msgid "(A)llow" +msgstr "(T)oelaat" + +#: ../apparmor/ui.py:224 +msgid "(M)ore" +msgstr "(M)eer" + +#: ../apparmor/ui.py:225 +msgid "Audi(t)" +msgstr "Oudi(t)" + +#: ../apparmor/ui.py:226 +msgid "Audi(t) off" +msgstr "Oudi(t) af" + +#: ../apparmor/ui.py:227 +msgid "Audit (A)ll" +msgstr "Oudit (A)lle" + +#: ../apparmor/ui.py:229 +msgid "(O)wner permissions on" +msgstr "(E)ienaars toestemmings op" + +#: ../apparmor/ui.py:230 +msgid "(O)wner permissions off" +msgstr "(E)ienaars toestemmings af" + +#: ../apparmor/ui.py:231 +msgid "(D)eny" +msgstr "(O)ntken" + +#: ../apparmor/ui.py:232 +msgid "Abo(r)t" +msgstr "Abo(r)teer" + +#: ../apparmor/ui.py:233 +msgid "(F)inish" +msgstr "(A)fwerking" + +#: ../apparmor/ui.py:234 +msgid "(I)nherit" +msgstr "(B)eërwe" + +#: ../apparmor/ui.py:235 +msgid "(P)rofile" +msgstr "(P)rofiel" + +#: ../apparmor/ui.py:236 +msgid "(P)rofile Clean Exec" +msgstr "(P)rofiel Skoon Exec" + +#: ../apparmor/ui.py:237 +msgid "(C)hild" +msgstr "(K)ind" + +#: ../apparmor/ui.py:238 +msgid "(C)hild Clean Exec" +msgstr "(K)ind Skoon Exec" + +#: ../apparmor/ui.py:239 +msgid "(N)amed" +msgstr "(N)amed" + +#: ../apparmor/ui.py:240 +msgid "(N)amed Clean Exec" +msgstr "(N)amed Skoon Exec" + +#: ../apparmor/ui.py:241 +msgid "(U)nconfined" +msgstr "(U)nconfined" + +#: ../apparmor/ui.py:242 +msgid "(U)nconfined Clean Exec" +msgstr "(U)nconfined Skoon Exec" + +#: ../apparmor/ui.py:243 +msgid "(P)rofile Inherit" +msgstr "(P)rofiel Inherit" + +#: ../apparmor/ui.py:244 +msgid "(P)rofile Inherit Clean Exec" +msgstr "(P)rofiel Inherit Skoon Exec" + +#: ../apparmor/ui.py:245 +msgid "(C)hild Inherit" +msgstr "(K)ind Inherit" + +#: ../apparmor/ui.py:246 +msgid "(C)hild Inherit Clean Exec" +msgstr "(K)ind Inherit Skoon Exec" + +#: ../apparmor/ui.py:247 +msgid "(N)amed Inherit" +msgstr "(V)ernoem Inherit" + +#: ../apparmor/ui.py:248 +msgid "(N)amed Inherit Clean Exec" +msgstr "(V)ernoem Inherit Skoon Exec" + +#: ../apparmor/ui.py:249 +msgid "(X) ix On" +msgstr "(X) ix Op" + +#: ../apparmor/ui.py:250 +msgid "(X) ix Off" +msgstr "(X) ix Af" + +#: ../apparmor/ui.py:251 ../apparmor/ui.py:265 +msgid "(S)ave Changes" +msgstr "(S)toor Veranderinge" + +#: ../apparmor/ui.py:252 +msgid "(C)ontinue Profiling" +msgstr "(V)oortgaan Profilering" + +#: ../apparmor/ui.py:253 +msgid "(N)ew" +msgstr "(N)uwe" + +#: ../apparmor/ui.py:254 +msgid "(G)lob" +msgstr "(G)lob" + +#: ../apparmor/ui.py:255 +msgid "Glob with (E)xtension" +msgstr "Glob with (E)kstensie" + +#: ../apparmor/ui.py:256 +msgid "(A)dd Requested Hat" +msgstr "(V)oeg Gevraagde Hoed" + +#: ../apparmor/ui.py:257 +msgid "(U)se Default Hat" +msgstr "(G)ebruik Verstek Hoed" + +#: ../apparmor/ui.py:258 +msgid "(S)can system log for AppArmor events" +msgstr "(S)kandering stelsel log vir AppArmor gebeure" + +#: ../apparmor/ui.py:259 +msgid "(H)elp" +msgstr "(H)ulp" + +#: ../apparmor/ui.py:260 +msgid "(V)iew Profile" +msgstr "(B)esigtig Profiel" + +#: ../apparmor/ui.py:261 +msgid "(U)se Profile" +msgstr "(G)ebruik Profiel" + +#: ../apparmor/ui.py:262 +msgid "(C)reate New Profile" +msgstr "(S)kep Nuwe Profiel" + +#: ../apparmor/ui.py:263 +msgid "(U)pdate Profile" +msgstr "(O)pdateer Profiel" + +#: ../apparmor/ui.py:264 +msgid "(I)gnore Update" +msgstr "(I)gnoreer Opdatering" + +#: ../apparmor/ui.py:266 +msgid "Save Selec(t)ed Profile" +msgstr "Stoor Gekos(e) Profiel" + +#: ../apparmor/ui.py:267 +msgid "(U)pload Changes" +msgstr "(O)plaai Wysigings" + +#: ../apparmor/ui.py:268 +msgid "(V)iew Changes" +msgstr "(U)itsig Veranderinge" + +#: ../apparmor/ui.py:269 +msgid "View Changes b/w (C)lean profiles" +msgstr "Uitsig Veranderinge b/w (S)koon profiele" + +#: ../apparmor/ui.py:270 +msgid "(V)iew" +msgstr "(U)itsig" + +#: ../apparmor/ui.py:271 +msgid "(E)nable Repository" +msgstr "(A)ktiveer Bewaarplek" + +#: ../apparmor/ui.py:272 +msgid "(D)isable Repository" +msgstr "(D)eaktiveer Bewaarplek" + +#: ../apparmor/ui.py:273 +msgid "(N)ever Ask Again" +msgstr "(V)ra Nooit Weer" + +#: ../apparmor/ui.py:274 +msgid "Ask Me (L)ater" +msgstr "Vra My (L)ater" + +#: ../apparmor/ui.py:277 +msgid "Allow All (N)etwork" +msgstr "Toelaat Alle (N)etwerk" + +#: ../apparmor/ui.py:278 +msgid "Allow Network Fa(m)ily" +msgstr "Toelaat Netwerk Fa(m)ilie" + +#: ../apparmor/ui.py:279 +msgid "(O)verwrite Profile" +msgstr "(O)orskryf Profiel" + +#: ../apparmor/ui.py:280 +msgid "(K)eep Profile" +msgstr "(B)ewaar Profiel" + +#: ../apparmor/ui.py:281 +msgid "(C)ontinue" +msgstr "(V)oortgaan" + +#: ../apparmor/ui.py:282 +msgid "(I)gnore" +msgstr "(I)gnoreer" + +#: ../apparmor/ui.py:344 +#, python-format +msgid "PromptUser: Unknown command %s" +msgstr "VinnigeGebruiker: Onbekende bevel %s" + +#: ../apparmor/ui.py:351 +#, python-format +msgid "PromptUser: Duplicate hotkey for %(command)s: %(menutext)s " +msgstr "Prompt Gebruiker: Duplikaat sneltoets vir %(command)s: %(menutext)s " + +#: ../apparmor/ui.py:363 +msgid "PromptUser: Invalid hotkey in default item" +msgstr "PromptGebruiker: Ongeldige sneltoets in verstek item" + +#: ../apparmor/ui.py:368 +#, python-format +msgid "PromptUser: Invalid default %s" +msgstr "PromptGebruiker: Ongeldige verstek %s" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apport.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apport.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apport.po 2020-01-23 16:55:10.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apport.po 2020-07-08 13:57:19.000000000 +0000 @@ -7,735 +7,569 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2019-11-19 19:02+0000\n" +"POT-Creation-Date: 2020-05-21 13:29+0000\n" "PO-Revision-Date: 2010-06-28 19:25+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Afrikaans \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:30+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:144 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:144 -#: ../apport/ui.py:144 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 -msgid "This package does not seem to be installed correctly" -msgstr "Dit lyk nie asof hierdie pakket korrek geïnstalleer is nie" +#: ../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 "Raporteer 'n probleem..." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:149 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:149 -#: ../apport/ui.py:149 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:149 -#, python-format +#: ../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 "Rapporteer 'n wanfunksioneer aan die ontwikkelaars" + +#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "" +"Jou stelsel mag dalk nou onstabiel raak en dit kan nodig wees om herbegin." + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "Apport ineenstortingslêer" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 msgid "" -"This is not an official %s package. Please remove any third party package " -"and try again." +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." msgstr "" -"Dit is nie 'n amptelike %s pakket nie. Verwyder die pakket van derdepartye " -"en probeer weer." +"Hierdie het tydens 'n vorige opskort voorgekom en het verhoed dat die " +"stelsel hervatting ordentlik." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:166 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166 -#: ../apport/ui.py:166 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:166 -#, python-format +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 msgid "" -"You have some obsolete package versions installed. Please upgrade the " -"following packages and check if the problem still occurs:\n" -"\n" -"%s" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." msgstr "" -"Jy het enkele oortollige geïnstalleerde pakketweergawes. Opgradeer asseblief " -"die volgende pakkette en gaan daarna na of die probleem nogsteeds voorkom:\n" -"\n" -"%s" +"Dit het tydens 'n vorige winterslaap plaasgevind, en het verhoed dat die " +"stelsel hervatting ordentlik." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303 -#: ../apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 -msgid "unknown program" -msgstr "onbekende program" +#: ../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 "" +"Die hervat verwerking gehang baie naby die einde en sal het verskyn " +"normaalweg voltooi het." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:304 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304 -#: ../apport/ui.py:304 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 -#, python-format -msgid "Sorry, the program \"%s\" closed unexpectedly" -msgstr "Jammer, maar die program \"%s\" het onverwags afgesluit" +#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +msgid "Do not put the new traces into the report, but write them to stdout." +msgstr "" +"Moenie put die nuwe traces in te die verslag, maar skryf hulle aan stdout." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1427 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427 -#: ../apport/ui.py:306 ../apport/ui.py:1427 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1427 -#, python-format -msgid "Problem in %s" -msgstr "Probleem in %s" +#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 +msgid "" +"Start an interactive gdb session with the report's core dump (-o ignored; " +"does not rewrite report)" +msgstr "" +"Begin 'n interaktiewe gdb sessie af met die verslag se kern storting (-o " +"geïgnoreerd; herskryf nie verslag nie)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:307 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307 -#: ../apport/ui.py:307 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:307 +#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 msgid "" -"Your computer does not have enough free memory to automatically analyze the " -"problem and send a report to the developers." +"Write modified report to given file instead of changing the original report" msgstr "" -"Jou rekenaar beskik nie oor genoegsame ongebruikte geheue om die probleem " -"outomaties te analiseer en te raporteer aan die ontwikkelaars nie." +"Skryf gewysigde verslag na 'n gegewe lêer in plaas daarvan om die " +"oorspronklike verander verslag" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1403 -#: ../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:513 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1403 -#: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:513 -#: ../apport/ui.py:516 ../apport/ui.py:721 ../apport/ui.py:1233 -#: ../apport/ui.py:1399 ../apport/ui.py:1403 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1403 -msgid "Invalid problem report" -msgstr "Ongeldige foutverslag" +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +msgid "Remove the core dump from the report after stack trace regeneration" +msgstr "" +"Verwyder die kernstorting vanuit die verslag na die hergenerasie van die " +"stapelspoor" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:363 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363 -#: ../apport/ui.py:363 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 -msgid "You are not allowed to access this problem report." -msgstr "Jy is toegang geweier tot hierdie probleemverslag." +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +msgid "Override report's CoreFile" +msgstr "Oorskryf die verslag se Kernlêer" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:366 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366 -#: ../apport/ui.py:366 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:366 -msgid "Error" -msgstr "Fout" +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +msgid "Override report's ExecutablePath" +msgstr "Oorskryf die verslag se Uitvoerbare Pad" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367 -#: ../apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 -msgid "There is not enough disk space available to process this report." -msgstr "" -"Daar is nie genoeg beskikbare skyfspasie vir die verwerking van die verslag " -"nie." +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +msgid "Override report's ProcMaps" +msgstr "Oorskryf die verslag se ProcMaps" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:461 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:461 -#: ../apport/ui.py:461 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:461 -msgid "No package specified" -msgstr "Geen pakket gespesifiseer nie" +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +msgid "Rebuild report's Package information" +msgstr "Herbou die verslag se Pakket informasie" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:462 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:462 -#: ../apport/ui.py:462 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:462 +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 msgid "" -"You need to specify a package or a PID. See --help for more information." +"Build a temporary sandbox and download/install the necessary packages and " +"debug symbols in there; without this option it assumes that the necessary " +"packages and debug symbols are already installed in the system. The argument " +"points to the packaging system configuration base directory; if you specify " +"\"system\", it will use the system configuration files, but will then only " +"be able to retrace crashes that happened on the currently running release." msgstr "" -"Jy moet ', pakket of PID spesifiseer. Beskou --help vir meer inligting." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:491 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:491 -#: ../apport/ui.py:491 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 -msgid "Permission denied" -msgstr "Toestemming geweier" +"Bou 'n tydelike sandbox en aflaai/installeer die nodige pakkette en ontfout " +"simbole in daar; Sonder hierdie opsie aanvaar dit dat die nodige pakkette en " +"ontfout simbole reeds in die stelsel geïnstalleer is. Die argument dui op " +"die verpakking stelsel opset basis ditectory; As jy spesifiseer " +"\"stelsel\", sal dit die stelsel konfigurasie lêers gebruik, maar sal dan " +"net in staat wees om te herspoor omvalle wat gebeur het op die huidig " +"lopende vrystelling." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:492 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:492 -#: ../apport/ui.py:492 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492 +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 msgid "" -"The specified process does not belong to you. Please run this program as the " -"process owner or as root." +"Build another temporary sandbox for installing gdb and its dependencies " +"using the same release as the report rather than whatever version of gdb you " +"have installed." msgstr "" -"Die spesifieke proses behoort nie aan jou nie. Laat die program loop as " -"proseseienaar of as root." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:494 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:494 -#: ../apport/ui.py:405 ../apport/ui.py:494 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:494 -msgid "Invalid PID" -msgstr "Ongeldige PID" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:495 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:495 -#: ../apport/ui.py:495 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:495 -msgid "The specified process ID does not belong to a program." -msgstr "Die gespesifiseerde proses-ID behoort nie aan 'n program nie." +"Bou nog 'n tydelike sandbox vir die installering van gdb en sy afhanklikhede " +"met dieselfde vrystelling as die verslag eerder as wat die weergawe van gdb " +"jy geïnstalleer het." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:514 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:514 -#: ../apport/ui.py:514 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 -#, python-format -msgid "Symptom script %s did not determine an affected package" -msgstr "Simptometeks %s kon geen geaffekteerde pakket bepaal nie" +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +msgid "" +"Report download/install progress when installing packages into sandbox" +msgstr "" +"Verslag aflaai/installeer vordering wanneer die installering van pakkette in " +"sandbox" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:517 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:517 -#: ../apport/ui.py:517 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:517 -#, python-format -msgid "Package %s does not exist" -msgstr "Pakket %s bestaan nie" +#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 +msgid "Prepend timestamps to log messages, for batch operation" +msgstr "" +"Prepend tydstempels om boodskappe aan te teken, vir die bondel werking" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:738 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:738 -#: ../apport/ui.py:546 ../apport/ui.py:733 ../apport/ui.py:738 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:738 -msgid "Cannot create report" -msgstr "Kan nie verslag skep nie" +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +msgid "" +"Create and use third-party repositories from origins specified in reports" +msgstr "Skep en gebruik derde party repositories van oorsprong in verslae" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:623 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:623 -#: ../apport/ui.py:561 ../apport/ui.py:607 ../apport/ui.py:623 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:623 -msgid "Updating problem report" -msgstr "Opdateer probleemverslag" +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +msgid "Cache directory for packages downloaded in the sandbox" +msgstr "Kas gids vir pakkette afgelaai in die sandbox" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:562 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:562 -#: ../apport/ui.py:562 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:562 +#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 msgid "" -"You are not the reporter or subscriber of this problem report, or the report " -"is a duplicate or already closed.\n" -"\n" -"Please create a new report using \"apport-bug\"." +"Directory for unpacked packages. Future runs will assume that any already " +"downloaded package is also extracted to this sandbox." msgstr "" -"Jy is nie die raporteerder of intekenaar van hierdie probleemverslag nie, of " -"die verslag is 'n duplikaat of reeds afgesluit.\n" -"\n" -"Skep asseblief 'n nuwe verslag met behulp van \"apport-bug\"." +"Gids vir uitgepak pakkette. Toekomstige lopies sal aanvaar dat enige reeds " +"afgelaai pakket is ook onttrek om hierdie sandbox." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:571 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:571 -#: ../apport/ui.py:571 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:571 +#: ../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 "" -"You are not the reporter of this problem report. It is much easier to mark a " -"bug as a duplicate of another than to move your comments and attachments to " -"a new bug.\n" -"\n" -"Subsequently, we recommend that you file a new bug report using \"apport-" -"bug\" and make a comment in this bug about the one you file.\n" -"\n" -"Do you really want to proceed?" +"Install an extra package into the sandbox (can be specified multiple times)" msgstr "" -"Jy is nie die rapporteerder van hierdie probleemverslag nie. Dit is heelwat " -"makliker om 'n fout as duplikaat van 'n ander te merk as om jou kommentaar " -"en bylae te skuif na 'n nuwe fout." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:624 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:624 -#: ../apport/ui.py:608 ../apport/ui.py:624 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:624 -msgid "No additional information collected." -msgstr "Geen ekstra informasie versamel nie." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:675 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:675 -#: ../apport/ui.py:675 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:675 -msgid "What kind of problem do you want to report?" -msgstr "Watter tipe probleem probeer jy rapporteer?" +"Installeer 'n ekstra pakket in die sandbox (kan gespesifiseer word verskeie " +"kere)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:692 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:692 -#: ../apport/ui.py:692 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:692 -msgid "Unknown symptom" -msgstr "Onbekende simptoom" +#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 +msgid "" +"Path to a file with the crash database authentication information. This is " +"used when specifying a crash ID to upload the retraced stack traces (only if " +"neither -g, -o, nor -s are specified)" +msgstr "" +"Pad na 'n lêer met die ineenstortings databasis se ontentisering informasie. " +"Dit word gebruik as 'n crash ID ann oplaai van die retraced stapelspore " +"(slegs as nie een van -g, -o nie -s is gespesifiseer)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:693 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:693 -#: ../apport/ui.py:693 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:693 -#, python-format -msgid "The symptom \"%s\" is not known." -msgstr "Die simptoom \"%s\" is onbekend" +#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +msgid "" +"Display retraced stack traces and ask for confirmation before sending them " +"to the crash database." +msgstr "" +"Vertoon retraced stapelspore en vra vir bevestiging voordat hulle na die " +"ongelukdatabasis gestuur word." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:724 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:724 -#: ../apport/ui.py:724 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:724 +#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 msgid "" -"After closing this message please click on an application window to report a " -"problem about it." +"Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "" -"Nadat u hierdie boodskap gesluit het, klik op die toepassingsvenster om 'n " -"probleem daaroor te rapporteer." +"Pad na die gedupliseerde sqlite databasis(verstek: geen duplikaatkontrole " +"nie)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:739 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739 -#: ../apport/ui.py:734 ../apport/ui.py:739 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:739 -msgid "xprop failed to determine process ID of the window" -msgstr "xprop nagelaat om proses bepaal ID van die venster" +#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 +msgid "Do not add StacktraceSource to the report." +msgstr "Moenie StacktraceSource by die verslag voeg nie." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753 -#: ../apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:753 -msgid "%prog " -msgstr "%prog " +#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 +msgid "You cannot use -C without -S. Stopping." +msgstr "Jy kan nie gebruik -C sonder -S. Stop tans." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:755 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755 -#: ../apport/ui.py:755 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:755 -msgid "Specify package name." -msgstr "Spesifiseer pakket naam." +#. translators: don't translate y/n, apport currently only checks for "y" +#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115 +msgid "OK to send these as attachments? [y/n]" +msgstr "OK om stuur as bylaes? [y/n]" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:808 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:808 -#: ../apport/ui.py:757 ../apport/ui.py:808 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:808 -msgid "Add an extra tag to the report. Can be specified multiple times." -msgstr "" -"Voeg 'n ekstra tag by die verslag. Kan verskeie kere gespesifiseer word." +#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 +msgid "See man page for details." +msgstr "Sien die man bladsy vir besonderhede." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:787 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:787 -#: ../apport/ui.py:787 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 +#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 +msgid "specify the log file name produced by valgrind" +msgstr "Spesifiseer die log lêernaam wat deur valgrind" + +#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 msgid "" -"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" +"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " +"create it" msgstr "" -"%prog [opsies] [simptoom|pid|pakket|programroete|.apport/.crash lêer]" +"hergebruik 'n voorheen geskep sandbox systemapps (SDIR) of, indien dit nie " +"bestaan nie, skep dit" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:790 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:790 -#: ../apport/ui.py:790 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:790 +#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 msgid "" -"Start in bug filing mode. Requires --package and an optional --pid, or just " -"a --pid. If neither is given, display a list of known symptoms. (Implied if " -"a single argument is given.)" +"do not create or reuse a sandbox directory for additional debug symbols " +"but rely only on installed debug symbols." msgstr "" -"Begin in foutvaslegging modus. Vereis --pakket en 'n opsionele --pid, 0of " -"net 'n --pid. Indien geeneen verskaf word nie, vertoon 'n lys van bekende " -"simptome. (By implkasie dat 'n enkele argument gegewe is." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:792 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:792 -#: ../apport/ui.py:792 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:792 -msgid "Click a window as a target for filing a problem report." -msgstr "Klik 'n venster as teiken vir indiening 'n probleem verslag." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:794 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794 -#: ../apport/ui.py:794 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:794 -msgid "Start in bug updating mode. Can take an optional --package." -msgstr "Begin in foutopdatering modus. Kan 'n opsionele --pakket vat." +"moenie skep of hergebruik 'n sandbox gids vir addisionele ontfout simbole " +"maar net staatmaak op geïnstalleerde ontfout simbole." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:796 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:796 -#: ../apport/ui.py:796 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:796 +#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 msgid "" -"File a bug report about a symptom. (Implied if symptom name is given as only " -"argument.)" +"reuse a previously created cache dir (CDIR) or, if it does not exist, create " +"it" msgstr "" -"Handig 'n foutrapport in oor 'n simptoom. (By implikasie dat 'n stelselnaam " -"gegee word as die enigste argument.)" +"hergebruik 'n voorheen geskep kas systemapps (CDIR) of, indien dit nie " +"bestaan nie, skep dit" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:798 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:798 -#: ../apport/ui.py:798 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:798 +#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 msgid "" -"Specify package name in --file-bug mode. This is optional if a --pid is " -"specified. (Implied if package name is given as only argument.)" +"report download/install progress when installing packages into sandbox" msgstr "" -"Spesifiseer 'n pakketnaam in --lêer-fout modus. Hierdie is opsioneel as 'n --" -"pid gespesifiseer is. (By implikasie dat 'n pakketnaam as die enogste " -"argument gegee word.)" +"verslag aflaai/installeer vordering wanneer die installering van pakkette in " +"sandbox" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:800 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:800 -#: ../apport/ui.py:800 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:800 +#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 msgid "" -"Specify a running program in --file-bug mode. If this is specified, the bug " -"report will contain more information. (Implied if pid is given as only " -"argument.)" +"the executable that is run under valgrind's memcheck tool for memory leak " +"detection" msgstr "" -"Spesifiseer 'n lopie program in --lêer-bug wyse. As dit gespesifiseer word, " -"die bug verslag sal bevat meer inligting.\r\n" -"(Geïmpliseer indien pid slegs as enigste argument.)" +"die looplêer wat onder valgrind's se memcheck hulpmiddel vir Memory " +"lekdeteksie loop" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:802 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:802 -#: ../apport/ui.py:802 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:802 -msgid "The provided pid is a hanging application." -msgstr "Die voorsien pid is 'n hang toepassing." +#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 +#, python-format +msgid "Error: %s is not an executable. Stopping." +msgstr "Fout: %s is nie 'n uitvoerbare. Stop tans." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:804 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:804 -#: ../apport/ui.py:804 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:804 +#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 #, python-format +msgid "Usage: %s " +msgstr "Gebruik: %s " + +#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 +msgid "Destination directory exists and is not empty." +msgstr "Bestemming gids bestaan ​​en is nie leeg nie." + +#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80 +msgid "Press any key to continue..." +msgstr "Druk enige sleutel om voort te gaan..." + +#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87 +msgid "What would you like to do? Your options are:" +msgstr "Wat wil jy graag doen? Kies uit die opsies:" + +#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100 +#, python-format +msgid "Please choose (%s):" +msgstr "Kies asseblief (%s):" + +#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164 +#, python-format +msgid "(%i bytes)" +msgstr "(%i bytes)" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:363 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/bin/apport-cli.py:166 ../kde/apport-kde.py:363 +#: ../gtk/apport-gtk.py:146 ../bin/apport-cli.py:166 +msgid "(binary data)" +msgstr "(binêre data)" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:186 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:194 ../kde/apport-kde.py:186 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../gtk/apport-gtk.py:181 ../bin/apport-cli.py:194 +msgid "Send problem report to the developers?" +msgstr "Stuur die probleemverslag aan die ontwikkelaars?" + +#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195 msgid "" -"Report the crash from given .apport or .crash file instead of the pending " -"ones in %s. (Implied if file is given as only argument.)" +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." msgstr "" -"Rapporteer die ineenstorting vanaf 'n gegewe .apport of .crash lêer in plaas " -"van die afwagtende verlsae in %s. (By implikasie dat die lêer as enigste " -"agrument gegee word.)" +"Na afloop van die probleem verslag is gestuur, vul asseblief die vorm in " +"die\n" +"outomaties oop webblaaier." + +#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198 +#, python-format +msgid "&Send report (%s)" +msgstr "&Stuur verslag (%s)" + +#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202 +msgid "&Examine locally" +msgstr "&Examine plaaslik" + +#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206 +msgid "&View report" +msgstr "&Beskou verslag" + +#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207 +msgid "&Keep report file for sending later or copying to somewhere else" +msgstr "&Hou verslag lêer vir later stuur of kopiëring na 'n ander plek" + +#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "" +"Kanselleer en &ignoreer toekomstige ineenstortings van hierdie program " +"weergawe" + +#: ../debian/tmp/usr/bin/apport-cli.py:210 +#: ../debian/tmp/usr/bin/apport-cli.py:287 +#: ../debian/tmp/usr/bin/apport-cli.py:319 +#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210 +#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340 +msgid "&Cancel" +msgstr "&Kanselleer" + +#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 +msgid "Problem report file:" +msgstr "Probleemverslaglêer:" + +#: ../debian/tmp/usr/bin/apport-cli.py:244 +#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244 +#: ../bin/apport-cli.py:249 +msgid "&Confirm" +msgstr "&Bevestig" + +#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248 +#, python-format +msgid "Error: %s" +msgstr "Fout: %s" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:407 +#: ../debian/tmp/usr/bin/apport-cli.py:254 ../kde/apport-kde.py:407 +#: ../bin/apport-cli.py:254 +msgid "Collecting problem information" +msgstr "Versamel probleeminformasie" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:806 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:806 -#: ../apport/ui.py:806 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:806 +#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255 msgid "" -"In bug filing mode, save the collected information into a file instead of " -"reporting it. This file can then be reported later on from a different " -"machine." +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." msgstr "" -"In bug indiening wyse, stoor die ingesamel inligting in 'n lêer plaas van " -"verslagdoening dit. Hierdie lêer kan dan wees berig later op van 'n " -"verskillende masjien." +"Die versamelde informasie kan wees gestuurde om die ontwikkelaars te " +"verbeter die\n" +"toepassing. Dit mag 'n paar minute neem." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:810 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:810 -#: ../apport/ui.py:810 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:810 -msgid "Print the Apport version number." -msgstr "Druk die Apport weergawe nommer." +#: ../debian/tmp/usr/share/apport/apport-kde.py:435 +#: ../debian/tmp/usr/bin/apport-cli.py:267 ../kde/apport-kde.py:435 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 +#: ../bin/apport-cli.py:267 +msgid "Uploading problem information" +msgstr "Oplaai tans probleem informasie" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:961 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:961 -#: ../apport/ui.py:961 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:961 +#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268 msgid "" -"This will launch apport-retrace in a terminal window to examine the crash." +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." msgstr "" -"Hierdie sal launch apport-retrace in 'n terminale venster te ondersoek die " -"crash." +"Die versamelde informasie word tans gestuur aan die bug sporingstelsel.\n" +"Dit mag 'n paar minute duur." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:962 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:962 -#: ../apport/ui.py:962 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 -msgid "Run gdb session" -msgstr "Hardloop gdb sessie" +#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318 +msgid "&Done" +msgstr "&Klaar" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:963 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:963 -#: ../apport/ui.py:963 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:963 -msgid "Run gdb session without downloading debug symbols" -msgstr "Hardloop gdb sessie sonder aflaai debug simbole" +#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324 +msgid "none" +msgstr "geeneen" -#. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:965 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:965 -#: ../apport/ui.py:965 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:965 +#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 #, python-format -msgid "Update %s with fully symbolic stack trace" -msgstr "Opdateer %s met ten volle simboliese stapel spoor" +msgid "Selected: %s. Multiple choices:" +msgstr "Gekies: %s. Veelvuldige keuses:" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1001 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001 -#: ../apport/ui.py:1001 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1001 -msgid "Can't remember send report status settings" -msgstr "Kan nie onthou nie sturr verslag statusse instellings" +#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341 +msgid "Choices:" +msgstr "Keuses:" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1002 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1002 -#: ../apport/ui.py:1002 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1002 -msgid "" -"Saving crash reporting state failed. Can't set auto or never reporting mode." -msgstr "" -"Spaar crash verslagdoening staat misluk. Kan nie stel outo of nooit " -"verslagdoening wyse." +#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 +msgid "Path to file (Enter to cancel):" +msgstr "Pad na lêer (Betree om te kanselleer):" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1071 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1071 -#: ../apport/ui.py:1061 ../apport/ui.py:1071 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1071 -msgid "" -"This problem report applies to a program which is not installed any more." -msgstr "" -"Hierdie probleemverslag is van toepassing op 'n program wat ongeïnstalleer " -"is." +#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361 +msgid "File does not exist." +msgstr "Lêer bestaan nie." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1086 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1086 -#: ../apport/ui.py:1086 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1086 -#, python-format +#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363 +msgid "This is a directory." +msgstr "Hierdie is 'n directory." + +#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369 +msgid "To continue, you must visit the following URL:" +msgstr "Om voort te gaan, moet jy die volgende besoek URL:" + +#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 msgid "" -"The problem happened with the program %s which changed since the crash " -"occurred." +"You can launch a browser now, or copy this URL into a browser on another " +"computer." msgstr "" -"Die probleem gebeur met die program %s watter verander sedert die crash het " -"voorgekom." +"Jy kan nou 'n blaaier oopmaak of hierdie URL kopiëer na 'n blaaier op 'n " +"ander rekenaar." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1405 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1405 -#: ../apport/ui.py:1133 ../apport/ui.py:1190 ../apport/ui.py:1405 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1405 -msgid "This problem report is damaged and cannot be processed." -msgstr "Hierdie probleemverslag is beskadig en kan nie verwerk word nie." +#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "Maak 'n blaaier oop nou" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1141 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1141 -#: ../apport/ui.py:1141 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141 +#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." +msgstr "Geen hangende crash verslae nie. Probeer --hulp vir meer inligting." + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 #, python-format -msgid "" -"This report is about a snap published by %s. Contact them via %s for help." -msgstr "" -"Hierdie verslag is oor 'n snap gepubliseer deur %s. Kontak hulle via %s vir " -"hulp." +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "Jammer, die toepassing %s het onverwags gestop het." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1144 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1144 -#: ../apport/ui.py:1144 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 #, python-format -msgid "" -"This report is about a snap published by %s. No contact address has been " -"provided; visit the forum at https://forum.snapcraft.io/ for help." -msgstr "" -"Hierdie verslag is oor 'n gepubliseer deur %s. Geen kontak adres het gewees " -"voorsien; besoek die forum by https://forum.snapcraft.io/ vir hulp." +msgid "Sorry, %s has closed unexpectedly." +msgstr "Jammer, %s het onverwags gesluit het." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1148 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1148 -#: ../apport/ui.py:1148 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1148 -msgid "This report is about a package that is not installed." -msgstr "Hierdie verslag handel oor 'n pakket dat is nie geïnstalleer." +#: ../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 ../kde/apport-kde.py:200 +#: ../kde/apport-kde.py:238 ../gtk/apport-gtk.py:169 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "Jammer, %s het ervaar 'n inwendige fout." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1152 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1152 -#: ../apport/ui.py:1152 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1152 -msgid "An error occurred while attempting to process this problem report:" -msgstr "" -"'N fout het voorgekom terwyl probeer te proses hierdie probleem verslag." +#: ../debian/tmp/usr/share/apport/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../kde/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.py:188 +msgid "Send" +msgstr "Stuur" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1159 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159 -#: ../apport/ui.py:1159 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159 +#: ../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 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575 +msgid "Show Details" +msgstr "Wys Besonderhede" + +#: ../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 ../kde/apport-kde.py:231 +#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:216 +msgid "Continue" +msgstr "Voortgaan" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 #, python-format -msgid "" -"You are about to report a bug against the deb package, but you also a have " -"snap published by %s installed. You can contact them via %s for help. Do you " -"want to continue with the bug report against the deb?" -msgstr "" -"Jy is oor te verslag 'n bug teen die deb pakket, maar jy ook 'n het snap " -"gepubliseer deur %s geïnstalleer. Jy kan kontak hulle via %s vir hulp. Doen " -"jy wil te aanhou met die bug verslag teen die deb?" +msgid "The application %s has stopped responding." +msgstr "Die toepassing %s het opgehou reageer het." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1161 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161 -#: ../apport/ui.py:1161 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 #, python-format -msgid "" -"You are about to report a bug against the deb package, but you also a have " -"snap published by %s installed. For the snap, no contact address has been " -"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you " -"want to continue with the bug report against the deb?" -msgstr "" -"Jy is oor te verslag 'n bug teen die deb pakket, maar jy ook 'n het snap " -"gepubliseer deu %s geïnstalleer. Vir die snap, geen kontak nie adres het " -"gewees voorsien; besoek die forum by https://forum.snapcraft.io/ vir hulp. " -"Doen jy wil te aanhou met die bug verslag teen die deb?" +msgid "The program \"%s\" has stopped responding." +msgstr "Die program \"%s\" het ophou reageer." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1234 -#: ../apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1234 -msgid "Could not determine the package or source package name." -msgstr "Kon nie die pakket of bronpakket naam bepaal nie." +#: ../debian/tmp/usr/share/apport/apport-kde.py:208 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../kde/apport-kde.py:208 +#: ../gtk/apport-gtk.py:259 +#, python-format +msgid "Package: %s" +msgstr "Pakket: %s" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1252 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1252 -#: ../apport/ui.py:1252 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1252 -msgid "Unable to start web browser" -msgstr "Kon nie die webblaaier aan die gang kry nie" +#: ../debian/tmp/usr/share/apport/apport-kde.py:214 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../kde/apport-kde.py:214 +#: ../gtk/apport-gtk.py:265 +msgid "Sorry, a problem occurred while installing software." +msgstr "Jammer, 'n probleem voorgekom terwyl sagteware installeer." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1253 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1253 -#: ../apport/ui.py:1253 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1253 +#: ../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 ../kde/apport-kde.py:220 +#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289 #, python-format -msgid "Unable to start web browser to open %s." -msgstr "Kon nie die webblaaier aan die gang kry om %s oop te maak nie." +msgid "The application %s has experienced an internal error." +msgstr "Die toepassing %s het ervare 'n interne fout." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1353 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1353 -#: ../apport/ui.py:1353 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1353 +#: ../debian/tmp/usr/share/apport/apport-kde.py:223 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../kde/apport-kde.py:223 +#: ../gtk/apport-gtk.py:277 #, python-format -msgid "Please enter your account information for the %s bug tracking system" -msgstr "Voer asseblief jou rekeninginformasie in vir die%s foutspoorstelsel" +msgid "The application %s has closed unexpectedly." +msgstr "Die toepassing %s gesluit het onverwags." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1365 -#: ../apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1365 -msgid "Network problem" -msgstr "Netwerkprobleem" +#: ../debian/tmp/usr/share/apport/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../kde/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.py:297 +msgid "If you notice further problems, try restarting the computer." +msgstr "As jy verdere probleme opmerk, probeer om die rekenaar te herbegin." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1367 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1367 -#: ../apport/ui.py:1367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1367 -msgid "" -"Cannot connect to crash database, please check your Internet connection." -msgstr "" -"Kon nie verbind met die crash-databasis nie, gaan asseblief jou " -"internetkonneksie na." +#: ../debian/tmp/usr/share/apport/apport-kde.py:245 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:245 +#: ../gtk/apport-gtk.py:299 +msgid "Ignore future problems of this type" +msgstr "Ignoreer toekomstige probleme van hierdie tipe" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1394 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1394 -#: ../apport/ui.py:1394 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1394 -msgid "Memory exhaustion" -msgstr "Geheue opgebruik" +#: ../debian/tmp/usr/share/apport/apport-kde.py:289 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../kde/apport-kde.py:289 +#: ../gtk/apport-gtk.py:579 +msgid "Hide Details" +msgstr "Versteek Details" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1395 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1395 -#: ../apport/ui.py:1395 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1395 -msgid "Your system does not have enough memory to process this crash report." -msgstr "" -"Jou stelsel het nie genoeg geheue beskikbaar om die ineenstortingsverslag te " -"prosseseer nie." +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "Kollekteer stelsel inligting" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1430 -#: ../apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1430 -#, python-format +#: ../apport/com.ubuntu.apport.policy.in.h:2 msgid "" -"The problem cannot be reported:\n" -"\n" -"%s" +"Authentication is required to collect system information for this problem " +"report" msgstr "" -"Die probleem kan nie aangemeld word nie:\n" -"\n" -"%s" +"Outentisering word vereis om Stelselinligting vir hierdie probleemverslag in " +"te samel" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1493 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1493 -#: ../apport/ui.py:1486 ../apport/ui.py:1493 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1493 -msgid "Problem already known" -msgstr "Probleem reeds bekend" +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "Stelselprobleemverslae" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1487 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1487 -#: ../apport/ui.py:1487 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1487 +#: ../apport/com.ubuntu.apport.policy.in.h:4 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 " -"helpful for the developers." +"Please enter your password to access problem reports of system programs" msgstr "" -"Hierdie probleem was reeds gerapporteer in die foutverslag vertoon in die " -"webblaaier. Gaan na of enige verdere informasie bygevoeg kan word wat tot " -"hulp van die ontwikkelaars kan wees." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1494 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1494 -#: ../apport/ui.py:1494 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1494 -msgid "This problem was already reported to developers. Thank you!" -msgstr "Hierdie probleem is reeds aan ontwikkelaars gerapporteer. Dankie!" +"Sleutel asseblief jou wagwoord in om toegang te verkry tot probleemberigte " +"van stelselprogramme" -#: ../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 +#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../kde/apport-kde.py:469 +#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 msgid "Apport" msgstr "Apport" #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:2 ../gtk/apport-gtk.ui.h:2 msgid "Cancel" -msgstr "Kanselleer" +msgstr "Kanseleer" #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:3 ../gtk/apport-gtk.ui.h:3 msgid "OK" -msgstr "Regso" +msgstr "OK" #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:4 ../gtk/apport-gtk.ui.h:4 msgid "Crash report" @@ -745,20 +579,6 @@ msgid "Sorry, an internal error happened." msgstr "Jammer, 'n interne fout gebeur." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 -#: ../bin/apport-cli.py:194 ../kde/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 -#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181 -msgid "Send problem report to the developers?" -msgstr "Stuur die probleemverslag aan die ontwikkelaars?" - -#: ../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 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 -msgid "If you notice further problems, try restarting the computer." -msgstr "As jy verdere probleme opmerk, probeer om die rekenaar te herbegin." - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 msgid "Remember this in future" msgstr "Onthou hierdie in toekoms" @@ -771,14 +591,6 @@ msgid "Relaunch this application" msgstr "Relaunch hierdie aansoek" -#: ../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 -#: ../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 -msgid "Show Details" -msgstr "Wys Besonderhede" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 msgid "_Examine locally" msgstr "_Ondersoek plaaslik" @@ -787,130 +599,54 @@ msgid "Don't send" msgstr "Moenie stuur" -#: ../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 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 -msgid "Send" -msgstr "Stuur" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 msgid "Collecting problem information" msgstr "Besig met versameling van probleeminformasie" #: ../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 "" -"Informasie word tans versamel wat die ontwikkelaars mag help om die probleem " -"deur jou gerapporteer te herstel." - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 -#: ../bin/apport-cli.py:267 ../kde/apport-kde.py:435 -#: ../debian/tmp/usr/share/apport/apport-kde.py:435 -#: ../debian/tmp/usr/bin/apport-cli.py:267 -msgid "Uploading problem information" -msgstr "Laai probleeminformasie op" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 -msgid "Uploading problem information" -msgstr "Besig met die aanstuur van die probleeminformasie" - -#: ../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 "" -"The collected information is being sent to the bug tracking system. This " -"might take a few minutes." -msgstr "" -"Die versamelde inligting word tans gestuur aan die foutsporingstelsel. Dit " -"mag 'n paar minute duur." - -#: ../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 "Jammer, %s het ervaar 'n inwendige fout." - -#: ../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 "Pakket: %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 "Jammer, 'n probleem voorgekom terwyl sagteware installeer." - -#: ../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 "Die toepassing %s het ervare 'n interne fout." +msgid "" +"Information is being collected that may help the developers fix the problem " +"you report." +msgstr "" +"Informasie word synde versamel wat die ontwikkelaars help om die probleem jy " +"rapporteer." -#: ../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 "Die toepassing %s gesluit het onverwags." +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 +msgid "Uploading problem information" +msgstr "Oplaai tans probleem informasie" -#: ../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 "Voortgaan" +#: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../kde/apport-kde.py:436 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19 +msgid "" +"The collected information is being sent to the bug tracking system. This " +"might take a few minutes." +msgstr "" +"Die versamelde inligting word tans gestuur aan die bug sporingstelsel. Dit " +"mag 'n paar minute duur." -#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 +#: ../debian/tmp/usr/share/apport/apport-kde.py:234 ../kde/apport-kde.py:234 msgid "Leave Closed" msgstr "Verlaat Toegemaak" -#: ../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 +#: ../debian/tmp/usr/share/apport/apport-kde.py:381 ../kde/apport-kde.py:235 +#: ../kde/apport-kde.py:381 msgid "Relaunch" msgstr "Relaunch" -#: ../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 "Ignoreer toekomstige probleme van hierdie tipe" - -#: ../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 "Versteek Details" - -#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 +#: ../debian/tmp/usr/share/apport/apport-kde.py:315 ../kde/apport-kde.py:315 msgid "Username:" msgstr "Gebruikernaam:" -#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 +#: ../debian/tmp/usr/share/apport/apport-kde.py:316 ../kde/apport-kde.py:316 msgid "Password:" msgstr "Wagwoord:" -#: ../bin/apport-cli.py:166 ../kde/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 -#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146 -msgid "(binary data)" -msgstr "(binêre data)" - -#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 +#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406 msgid "Collecting Problem Information" msgstr "Insameling Probleem Inligting" -#: ../bin/apport-cli.py:254 ../kde/apport-kde.py:407 -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 -#: ../debian/tmp/usr/bin/apport-cli.py:254 -msgid "Collecting problem information" -msgstr "Versamel probleeminformasie" - -#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 +#: ../debian/tmp/usr/share/apport/apport-kde.py:408 ../kde/apport-kde.py:408 msgid "" "The collected information can be sent to the developers to improve the " "application. This might take a few minutes." @@ -918,436 +654,541 @@ "Die Versamelde inligting kan aan die ontwikkelaars gestuur word om die " "toepassing te verbeter. Dit kan 'n paar minute duur." -#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 +#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../kde/apport-kde.py:434 msgid "Uploading Problem Information" msgstr "Uplaai tans Probleem Inligting" -#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "" -"Jou stelsel mag dalk nou onstabiel raak en dit kan nodig wees om oor te " -"begin." - -#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 -msgid "Press any key to continue..." -msgstr "Druk enige sleutel om voort te gaan..." - -#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87 -msgid "What would you like to do? Your options are:" -msgstr "Wat wil jy graag doen? Kies uit die opsies:" +#: ../apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139 +msgid "This package does not seem to be installed correctly" +msgstr "Dit lyk nie asof hierdie pakket korrek geïnstalleer is nie" -#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100 +#: ../apport/ui.py:144 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 #, python-format -msgid "Please choose (%s):" -msgstr "Kies asseblief (%s):" +msgid "" +"This is not an official %s package. Please remove any third party package " +"and try again." +msgstr "" +"Dit is nie 'n amptelike %s pakket nie. Verwyder die pakket van derdepartye " +"en probeer weer." -#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164 +#: ../apport/ui.py:163 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:163 #, python-format -msgid "(%i bytes)" -msgstr "(%i grepe)" - -#: ../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" -"automatically opened web browser." +"You have some obsolete package versions installed. Please upgrade the " +"following packages and check if the problem still occurs:\n" +"\n" +"%s" msgstr "" -"Nadat die probleemverslag aangestuur is word jy versoek om die vorm\n" -" in te vul wat vertoon word in die outomaties geopende webblaaier." +"Jy het 'n paar uitgediende pakket weergawe geïnstalleer. Opgradeer asseblief " +"die volgende pakkette en tjek indien die probleem steeds voorkom:\n" +"\n" +"%s" -#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198 -#, python-format -msgid "&Send report (%s)" -msgstr "&Stuur verslag (%s)" +#: ../apport/ui.py:300 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300 +msgid "unknown program" +msgstr "onbekende program" -#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202 -msgid "&Examine locally" -msgstr "& Ondersoek plaaslik" +#: ../apport/ui.py:301 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301 +#, python-format +msgid "Sorry, the program \"%s\" closed unexpectedly" +msgstr "Jammer, die program \"%s\" het onverwags gesluit" -#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206 -msgid "&View report" -msgstr "&Beskou verslag" +#: ../apport/ui.py:303 ../apport/ui.py:1448 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1448 +#, python-format +msgid "Problem in %s" +msgstr "Probleem in %s" -#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207 -msgid "&Keep report file for sending later or copying to somewhere else" +#: ../apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 +msgid "" +"Your computer does not have enough free memory to automatically analyze the " +"problem and send a report to the developers." msgstr "" -"Be&waar verslaglêer om later aan te stuur of om elders heen te kopiëer" +"Jou rekenaar beskik nie oor genoegsame gratis geheue om die outomaties te " +"probleem-analiseer en te raporteer aan die ontwikkelaars nie." -#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "" -"Kanselleer en &ignoreer toekomstige ineenstortings van hierdie " -"programweergawe" +#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:510 +#: ../apport/ui.py:513 ../apport/ui.py:718 ../apport/ui.py:1254 +#: ../apport/ui.py:1420 ../apport/ui.py:1424 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:359 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:510 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:718 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1254 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1420 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1424 +msgid "Invalid problem report" +msgstr "Ongeldige probleem verslag" -#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 -#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210 -#: ../debian/tmp/usr/bin/apport-cli.py:287 -#: ../debian/tmp/usr/bin/apport-cli.py:319 -#: ../debian/tmp/usr/bin/apport-cli.py:340 -msgid "&Cancel" -msgstr "&Kanselleer" +#: ../apport/ui.py:360 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360 +msgid "You are not allowed to access this problem report." +msgstr "Jy word nie toegelaat om toegang tot hierdie -probleem verslag." -#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 -msgid "Problem report file:" -msgstr "Probleemverslaglêer:" +#: ../apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 +msgid "Error" +msgstr "Fout" -#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249 -#: ../debian/tmp/usr/bin/apport-cli.py:244 -#: ../debian/tmp/usr/bin/apport-cli.py:249 -msgid "&Confirm" -msgstr "Be&vestig" +#: ../apport/ui.py:364 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364 +msgid "There is not enough disk space available to process this report." +msgstr "" +"Daar -is nie genoeg skyfspasie beskikbare om die verwerking van dit verslag." -#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248 -#, python-format -msgid "Error: %s" -msgstr "Fout: %s" +#: ../apport/ui.py:458 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:458 +msgid "No package specified" +msgstr "Geen pakket gespesifiseer nie" -#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255 +#: ../apport/ui.py:459 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:459 msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." +"You need to specify a package or a PID. See --help for more information." msgstr "" -"Die versamelde informasie kan aan die ontwikkelaars gestuur word om sodoende " -"die \n" -"toepassing te verbeter. Dit mag 'n paar minute duur." +"Jy nodig het om 'n pakket of 'n PID spesifiseer. Sien --hulp vir meer " +"inligting." + +#: ../apport/ui.py:488 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:488 +msgid "Permission denied" +msgstr "Toestemming gewyer" -#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268 +#: ../apport/ui.py:489 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:489 msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." +"The specified process does not belong to you. Please run this program as the " +"process owner or as root." msgstr "" -"Die versamelde informasie word tans gestuur aan die foutsporingstelsel.\n" -"Dit mag 'n paar minute duur." +"Die spesifieke proses behoort nie aan jou nie. Laat die program loop as " +"proseseienaar of as wortel." -#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318 -msgid "&Done" -msgstr "&Klaar" +#: ../apport/ui.py:402 ../apport/ui.py:491 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:402 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 +msgid "Invalid PID" +msgstr "Ongeldige PID" -#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324 -msgid "none" -msgstr "geen" +#: ../apport/ui.py:492 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492 +msgid "The specified process ID does not belong to a program." +msgstr "Die gespesifiseerde proses-ID behoort nie aan 'n program nie." -#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 +#: ../apport/ui.py:511 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:511 #, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "Gekies: %s. Veelvuldige keuses:" - -#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341 -msgid "Choices:" -msgstr "Keuses:" +msgid "Symptom script %s did not determine an affected package" +msgstr "Simptometeks %s kon geen geaffekteerde pakket bepaal nie" -#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 -msgid "Path to file (Enter to cancel):" -msgstr "Pad na lêer (Enter om te kanselleer):" +#: ../apport/ui.py:514 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 +#, python-format +msgid "Package %s does not exist" +msgstr "Pakket %s bestaan nie" -#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 -msgid "File does not exist." -msgstr "Lêer bestaan nie." +#: ../apport/ui.py:543 ../apport/ui.py:730 ../apport/ui.py:735 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:543 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:735 +msgid "Cannot create report" +msgstr "Kan nie verslag skep nie" -#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 -msgid "This is a directory." -msgstr "Hierdie is 'n gids." +#: ../apport/ui.py:558 ../apport/ui.py:604 ../apport/ui.py:620 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:558 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:604 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:620 +msgid "Updating problem report" +msgstr "Opdateer probleemverslag" -#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 -msgid "To continue, you must visit the following URL:" -msgstr "Jy moet die volgende URL besoek om voort te gaan:" +#: ../apport/ui.py:559 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:559 +msgid "" +"You are not the reporter or subscriber of this problem report, or the report " +"is a duplicate or already closed.\n" +"\n" +"Please create a new report using \"apport-bug\"." +msgstr "" +"Jy is nie die raporteerder of intekenaar van hierdie probleemverslag nie, of " +"die verslag is 'n duplikaat of reeds afgesluit.\n" +"\n" +"Skep asseblief 'n nuwe verslag met behulp van \"apport-bug\"." -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 +#: ../apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:568 msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." +"You are not the reporter of this problem report. It is much easier to mark a " +"bug as a duplicate of another than to move your comments and attachments to " +"a new bug.\n" +"\n" +"Subsequently, we recommend that you file a new bug report using \"apport-" +"bug\" and make a comment in this bug about the one you file.\n" +"\n" +"Do you really want to proceed?" msgstr "" -"Jy kan nou 'n webblaaier oopmaak of hierdie URL kopiëer na 'n webblaaier op " -"'n ander rekenaar." +"Jy is nie die rapporteerder van hierdie probleemverslag nie. Dit is heelwat " +"makliker om 'n fout as duplikaat van 'n ander te merk as om jou kommentaar " +"en bylae te skuif na 'n nuwe bug.\n" +"\n" +"Subsequently, beveel ons aan dat jy 'n nuwe bug verslag indien met behulp " +"van \"apport-bug\" en maak 'n opmerking in hierdie bug oor die een wat jy " +"leêr.\n" +"\n" +"Wil jy regtig om voortgaan?" -#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "Maak nou 'n webblaaier oop" +#: ../apport/ui.py:605 ../apport/ui.py:621 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:605 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:621 +msgid "No additional information collected." +msgstr "Geen addisionele inligting ingesamel." -#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 -msgid "No pending crash reports. Try --help for more information." -msgstr "" -"Geen hangende ineestortingsverslae nie. Probeer --help vir meer inligting." +#: ../apport/ui.py:672 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:672 +msgid "What kind of problem do you want to report?" +msgstr "Watter tipe probleem probeer jy rapporteer?" -#: ../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 "Raporteer 'n probleem..." +#: ../apport/ui.py:689 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:689 +msgid "Unknown symptom" +msgstr "Onbekende simptoom" -#: ../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 "Rapporteer foutiewe werking an die ontwikkelaars" +#: ../apport/ui.py:690 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:690 +#, python-format +msgid "The symptom \"%s\" is not known." +msgstr "Die simptoom \"%s\" is onbekend" -#: ../data/apportcheckresume.py:67 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../apport/ui.py:721 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." +"After closing this message please click on an application window to report a " +"problem about it." msgstr "" -"Hierdie het tydens 'n vorige opskort voorgekom en het verhoed dat die " -"stelsel hervatting ordentlik." +"Nadat u hierdie boodskap gesluit het, klik op die toepassingsvenster om 'n " +"probleem daaroor te rapporteer." -#: ../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 "" -"Dit het tydens 'n vorige winterslaap plaasgevind, en het verhoed dat die " -"stelsel hervatting ordentlik." +#: ../apport/ui.py:731 ../apport/ui.py:736 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:731 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736 +msgid "xprop failed to determine process ID of the window" +msgstr "xprop nagelaat om proses bepaal ID van die venster" -#: ../data/apportcheckresume.py:74 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 -msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." -msgstr "" -"Die voortgangingsproses het baie naby aan die einde gestaak en dit sal " -"voorkom of dit normaalweg afgehandel het." +#: ../apport/ui.py:750 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:750 +msgid "%prog " +msgstr "%prog " -#: ../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 "Jammer, die toepassing %s het onverwags gestop het." +#: ../apport/ui.py:752 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:752 +msgid "Specify package name." +msgstr "Spesifiseer pakket naam." -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "Jammer, %s het onverwags gesluit het." +#: ../apport/ui.py:754 ../apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:754 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:805 +msgid "Add an extra tag to the report. Can be specified multiple times." +msgstr "" +"Voeg 'n ekstra tag by die verslag. Kan verskeie kere gespesifiseer word." -#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 -#, python-format -msgid "The application %s has stopped responding." -msgstr "Die toepassing %s het opgehou reageer het." +#: ../apport/ui.py:784 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:784 +msgid "" +"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" +msgstr "%prog [opsies] [simptoom|pid|pakket|program pad|.apport/.crash lêer]" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "Die program \"%s\" het ophou reageer." +#: ../apport/ui.py:787 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 +msgid "" +"Start in bug filing mode. Requires --package and an optional --pid, or just " +"a --pid. If neither is given, display a list of known symptoms. (Implied if " +"a single argument is given.)" +msgstr "" +"Begin in bug vul modus. Vereis --pakket en 'n opsionele --pid, 0of net 'n --" +"pid. Indien geeneen verskaf word nie, vertoon 'n lys van bekende simptome. " +"(By implkasie dat 'n enkele argument gegewe is." -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "Versamel Stelselinligting" +#: ../apport/ui.py:789 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:789 +msgid "Click a window as a target for filing a problem report." +msgstr "Klik 'n venster as teiken vir indiening 'n probleem verslag." -#: ../apport/com.ubuntu.apport.policy.in.h:2 +#: ../apport/ui.py:791 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791 +msgid "Start in bug updating mode. Can take an optional --package." +msgstr "Begin in bug opdatering modus. Kan 'n opsionele --pakket vat." + +#: ../apport/ui.py:793 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:793 msgid "" -"Authentication is required to collect system information for this problem " -"report" +"File a bug report about a symptom. (Implied if symptom name is given as only " +"argument.)" msgstr "" -"Outentisering word vereis om Stelselinligting vir hierdie probleemverslag in " -"te samel" - -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "Stelselprobleemverslae" +"Handig 'n bug rapport in oor 'n simptoom. (By implikasie dat 'n stelselnaam " +"gegee word as die enigste argument.)" -#: ../apport/com.ubuntu.apport.policy.in.h:4 +#: ../apport/ui.py:795 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:795 msgid "" -"Please enter your password to access problem reports of system programs" +"Specify package name in --file-bug mode. This is optional if a --pid is " +"specified. (Implied if package name is given as only argument.)" msgstr "" -"Sleutel asseblief jou wagwoord in om toegang te verkry tot probleemberigte " -"van stelselprogramme" +"Spesifiseer 'n pakketnaam in --lêer-bug modus. Hierdie is opsioneel as 'n --" +"pid gespesifiseer is. (By implikasie dat 'n pakketnaam as die enogste " +"argument gegee word.)" -#: ../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." +#: ../apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:797 +msgid "" +"Specify a running program in --file-bug mode. If this is specified, the bug " +"report will contain more information. (Implied if pid is given as only " +"argument.)" msgstr "" -"Moenie die nuwe spore in die verslag inskryf nie, skryf dit na stdout." +"Spesifiseer 'n lopie program in --lêer-bug wyse. As dit gespesifiseer word, " +"die bug verslag sal bevat meer inligting.\r\n" +"(Geïmpliseer indien pid slegs as enigste argument.)" + +#: ../apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:799 +msgid "The provided pid is a hanging application." +msgstr "Die voorsien pid is 'n hang toepassing." -#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 +#: ../apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:801 +#, python-format msgid "" -"Start an interactive gdb session with the report's core dump (-o ignored; " -"does not rewrite report)" +"Report the crash from given .apport or .crash file instead of the pending " +"ones in %s. (Implied if file is given as only argument.)" msgstr "" -"Skop 'n interaktiewe gdb sessie af met die verslag se kernstorting (-o " -"geïgnoreerd; herskryf nie verslag nie)" +"Rapporteer die ineenstorting vanaf 'n gegewe .apport of .crash lêer in plaas " +"van die afwagtende verlsae in %s. (By implikasie dat die lêer as enigste " +"agrument gegee word.)" -#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 +#: ../apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:803 msgid "" -"Write modified report to given file instead of changing the original report" +"In bug filing mode, save the collected information into a file instead of " +"reporting it. This file can then be reported later on from a different " +"machine." msgstr "" -"Skryf die gewysigde verslag na 'n gegewe lêer in plaas daarvan om die " -"oorspronklike te verander" +"In bug indiening wyse, stoor die ingesamel inligting in 'n lêer plaas van " +"verslagdoening dit. Hierdie lêer kan dan wees berig later op van 'n " +"verskillende masjien." -#: ../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" +#: ../apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:807 +msgid "Print the Apport version number." +msgstr "Druk die Apport weergawe nommer." + +#: ../apport/ui.py:958 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:958 +msgid "" +"This will launch apport-retrace in a terminal window to examine the crash." msgstr "" -"Verwyder die kernstorting vanuit die verslag na die hergenerasie van die " -"stapelspoor" +"Hierdie sal launch apport-retrace in 'n terminale venster te ondersoek die " +"crash." -#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 -msgid "Override report's CoreFile" -msgstr "Oorskryf die verslag se kernlêer" +#: ../apport/ui.py:959 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:959 +msgid "Run gdb session" +msgstr "Hardloop gdb sessie" -#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 -msgid "Override report's ExecutablePath" -msgstr "Oorskryf die verslag se ExecutablePath" +#: ../apport/ui.py:960 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:960 +msgid "Run gdb session without downloading debug symbols" +msgstr "Hardloop gdb sessie sonder aflaai debug simbole" -#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 -msgid "Override report's ProcMaps" -msgstr "Oorskryf die verslag se ProcMaps" +#. TRANSLATORS: %s contains the crash report file name +#: ../apport/ui.py:962 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 +#, python-format +msgid "Update %s with fully symbolic stack trace" +msgstr "Opdateer %s met ten volle simboliese stapel spoor" -#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 -msgid "Rebuild report's Package information" -msgstr "Herbou die verslag se pakketinformasie" +#: ../apport/ui.py:998 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:998 +msgid "Can't remember send report status settings" +msgstr "Kan nie onthou nie sturr verslag statusse instellings" -#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 +#: ../apport/ui.py:999 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:999 msgid "" -"Build a temporary sandbox and download/install the necessary packages and " -"debug symbols in there; without this option it assumes that the necessary " -"packages and debug symbols are already installed in the system. The argument " -"points to the packaging system configuration base directory; if you specify " -"\"system\", it will use the system configuration files, but will then only " -"be able to retrace crashes that happened on the currently running release." +"Saving crash reporting state failed. Can't set auto or never reporting mode." msgstr "" -"Bou 'n tydelike sandbox en aflaai/installeer die nodige pakkette en ontfout " -"simbole in daar; Sonder hierdie opsie aanvaar dit dat die nodige pakkette en " -"ontfout simbole reeds in die stelsel geïnstalleer is. Die argument dui op " -"die verpakking stelsel opset basis ditectory; As jy spesifiseer " -"\"stelsel\", sal dit die stelsel konfigurasie lêers gebruik, maar sal dan " -"net in staat wees om te herspoor omvalle wat gebeur het op die huidig " -"lopende vrystelling." +"Spaar crash verslagdoening staat misluk. Kan nie stel outo of nooit " +"verslagdoening wyse." -#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 +#: ../apport/ui.py:1058 ../apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1058 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1068 msgid "" -"Build another temporary sandbox for installing gdb and its dependencies " -"using the same release as the report rather than whatever version of gdb you " -"have installed." +"This problem report applies to a program which is not installed any more." msgstr "" -"Bou nog 'n tydelike sandbox vir die installering van gdb en sy afhanklikhede " -"met dieselfde vrystelling as die verslag eerder as wat die weergawe van gdb " -"jy geïnstalleer het." +"Hierdie probleemverslag is van toepassing op 'n program wat nie-geïnstalleer " +"is enige meer nie" -#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 +#: ../apport/ui.py:1083 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1083 +#, python-format msgid "" -"Report download/install progress when installing packages into sandbox" -msgstr "" -"Verslag aflaai/installeer vordering wanneer die installering van pakkette in " -"sandbox" - -#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 -msgid "Prepend timestamps to log messages, for batch operation" +"The problem happened with the program %s which changed since the crash " +"occurred." msgstr "" -"Prepend tydstempels om boodskappe aan te teken, vir die bondel werking" - -#: ../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 "Skep en gebruik derde party repositories van oorsprong in verslae" +"Die probleem gebeur met die program %s watter verander sedert die crash het " +"voorgekom." -#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 -msgid "Cache directory for packages downloaded in the sandbox" -msgstr "Kas gids vir pakkette afgelaai in die sandbox" +#: ../apport/ui.py:1130 ../apport/ui.py:1211 ../apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1130 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1211 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1426 +msgid "This problem report is damaged and cannot be processed." +msgstr "Hierdie probleemverslag is beskadig en kan nie verwerk word nie." -#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141 +#: ../apport/ui.py:1141 +#, python-format msgid "" -"Directory for unpacked packages. Future runs will assume that any already " -"downloaded package is also extracted to this sandbox." +"This report is about a snap published by %s. Contact them via %s for help." msgstr "" -"Gids vir uitgepak pakkette. Toekomstige lopies sal aanvaar dat enige reeds " -"afgelaai pakket is ook onttrek om hierdie sandbox." +"Hierdie verslag is oor 'n snap gepubliseer deur %s. Kontak hulle via %s vir " +"hulp." -#: ../bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66 -#: ../debian/tmp/usr/bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144 +#: ../apport/ui.py:1144 +#, python-format msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" +"This report is about a snap published by %s. No contact address has been " +"provided; visit the forum at https://forum.snapcraft.io/ for help." msgstr "" -"Installeer 'n ekstra pakket in die sandbox (kan gespesifiseer word verskeie " -"kere)" +"Hierdie verslag is oor 'n gepubliseer deur %s. Geen kontak adres het gewees " +"voorsien; besoek die forum by https://forum.snapcraft.io/ vir hulp." -#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 -msgid "" -"Path to a file with the crash database authentication information. This is " -"used when specifying a crash ID to upload the retraced stack traces (only if " -"neither -g, -o, nor -s are specified)" +#: ../apport/ui.py:1135 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1135 +msgid "This report is about a package that is not installed." +msgstr "Hierdie verslag handel oor 'n pakket dat is nie geïnstalleer." + +#: ../apport/ui.py:1139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1139 +msgid "An error occurred while attempting to process this problem report:" msgstr "" -"Pad na 'n lêer met die ineenstortingsdatabasis se boekstawingsinformasie. " -"Dit word gebruik as 'n ineestortings-ID gespesifiseer word vir die oplaai " -"van die teruglopende stapelspore (slegs as nie een van -g, -o of -s " -"gespesifiseer is nie)" +"'N fout het voorgekom terwyl probeer te proses hierdie probleem verslag." -#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159 +#: ../apport/ui.py:1159 +#, python-format msgid "" -"Display retraced stack traces and ask for confirmation before sending them " -"to the crash database." +"You are about to report a bug against the deb package, but you also a have " +"snap published by %s installed. You can contact them via %s for help. Do you " +"want to continue with the bug report against the deb?" msgstr "" -"Vertoon die teruglopende stapelspore en vra vir bevestiging alvorens dit " -"aangestuur word na ineenstortingsdatabasis." +"Jy is oor te verslag 'n bug teen die deb pakket, maar jy ook 'n het snap " +"gepubliseer deur %s geïnstalleer. Jy kan kontak hulle via %s vir hulp. Doen " +"jy wil te aanhou met die bug verslag teen die deb?" -#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161 +#: ../apport/ui.py:1161 +#, python-format msgid "" -"Path to the duplicate sqlite database (default: no duplicate checking)" +"You are about to report a bug against the deb package, but you also a have " +"snap published by %s installed. For the snap, no contact address has been " +"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you " +"want to continue with the bug report against the deb?" msgstr "" -"Pad na die gedupliseerde sqlite databasis(verstek: geen duplikaatkontrole " -"nie)" +"Jy is oor te verslag 'n bug teen die deb pakket, maar jy ook 'n het snap " +"gepubliseer deu %s geïnstalleer. Vir die snap, geen kontak nie adres het " +"gewees voorsien; besoek die forum by https://forum.snapcraft.io/ vir hulp. " +"Doen jy wil te aanhou met die bug verslag teen die deb?" -#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 -msgid "Do not add StacktraceSource to the report." -msgstr "Moenie StacktraceSource by die verslag voeg nie." +#: ../apport/ui.py:1255 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1255 +msgid "Could not determine the package or source package name." +msgstr "Kon nie die pakket of bronpakket naam bepaal nie." -#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 -msgid "You cannot use -C without -S. Stopping." -msgstr "Jy kan nie gebruik-C sonder-S. stop." +#: ../apport/ui.py:1273 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1273 +msgid "Unable to start web browser" +msgstr "Kan nie die webblaaier begin nie" -#. translators: don't translate y/n, apport currently only checks for "y" -#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115 -msgid "OK to send these as attachments? [y/n]" -msgstr "Kan hierdie saamgestuur word as bylae? [y/n]" +#: ../apport/ui.py:1274 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1274 +#, python-format +msgid "Unable to start web browser to open %s." +msgstr "Kan nie die webblaaier begin om oop %s." -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "Sien die man bladsy vir besonderhede." +#: ../apport/ui.py:1374 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1374 +#, python-format +msgid "Please enter your account information for the %s bug tracking system" +msgstr "Voer asseblief jou rekeninginformasie in vir die %s bug spoorstelsel" -#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "Spesifiseer die log lêernaam wat deur valgrind" +#: ../apport/ui.py:1386 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1386 +msgid "Network problem" +msgstr "Netwerkprobleem" -#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 +#: ../apport/ui.py:1388 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1388 msgid "" -"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " -"create it" +"Cannot connect to crash database, please check your Internet connection." msgstr "" -"hergebruik 'n voorheen geskep sandbox systemapps (SDIR) of, indien dit nie " -"bestaan nie, skep dit" +"Kon nie verbind met die crash-databasis nie, gaan asseblief jou " +"internetkonneksie na." -#: ../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 "" -"moenie skep of hergebruik 'n sandbox gids vir addisionele ontfout simbole " -"maar net staatmaak op geïnstalleerde ontfout simbole." +#: ../apport/ui.py:1415 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1415 +msgid "Memory exhaustion" +msgstr "Geheue uitputting" -#: ../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" +#: ../apport/ui.py:1416 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1416 +msgid "Your system does not have enough memory to process this crash report." msgstr "" -"hergebruik 'n voorheen geskep kas systemapps (CDIR) of, indien dit nie " -"bestaan nie, skep dit" +"Jou stelsel het nie genoeg geheue beskikbaar om die ineenstortingsverslag te " +"prosseseer nie." -#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 +#: ../apport/ui.py:1451 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1451 +#, python-format msgid "" -"report download/install progress when installing packages into sandbox" +"The problem cannot be reported:\n" +"\n" +"%s" msgstr "" -"verslag aflaai/installeer vordering wanneer die installering van pakkette in " -"sandbox" +"Die probleem kan nie aangemeld word nie:\n" +"\n" +"%s" -#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 +#: ../apport/ui.py:1507 ../apport/ui.py:1514 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1507 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1514 +msgid "Problem already known" +msgstr "Probleem reeds bekend" + +#: ../apport/ui.py:1508 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1508 msgid "" -"the executable that is run under valgrind's memcheck tool for memory leak " -"detection" +"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 " +"helpful for the developers." msgstr "" -"die looplêer wat onder valgrind's se memcheck hulpmiddel vir Memory " -"lekdeteksie loop" +"Hierdie probleem was reeds gerapporteer in die bug verslag vertoon in die " +"webblaaier. Gaan asseblief na of enige verdere informasie bygevoeg kan word " +"wat tot hulp van die ontwikkelaars kan wees." -#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 -#, python-format -msgid "Error: %s is not an executable. Stopping." -msgstr "Fout: %s is nie 'n uitvoerbare. Stop." +#: ../apport/ui.py:1515 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1515 +msgid "This problem was already reported to developers. Thank you!" +msgstr "Hierdie probleem is reeds aan ontwikkelaars gerapporteer. Dankie!" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:186 -#: ../data/general-hooks/ubuntu.py:186 +#: ../data/general-hooks/ubuntu.py:195 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195 msgid "" "An Ubuntu package has a file conflict with a package that is not a genuine " "Ubuntu package." @@ -1355,13 +1196,13 @@ "'N Ubuntu pakket het 'n lêer konflik met 'n pakket wat nie 'n ware Ubuntu " "pakket." -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:194 -#: ../data/general-hooks/ubuntu.py:194 +#: ../data/general-hooks/ubuntu.py:203 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:203 msgid "You have already encountered this package installation failure." msgstr "Jy het reeds teëgekom hierdie pakket installasie mislukking." -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:210 -#: ../data/general-hooks/ubuntu.py:210 +#: ../data/general-hooks/ubuntu.py:219 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219 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 " @@ -1376,16 +1217,3 @@ "nuwe kern beskikbaar is, maak 'n terminaal oop en loop:\n" "\n" " sudo apt-get install grub-pc\n" - -#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " -msgstr "Gebruik: %s " - -#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 -msgid "Destination directory exists and is not empty." -msgstr "Bestemmingsgids bestaan en is nie leeg nie." - -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "Apport ineenstortingslêer" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apt.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apt.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apt.po 2020-01-23 16:55:09.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apt.po 2020-07-08 13:57:19.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" "PO-Revision-Date: 2012-10-23 12:25+0000\n" "Last-Translator: duan \n" "Language-Team: Ubuntu Afrikaans Translators\n" @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:30+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: af\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' @@ -201,7 +201,7 @@ msgid "This APT helper has Super Meep Powers." msgstr "" -#: apt-private/private-cmndline.cc:549 +#: apt-private/private-cmndline.cc:554 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -210,7 +210,7 @@ #: apt-private/private-depends.cc:35 apt-private/private-download.cc:251 #: 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:102 cmdline/apt-mark.cc:298 +#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310 msgid "No packages found" msgstr "Geen pakkette gekry nie" @@ -379,7 +379,7 @@ msgid "Abort." msgstr "Breek af." -#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:239 +#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:251 msgid "Do you want to continue?" msgstr "" @@ -503,7 +503,7 @@ msgstr "" #: apt-private/private-install.cc:1010 cmdline/apt-get.cc:121 -#: cmdline/apt-mark.cc:78 +#: cmdline/apt-mark.cc:94 #, c-format msgid "%s set to manually installed.\n" msgstr "%s gestel om handmatig geïnstalleer te word.\n" @@ -518,11 +518,11 @@ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Gekose weergawe '%s' (%s) vir '%s' weens '%s'\n" -#: apt-private/private-list.cc:129 +#: apt-private/private-list.cc:130 msgid "Listing" msgstr "" -#: apt-private/private-list.cc:159 +#: apt-private/private-list.cc:160 #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" @@ -921,19 +921,19 @@ msgid "Package %s version %s has an unmet dep:\n" msgstr "Pakket %s weergawe %s het onbevredigde afhanklikhede:\n" -#: apt-private/private-update.cc:33 +#: apt-private/private-update.cc:34 msgid "The update command takes no arguments" msgstr "Die bywerkingsbevel neem geen argumente nie" #. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list -#: apt-private/private-update.cc:116 +#: apt-private/private-update.cc:117 #, c-format msgid "" "Usage of %s should be preferred over embedding login information directly in " "the %s entry for '%s'" msgstr "" -#: apt-private/private-update.cc:134 +#: apt-private/private-update.cc:135 #, c-format msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" msgid_plural "" @@ -941,7 +941,7 @@ msgstr[0] "" msgstr[1] "" -#: apt-private/private-update.cc:138 +#: apt-private/private-update.cc:139 msgid "All packages are up to date." msgstr "" @@ -1119,12 +1119,12 @@ msgid "Couldn't find package %s" msgstr "Kon nie pakket %s kry nie" -#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:80 +#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s is gestel om outomaties te installeer.\n" -#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:123 +#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -1212,24 +1212,24 @@ msgid "Download and display the changelog for the given package" msgstr "" -#: cmdline/apt-helper.cc:43 +#: cmdline/apt-helper.cc:44 msgid "Need one URL as argument" msgstr "" -#: cmdline/apt-helper.cc:57 +#: cmdline/apt-helper.cc:58 msgid "Must specify at least one pair url/filename" msgstr "" -#: cmdline/apt-helper.cc:100 cmdline/apt-helper.cc:104 +#: cmdline/apt-helper.cc:101 cmdline/apt-helper.cc:105 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:125 cmdline/apt-helper.cc:128 +#: cmdline/apt-helper.cc:126 cmdline/apt-helper.cc:129 #, c-format msgid "GetSrvRec failed for %s" msgstr "" -#: cmdline/apt-helper.cc:263 +#: cmdline/apt-helper.cc:293 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] cat-file file ...\n" @@ -1239,85 +1239,85 @@ "e.g. the same proxy configuration or acquire system as APT would.\n" msgstr "" -#: cmdline/apt-helper.cc:275 +#: cmdline/apt-helper.cc:305 msgid "download the given uri to the target-path" msgstr "" -#: cmdline/apt-helper.cc:276 +#: cmdline/apt-helper.cc:306 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" msgstr "" -#: cmdline/apt-helper.cc:277 +#: cmdline/apt-helper.cc:307 msgid "concatenate files, with automatic decompression" msgstr "" -#: cmdline/apt-helper.cc:278 +#: cmdline/apt-helper.cc:308 msgid "detect proxy using apt.conf" msgstr "" -#: cmdline/apt-helper.cc:279 +#: cmdline/apt-helper.cc:309 msgid "wait for system to be online" msgstr "" -#: cmdline/apt-helper.cc:280 +#: cmdline/apt-helper.cc:310 msgid "drop privileges before running given command" msgstr "" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:66 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s kan nie gemerk word nie aangesien dit nie geïnstalleer is nie.\n" -#: cmdline/apt-mark.cc:71 +#: cmdline/apt-mark.cc:72 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s reeds gestel om handmatig geïnstalleer te word.\n" -#: cmdline/apt-mark.cc:73 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s reeds gestel om outomaties geïnstalleer te word.\n" -#: cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:323 #, c-format msgid "%s was already set on hold.\n" msgstr "%s reeds gestel op hou.\n" -#: cmdline/apt-mark.cc:313 +#: cmdline/apt-mark.cc:325 #, c-format msgid "%s was already not hold.\n" msgstr "%s reeds nie op hou nie.\n" -#: cmdline/apt-mark.cc:340 +#: cmdline/apt-mark.cc:352 msgid "Executing dpkg failed. Are you root?" msgstr "Uitvoer van dpkg het misluk. Is u wortel?" -#: cmdline/apt-mark.cc:343 +#: cmdline/apt-mark.cc:355 #, c-format msgid "%s set on hold.\n" msgstr "%s gestel op hou.\n" -#: cmdline/apt-mark.cc:345 +#: cmdline/apt-mark.cc:357 #, c-format msgid "Canceled hold on %s.\n" msgstr "Hou op %s gekanselleer.\n" -#: cmdline/apt-mark.cc:347 +#: cmdline/apt-mark.cc:359 #, c-format msgid "Selected %s for purge.\n" msgstr "" -#: cmdline/apt-mark.cc:349 +#: cmdline/apt-mark.cc:361 #, c-format msgid "Selected %s for removal.\n" msgstr "" -#: cmdline/apt-mark.cc:351 +#: cmdline/apt-mark.cc:363 #, c-format msgid "Selected %s for installation.\n" msgstr "" -#: cmdline/apt-mark.cc:403 +#: cmdline/apt-mark.cc:415 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1327,27 +1327,27 @@ "all packages with or without a certain marking.\n" msgstr "" -#: cmdline/apt-mark.cc:415 +#: cmdline/apt-mark.cc:427 msgid "Mark the given packages as automatically installed" msgstr "" -#: cmdline/apt-mark.cc:416 +#: cmdline/apt-mark.cc:428 msgid "Mark the given packages as manually installed" msgstr "" -#: cmdline/apt-mark.cc:418 +#: cmdline/apt-mark.cc:430 msgid "Mark a package as held back" msgstr "" -#: cmdline/apt-mark.cc:419 +#: cmdline/apt-mark.cc:431 msgid "Unset a package set as held back" msgstr "" -#: cmdline/apt-mark.cc:424 +#: cmdline/apt-mark.cc:436 msgid "Print the list of automatically installed packages" msgstr "" -#: cmdline/apt-mark.cc:425 +#: cmdline/apt-mark.cc:437 msgid "Print the list of manually installed packages" msgstr "" @@ -1481,8 +1481,8 @@ msgid "Connection failed" msgstr "" -#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:615 -#: methods/http.cc:874 +#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:619 +#: methods/http.cc:878 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "" @@ -1498,31 +1498,31 @@ msgid "Internal error" msgstr "" -#: methods/cdrom.cc:204 +#: methods/cdrom.cc:203 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" -#: methods/cdrom.cc:213 +#: methods/cdrom.cc:212 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -#: methods/cdrom.cc:223 +#: methods/cdrom.cc:222 msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:249 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:255 +#: methods/cdrom.cc:254 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:263 methods/file.cc:123 methods/rsh.cc:296 +#: methods/cdrom.cc:262 methods/file.cc:123 methods/rsh.cc:296 msgid "File not found" msgstr "" @@ -1547,7 +1547,7 @@ msgid "Connected to %s (%s)" msgstr "" -#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:317 +#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:321 #, c-format msgid "Connecting to %s (%s)" msgstr "" @@ -1734,7 +1734,7 @@ msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334 +#: methods/ftp.cc:918 methods/http.cc:1033 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "" @@ -1809,31 +1809,31 @@ "available:\n" msgstr "" -#: methods/http.cc:711 +#: methods/http.cc:715 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:728 +#: methods/http.cc:732 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:732 +#: methods/http.cc:736 msgid "Error reading from server" msgstr "" -#: methods/http.cc:769 +#: methods/http.cc:773 msgid "Error writing to file" msgstr "" -#: methods/http.cc:836 +#: methods/http.cc:840 msgid "Select failed" msgstr "" -#: methods/http.cc:842 +#: methods/http.cc:846 msgid "Connection timed out" msgstr "" -#: methods/http.cc:866 +#: methods/http.cc:870 msgid "Error writing to output file" msgstr "" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apt.sh.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apt.sh.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apt.sh.po 2020-01-23 16:55:08.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apt.sh.po 2020-07-08 13:57:18.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" "PO-Revision-Date: 2019-12-26 21:33+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Afrikaans \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: dselect/install:33 msgid "Bad default setting!" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apturl.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apturl.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/apturl.po 2020-01-23 16:55:09.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/apturl.po 2020-07-08 13:57:19.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: 2020-01-23 11:45+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/at-spi2-core.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/at-spi2-core.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/at-spi2-core.po 2020-01-23 16:55:07.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/at-spi2-core.po 2020-07-08 13:57:17.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: 2020-01-23 12:00+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:42+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: atspi/atspi-component.c:326 atspi/atspi-misc.c:1073 atspi/atspi-value.c:111 msgid "The application no longer exists" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/bash.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/bash.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/bash.po 2020-01-23 16:55:09.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/bash.po 2020-07-08 13:57:18.000000000 +0000 @@ -14,8 +14,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:32+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: af\n" #: arrayfunc.c:58 diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/bison-runtime.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/bison-runtime.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/bison-runtime.po 2020-01-23 16:55:09.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/bison-runtime.po 2020-07-08 13:57:19.000000000 +0000 @@ -14,57 +14,57 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:38+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:35+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" -#: data/skeletons/glr.c:884 data/skeletons/yacc.c:669 +#: data/skeletons/glr.c:893 data/skeletons/yacc.c:706 msgid "syntax error: cannot back up" msgstr "sintaksfout: kan nie rugsteun nie" -#: data/skeletons/glr.c:1793 +#: data/skeletons/glr.c:1808 msgid "syntax is ambiguous" msgstr "sintaksis is dubbelsinnig" -#: data/skeletons/glr.c:2080 data/skeletons/glr.c:2165 -#: data/skeletons/glr.c:2209 data/skeletons/glr.c:2447 -#: data/skeletons/lalr1.cc:1385 data/skeletons/lalr1.cc:1406 -#: data/skeletons/yacc.c:1250 data/skeletons/yacc.c:1762 -#: data/skeletons/yacc.c:1768 +#: data/skeletons/glr.c:2220 data/skeletons/glr.c:2246 +#: data/skeletons/glr.c:2299 data/skeletons/glr.c:2539 +#: data/skeletons/lalr1.cc:1047 data/skeletons/lalr1.cc:1544 +#: data/skeletons/yacc.c:1379 data/skeletons/yacc.c:1897 +#: data/skeletons/yacc.c:1901 msgid "syntax error" msgstr "sintaksfout" -#: data/skeletons/glr.c:2166 data/skeletons/lalr1.cc:1386 -#: data/skeletons/yacc.c:1251 +#: data/skeletons/glr.c:2247 data/skeletons/lalr1.cc:1545 +#: data/skeletons/yacc.c:1380 #, c-format msgid "syntax error, unexpected %s" msgstr "sintaksfout, onverwagte %s" -#: data/skeletons/glr.c:2167 data/skeletons/lalr1.cc:1387 -#: data/skeletons/yacc.c:1252 +#: data/skeletons/glr.c:2248 data/skeletons/lalr1.cc:1546 +#: data/skeletons/yacc.c:1381 #, c-format msgid "syntax error, unexpected %s, expecting %s" msgstr "sintaksisfout, onverwags %s, verwag %s" -#: data/skeletons/glr.c:2168 data/skeletons/lalr1.cc:1388 -#: data/skeletons/yacc.c:1253 +#: data/skeletons/glr.c:2249 data/skeletons/lalr1.cc:1547 +#: data/skeletons/yacc.c:1382 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s" msgstr "sintaksfout, onverwagte %s, verwag %s of %s" -#: data/skeletons/glr.c:2169 data/skeletons/lalr1.cc:1389 -#: data/skeletons/yacc.c:1254 +#: data/skeletons/glr.c:2250 data/skeletons/lalr1.cc:1548 +#: data/skeletons/yacc.c:1383 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s" msgstr "sintaksfout, onverwagte %s, verwag %s of %s of %s" -#: data/skeletons/glr.c:2170 data/skeletons/lalr1.cc:1390 -#: data/skeletons/yacc.c:1255 +#: data/skeletons/glr.c:2251 data/skeletons/lalr1.cc:1549 +#: data/skeletons/yacc.c:1384 #, c-format msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s" msgstr "sintaksfout, onverwagte %s, verwag %s of %s of %s of %s" -#: data/skeletons/glr.c:2506 data/skeletons/yacc.c:1335 -#: data/skeletons/yacc.c:1337 data/skeletons/yacc.c:1526 -#: data/skeletons/yacc.c:1918 +#: data/skeletons/glr.c:2598 data/skeletons/yacc.c:1463 +#: data/skeletons/yacc.c:1465 data/skeletons/yacc.c:1640 +#: data/skeletons/yacc.c:2049 msgid "memory exhausted" msgstr "geheue uitgeput" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/cracklib.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/cracklib.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/cracklib.po 2020-01-23 16:55:09.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/cracklib.po 2020-07-08 13:57:18.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: 2020-01-23 10:41+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: lib/fascist.c:516 msgid "it is based on your username" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/cwidget.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/cwidget.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/cwidget.po 2020-01-23 16:55:10.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/cwidget.po 2020-07-08 13:57:20.000000000 +0000 @@ -14,12 +14,12 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:46+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: src/cwidget/config/column_definition.cc:273 msgid "Bad format parameter" -msgstr "" +msgstr "Slegte formaat parameter" #: src/cwidget/dialogs.cc:115 src/cwidget/dialogs.cc:128 #: src/cwidget/dialogs.cc:311 src/cwidget/dialogs.cc:351 diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/debconf.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/debconf.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/debconf.po 2020-01-23 16:55:11.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/debconf.po 2020-07-08 13:57:20.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: 2020-01-23 10:41+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../Debconf/AutoSelect.pm:88 #, perl-format diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/debian-tasks.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/debian-tasks.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/debian-tasks.po 2020-01-23 16:55:10.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/debian-tasks.po 2020-07-08 13:57:20.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: 2020-01-23 11:22+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:11+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #. Description #: ../po/debian-tasks.desc:10001 diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/desktop_kde-config-whoopsie.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/desktop_kde-config-whoopsie.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/desktop_kde-config-whoopsie.po 2020-01-23 16:55:11.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/desktop_kde-config-whoopsie.po 2020-07-08 13:57:21.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: 2020-01-23 12:13+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:51+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: src/kcm_whoopsie.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/desktop_kubuntu-driver-manager.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/desktop_kubuntu-driver-manager.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2020-01-23 16:55:09.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/desktop_kubuntu-driver-manager.po 2020-07-08 13:57:19.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: 2020-01-23 12:13+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:51+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: src/kcm_driver_manager.desktop:11 msgctxt "X-KDE-Keywords" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/dpkg.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/dpkg.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/dpkg.po 2020-01-23 16:55:11.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/dpkg.po 2020-07-08 13:57:21.000000000 +0000 @@ -15,8 +15,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:42+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: lib/dpkg/ar.c msgid "failed to fstat archive" @@ -135,7 +135,8 @@ msgid "error creating new backup file '%s'" msgstr "" -#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c +#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c +#: src/remove.c #, c-format msgid "cannot remove '%.250s'" msgstr "" @@ -1142,7 +1143,7 @@ msgid "rm command for cleanup" msgstr "" -#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c +#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c #, c-format msgid "ambiguous package name '%s' with more than one installed instance" msgstr "" @@ -1470,7 +1471,7 @@ msgid "error creating device '%.255s'" msgstr "" -#: src/archives.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c src/archives.c #, c-format msgid "error creating hard link '%.255s'" msgstr "" @@ -1761,10 +1762,10 @@ msgid "archive '%s' is not a regular file" msgstr "" -#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c -#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c -#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c -#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c +#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c +#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c +#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c +#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c msgid "" msgstr "" @@ -2436,15 +2437,15 @@ msgid "divert-to may not contain newlines" msgstr "" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to open diversions file" msgstr "" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to fstat diversions file" msgstr "" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c #, c-format msgid "conflicting diversions involving '%.250s' or '%.250s'" msgstr "" @@ -2696,26 +2697,26 @@ "Package %s is on hold, not touching it. Use --force-hold to override.\n" msgstr "" -#: src/errors.c +#: src/force.c msgid "overriding problem because --force enabled:" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing final newline" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing value" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing value separator" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' contains empty filename" msgstr "" @@ -2750,7 +2751,7 @@ msgid "unable to open files list file for package '%.250s'" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "" "files list file for package '%.250s' missing; assuming package has no files " @@ -2772,12 +2773,12 @@ msgid "reading files list for package '%.250s'" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' is missing final newline" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' contains empty filename" msgstr "" @@ -2787,11 +2788,11 @@ msgid "error closing files list file for package '%.250s'" msgstr "" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c msgid "(Reading database ... " msgstr "(Lees databasis ... " -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "%d file or directory currently installed.)\n" msgid_plural "%d files and directories currently installed.)\n" @@ -2855,37 +2856,37 @@ "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin" msgstr "" -#: src/infodb-access.c +#: lib/dpkg/db-ctrl-access.c #, c-format msgid "unable to check existence of '%.250s'" msgstr "" -#: src/infodb-access.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c msgid "cannot read info directory" msgstr "" -#: src/infodb-format.c src/unpack.c +#: lib/dpkg/db-ctrl-format.c src/unpack.c #, c-format msgid "error trying to open %.250s" msgstr "" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "corrupt info database format file '%s'" msgstr "" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "" "info database format (%d) is bogus or too new; try getting a newer dpkg" msgstr "" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "info file %s/%s not associated to any package" msgstr "" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "error while writing '%s'" msgstr "" @@ -3039,67 +3040,67 @@ "'more' !" msgstr "" -#: src/main.c +#: src/force.c msgid "Set all force options" msgstr "" -#: src/main.c +#: src/force.c msgid "Replace a package with a lower version" msgstr "" -#: src/main.c +#: src/force.c msgid "Configure any package which may help this one" msgstr "" -#: src/main.c +#: src/force.c msgid "Process incidental packages even when on hold" msgstr "" -#: src/main.c +#: src/force.c msgid "Try to (de)install things even when not root" msgstr "" -#: src/main.c +#: src/force.c msgid "PATH is missing important programs, problems likely" msgstr "" -#: src/main.c +#: src/force.c msgid "Install a package even if it fails authenticity check" msgstr "" -#: src/main.c +#: src/force.c msgid "Process even packages with wrong versions" msgstr "" -#: src/main.c +#: src/force.c msgid "Overwrite a file from one package with another" msgstr "" -#: src/main.c +#: src/force.c msgid "Overwrite a diverted file with an undiverted version" msgstr "" -#: src/main.c +#: src/force.c msgid "Overwrite one package's directory with another's file" msgstr "" -#: src/main.c +#: src/force.c msgid "Do not perform safe I/O operations when unpacking" msgstr "" -#: src/main.c +#: src/force.c msgid "Do not chroot into maintainer script environment" msgstr "" -#: src/main.c +#: src/force.c msgid "Always use the new config files, don't prompt" msgstr "" -#: src/main.c +#: src/force.c msgid "Always use the old config files, don't prompt" msgstr "" -#: src/main.c +#: src/force.c msgid "" "Use the default option for new config files if one\n" "is available, don't prompt. If no default can be found,\n" @@ -3107,39 +3108,39 @@ "confnew options is also given" msgstr "" -#: src/main.c +#: src/force.c msgid "Always install missing config files" msgstr "" -#: src/main.c +#: src/force.c msgid "Offer to replace config files with no new versions" msgstr "" -#: src/main.c +#: src/force.c msgid "Process even packages with wrong or no architecture" msgstr "" -#: src/main.c +#: src/force.c msgid "Install even if it would break another package" msgstr "" -#: src/main.c +#: src/force.c msgid "Allow installation of conflicting packages" msgstr "" -#: src/main.c +#: src/force.c msgid "Turn all dependency problems into warnings" msgstr "" -#: src/main.c +#: src/force.c msgid "Turn dependency version problems into warnings" msgstr "" -#: src/main.c +#: src/force.c msgid "Remove packages which require installation" msgstr "" -#: src/main.c +#: src/force.c msgid "Remove an essential package" msgstr "" @@ -3265,7 +3266,7 @@ msgid "cannot remove architecture '%s' currently in use by the database" msgstr "" -#: src/main.c +#: src/force.c #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -3274,7 +3275,7 @@ " Forcing things:\n" msgstr "" -#: src/main.c +#: src/force.c #, c-format msgid "" "\n" @@ -3282,12 +3283,12 @@ "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: src/main.c +#: src/force.c #, c-format msgid "unknown force/refuse option '%.*s'" msgstr "" -#: src/main.c +#: src/force.c #, c-format msgid "obsolete force/refuse option '%s'" msgstr "" @@ -3911,43 +3912,43 @@ msgid "--update is useless for --remove" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride uid %s" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride gid %s" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride mode %s" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to open statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to fstat statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "reading statoverride file '%.250s'" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file is missing final newline" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file contains empty line" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "syntax error in statoverride file" msgstr "" @@ -3956,7 +3957,7 @@ msgid "unknown user '%s' in statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "unexpected end of line in statoverride file" msgstr "" @@ -3965,7 +3966,7 @@ msgid "unknown group '%s' in statoverride file" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "multiple statoverrides present for file '%.250s'" msgstr "" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/fcitx.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/fcitx.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/fcitx.po 2020-01-23 16:55:11.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/fcitx.po 2020-07-08 13:57:20.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: 2020-01-23 11:16+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: data/script/fcitx-configtool.sh:144 msgid "" diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/friendly-recovery.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/friendly-recovery.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/friendly-recovery.po 2020-01-23 16:55:11.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/friendly-recovery.po 2020-07-08 13:57:21.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: 2020-01-23 11:45+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-af-18.04+20200123/data/af/LC_MESSAGES/git.po language-pack-af-18.04+20200702/data/af/LC_MESSAGES/git.po --- language-pack-af-18.04+20200123/data/af/LC_MESSAGES/git.po 2020-01-23 16:55:11.000000000 +0000 +++ language-pack-af-18.04+20200702/data/af/LC_MESSAGES/git.po 2020-07-08 13:57:20.000000000 +0000 @@ -15,62 +15,62 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2020-01-23 11:16+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:05+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" -#: advice.c:62 +#: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "wenk: %.*s\n" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:180 +#: advice.c:265 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:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:130 +#: advice.c:192 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -240,465 +240,467 @@ msgid "unable to open or read %s" msgstr "" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3152 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3160 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3178 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3191 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3197 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3218 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3341 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3401 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3430 apply.c:3673 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3516 apply.c:3688 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3525 apply.c:3696 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3560 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3563 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3579 apply.c:3583 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3595 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3609 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3614 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3640 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3713 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3715 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3924 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3927 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3947 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3952 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3972 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3976 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3991 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4083 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4090 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4093 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4102 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4112 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4250 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4284 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4290 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4298 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4304 apply.c:4449 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4351 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4421 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4519 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4527 +#: apply.c:4539 msgid "internal error" msgstr "" -#: apply.c:4530 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4541 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4567 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4686 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4694 +#: apply.c:4706 msgid "unrecognized input" msgstr "" -#: apply.c:4714 +#: apply.c:4726 msgid "unable to read index file" msgstr "" -#: apply.c:4871 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4898 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4904 apply.c:4919 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4912 +#: apply.c:4924 #, 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: git-add--interactive.perl:213 msgid "path" msgstr "" -#: apply.c:4956 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4959 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "" -#: apply.c:4962 +#: apply.c:4974 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4965 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4967 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4971 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4973 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4975 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4977 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4981 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4983 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4986 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4988 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4990 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4995 +#: apply.c:5007 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 msgid "action" msgstr "" -#: apply.c:4997 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5000 apply.c:5003 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5006 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5008 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5010 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5012 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5015 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5018 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "" -#: apply.c:5021 +#: apply.c:5033 msgid "prepend to all filenames" msgstr "" @@ -719,110 +721,110 @@ msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:186 +#: parse-options.h:190 msgid "file" msgstr "" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "" -#: archive.c:477 +#: archive.c:484 msgid "list supported archive formats" msgstr "" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -838,33 +840,33 @@ msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:758 +#: bisect.c:770 #, 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:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:768 +#: bisect.c:780 #, 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:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -872,7 +874,7 @@ "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -880,43 +882,43 @@ "We continue anyway." msgstr "" -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -926,44 +928,44 @@ #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, 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:2700 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2714 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2735 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:2762 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2773 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2784 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1083,12 +1085,12 @@ msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1103,8 +1105,8 @@ msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "" @@ -1131,58 +1133,58 @@ msgstr[0] "" msgstr[1] "" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:52 +#: commit.c:54 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1391 +#: commit.c:1432 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" @@ -1193,157 +1195,157 @@ msgid "memory exhausted" msgstr "" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1533 builtin/pack-objects.c:3542 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1740 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "" -#: config.c:2091 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2261 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2144 +#: config.c:2250 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2306 +#: config.c:2328 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2352 +#: config.c:2374 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2354 +#: config.c:2376 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2467 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2832 config.c:3085 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2971 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "" @@ -1360,19 +1362,19 @@ "and the repository exists." msgstr "" -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:100 +#: connected.c:119 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:120 +#: connected.c:139 msgid "failed write to rev-list" msgstr "" -#: connected.c:127 +#: connected.c:146 msgid "failed to close rev-list's stdin" msgstr "" @@ -1473,11 +1475,11 @@ msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:543 +#: diffcore-rename.c:592 msgid "Performing inexact rename detection" msgstr "" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "" @@ -1510,55 +1512,55 @@ "%s" msgstr "" -#: diff.c:4218 +#: diff.c:4238 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4563 +#: diff.c:4583 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4566 +#: diff.c:4586 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4644 +#: diff.c:4664 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4729 +#: diff.c:4749 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4417 +#: diff.c:4743 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:6180 +#: diff.c:6200 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6183 +#: diff.c:6203 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6186 +#: diff.c:6206 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1877 +#: dir.c:2275 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2128 +#: dir.c:2575 msgid "failed to get kernel name and information" msgstr "" @@ -1566,17 +1568,17 @@ msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:3101 dir.c:3106 +#: dir.c:3526 dir.c:3531 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3135 +#: dir.c:3560 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -1585,20 +1587,20 @@ msgid "Filtering content" msgstr "" -#: entry.c:476 +#: entry.c:479 #, c-format msgid "could not stat file '%s'" msgstr "" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "" -#: fetch-pack.c:150 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" @@ -1607,209 +1609,209 @@ msgid "remote error: %s" msgstr "" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:357 fetch-pack.c:1364 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:363 fetch-pack.c:1370 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:365 fetch-pack.c:1372 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:368 fetch-pack.c:1375 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:370 fetch-pack.c:1377 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:373 fetch-pack.c:1381 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:414 +#: fetch-pack.c:415 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:431 +#: fetch-pack.c:432 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:462 +#: fetch-pack.c:463 msgid "giving up" msgstr "" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:476 progress.c:336 msgid "done" msgstr "" -#: fetch-pack.c:487 +#: fetch-pack.c:488 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:533 +#: fetch-pack.c:534 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:742 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:781 +#: fetch-pack.c:819 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:789 +#: fetch-pack.c:827 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:857 +#: fetch-pack.c:901 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:873 +#: fetch-pack.c:917 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:875 +#: fetch-pack.c:919 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:914 +#: fetch-pack.c:973 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:947 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:953 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:957 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:961 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:965 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:1157 +#: fetch-pack.c:1218 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:907 +#: fetch-pack.c:966 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:974 +#: fetch-pack.c:1033 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:1038 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:983 +#: fetch-pack.c:1042 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1000 +#: fetch-pack.c:1059 msgid "no common commits" msgstr "" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1071 fetch-pack.c:1563 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1693 +#: fetch-pack.c:1789 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1743 +#: fetch-pack.c:1839 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1746 +#: fetch-pack.c:1842 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:321 +#: gpg-interface.c:457 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:97 +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "" @@ -1827,38 +1829,38 @@ msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:596 +#: help.c:511 #, 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:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -1868,16 +1870,16 @@ msgstr[0] "" msgstr[1] "" -#: help.c:714 +#: help.c:653 msgid "git version []" msgstr "" -#: help.c:783 +#: help.c:708 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:787 +#: help.c:712 msgid "" "\n" "Did you mean this?" @@ -1930,7 +1932,7 @@ msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "" @@ -1939,11 +1941,11 @@ msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:126 +#: list-objects-filter-options.c:137 msgid "cannot change partial clone promisor remote" msgstr "" -#: lockfile.c:151 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -1955,7 +1957,7 @@ "remove the file manually to continue." msgstr "" -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" @@ -1964,220 +1966,220 @@ msgid "failed to read the cache" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 -#: builtin/stash.c:264 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "" -#: merge-recursive.c:329 +#: merge-recursive.c:435 msgid "error building trees" msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, 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:1487 +#: merge-recursive.c:1479 #, 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:1494 +#: merge-recursive.c:1486 #, 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:1499 +#: merge-recursive.c:1491 #, 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:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1851 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1379 +#: merge-recursive.c:1734 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1582 +#: merge-recursive.c:2737 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1597 +#: merge-recursive.c:2763 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:3120 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:2961 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2964 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modify" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modified" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3052 msgid "content" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3056 msgid "add/add" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3101 git-submodule.sh:985 msgid "submodule" msgstr "" -#: merge-recursive.c:3090 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3327 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3350 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "" -#: merge-recursive.c:3355 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3374 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3371 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "" @@ -2187,36 +2189,36 @@ msgid "Dirty index: cannot merge (dirty: %s)" msgstr "" -#: merge-recursive.c:3424 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3433 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3537 +#: merge-recursive.c:3549 msgid "Merging:" msgstr "" -#: merge-recursive.c:3550 +#: merge-recursive.c:3562 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3600 +#: merge-recursive.c:3612 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3756 +#: merge-recursive.c:3768 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "" @@ -2261,25 +2263,25 @@ msgid "unable to parse object: %s" msgstr "" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1887 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1891 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:888 +#: parse-options.c:882 msgid "..." msgstr "" -#: parse-options.c:907 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "" @@ -2287,17 +2289,17 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:916 +#: parse-options.c:910 #, c-format msgid " %s" msgstr "" -#: parse-options.c:955 +#: parse-options.c:949 msgid "-NUM" msgstr "" @@ -2306,146 +2308,147 @@ msgid "malformed object name '%s'" msgstr "" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pretty.c:966 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1635 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1645 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3126 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3138 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:706 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs.c:2055 +#: refs.c:2011 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1936 msgid "gone" msgstr "" @@ -2609,12 +2612,12 @@ msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1313 +#: ref-filter.c:1424 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1316 +#: ref-filter.c:1430 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2622,7 +2625,7 @@ #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1438 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2630,147 +2633,147 @@ #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1445 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1335 +#: ref-filter.c:1449 msgid "(no branch)" msgstr "" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1550 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2004 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2093 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: refs.c:669 ref-filter.c:2098 +#: ref-filter.c:2095 refs.c:625 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2389 +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2502 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:611 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:615 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:619 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:811 +#: remote.c:623 msgid "Internal error" msgstr "" -#: remote.c:1627 remote.c:1728 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1636 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1639 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1645 +#: remote.c:1628 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1660 +#: remote.c:1643 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1672 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1682 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1717 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2019 +#: remote.c:2002 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2023 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2026 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2030 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2033 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2037 +#: remote.c:2020 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2043 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2046 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2778,11 +2781,11 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2054 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2057 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2793,20 +2796,20 @@ msgstr[0] "" msgstr[1] "" -#: remote.c:2067 +#: remote.c:2050 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2509 +#: revision.c:2655 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2512 +#: revision.c:2658 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2720 +#: revision.c:2866 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -2821,56 +2824,56 @@ "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:142 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:144 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:146 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:307 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:421 +#: send-pack.c:399 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:423 +#: send-pack.c:401 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:435 +#: send-pack.c:413 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:440 +#: send-pack.c:418 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:187 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:321 +#: sequencer.c:326 msgid "revert" msgstr "" -#: sequencer.c:323 +#: sequencer.c:328 msgid "cherry-pick" msgstr "" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "" @@ -2879,79 +2882,79 @@ msgid "Unknown action: %d" msgstr "" -#: sequencer.c:385 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:388 +#: sequencer.c:393 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:401 sequencer.c:2847 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:408 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:462 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:466 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:498 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:631 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:662 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:648 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:872 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2968,11 +2971,11 @@ " git rebase --continue\n" msgstr "" -#: sequencer.c:1146 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1153 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2987,7 +2990,7 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1166 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3001,63 +3004,63 @@ " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1208 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1210 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1256 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1258 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "" -#: sequencer.c:1262 +#: sequencer.c:1256 msgid " (root-commit)" msgstr "" -#: sequencer.c:1283 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1285 +#: sequencer.c:1279 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1456 +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1461 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "" @@ -3078,246 +3081,248 @@ "\t%.*s" msgstr "" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1602 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1606 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1612 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1627 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1728 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1754 +#: sequencer.c:1789 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1762 sequencer.c:1770 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1510 +#: sequencer.c:1770 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:1776 +#: sequencer.c:1811 #, 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:1795 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1860 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1915 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1916 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1983 +#: sequencer.c:2030 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1990 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2066 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2075 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2166 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2177 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2302 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2304 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2309 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "" -#: sequencer.c:2320 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2322 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "" -#: config.c:406 sequencer.c:2401 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:2404 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2507 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2100 +#: sequencer.c:2487 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:2101 +#: sequencer.c:2488 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:2627 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2642 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2738 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2739 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2745 +#: sequencer.c:2819 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2756 +#: sequencer.c:2830 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:1433 sequencer.c:4118 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 msgid "could not read index" msgstr "" -#: sequencer.c:3074 +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -3327,11 +3332,11 @@ "\n" msgstr "" -#: sequencer.c:3080 +#: sequencer.c:3153 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3086 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -3342,121 +3347,120 @@ "\n" msgstr "" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3635 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 -#, c-format +#: git-rebase--preserve-merges.sh:113 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3827 +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3898 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3957 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "" -#: sequencer.c:3962 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:3976 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4069 +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4174 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4078 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4080 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4082 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4085 +#: sequencer.c:4234 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:4181 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4285 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4289 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4324 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4774 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4777 +#: sequencer.c:4965 msgid "make_script: error preparing revisions" msgstr "" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: rebase-interactive.c:26 +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3467,25 +3471,25 @@ "\n" msgstr "" -#: sequencer.c:4935 +#: rebase-interactive.c:11 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:852 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: sequencer.c:5166 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "" @@ -3494,14 +3498,14 @@ msgid "'%s' is outside repository" msgstr "" -#: setup.c:174 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" -#: setup.c:187 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3509,12 +3513,12 @@ "'git [...] -- [...]'" msgstr "" -#: setup.c:236 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:255 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3522,152 +3526,152 @@ "'git [...] -- [...]'" msgstr "" -#: setup.c:391 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:395 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:541 +#: setup.c:569 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:549 +#: setup.c:577 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:568 +#: setup.c:596 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:570 +#: setup.c:598 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:572 +#: setup.c:600 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:574 +#: setup.c:602 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:576 +#: setup.c:604 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:578 +#: setup.c:606 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:677 +#: setup.c:708 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:691 +#: setup.c:722 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:751 setup.c:753 setup.c:784 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 msgid "cannot come back to cwd" msgstr "" -#: setup.c:1110 +#: setup.c:1141 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:852 +#: setup.c:883 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1090 +#: setup.c:1121 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1099 setup.c:1105 +#: setup.c:1130 setup.c:1136 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1116 +#: setup.c:1147 #, 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:1227 +#: setup.c:1258 #, 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:1271 +#: setup.c:1304 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1286 +#: setup.c:1319 msgid "fork failed" msgstr "" -#: setup.c:1291 +#: setup.c:1324 msgid "setsid failed" msgstr "" -#: sha1-file.c:685 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:711 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:717 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:723 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:731 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "" -#: sha1_name.c:693 +#: sha1-name.c:770 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3689,7 +3693,7 @@ msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule-config.c:761 +#: submodule-config.c:766 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" @@ -3718,48 +3722,48 @@ msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1651 +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1789 +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1907 +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:2007 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:2026 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3767,12 +3771,12 @@ "'%s'\n" msgstr "" -#: submodule.c:2109 +#: submodule.c:1855 submodule.c:2165 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:2153 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "" @@ -3780,16 +3784,16 @@ msgid "BUG: returned path string doesn't match cwd?" msgstr "" -#: submodule.c:2192 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:303 +#: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:490 +#: submodule-config.c:499 #, c-format msgid "invalid value for %s" msgstr "" @@ -3805,7 +3809,7 @@ msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "" @@ -3858,14 +3862,14 @@ msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:1044 +#: transport.c:1052 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1048 +#: transport.c:1056 #, c-format msgid "" "\n" @@ -3881,123 +3885,123 @@ "\n" msgstr "" -#: transport.c:1056 +#: transport.c:1064 msgid "Aborting." msgstr "" -#: transport-helper.c:1079 +#: transport-helper.c:1025 #, c-format msgid "Could not read ref %s" msgstr "" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, 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:112 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, 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:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, 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:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, 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:133 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, 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:138 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, 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:143 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4005,7 +4009,7 @@ "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:151 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4013,35 +4017,35 @@ "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:157 #, 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:156 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:162 #, 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:161 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:169 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" @@ -4069,19 +4073,19 @@ "%s" msgstr "" -#: unpack-trees.c:178 +#: unpack-trees.c:175 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:255 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:333 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "" @@ -4114,32 +4118,32 @@ msgid "invalid '..' path segment" msgstr "" -#: worktree.c:258 builtin/am.c:2084 +#: worktree.c:262 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:309 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:320 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:332 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:338 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:347 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" @@ -4149,8 +4153,8 @@ msgid "could not open '%s' for reading and writing" msgstr "" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -4168,7 +4172,7 @@ msgid "Unmerged paths:" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" @@ -4189,11 +4193,11 @@ msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "" @@ -4205,7 +4209,7 @@ msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" @@ -4291,250 +4295,250 @@ msgid "untracked content, " msgstr "" -#: wt-status.c:906 +#: wt-status.c:904 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1331 #, 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:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1392 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1439 +#: wt-status.c:1437 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1468 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1482 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1485 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1694 +#: wt-status.c:1692 msgid "On branch " msgstr "" -#: wt-status.c:1701 +#: wt-status.c:1699 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1703 +#: wt-status.c:1701 msgid "rebase in progress; onto " msgstr "" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "" -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1713 +#: wt-status.c:1711 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1730 +#: wt-status.c:1728 msgid "Initial commit" msgstr "" -#: wt-status.c:1731 +#: wt-status.c:1729 msgid "No commits yet" msgstr "" -#: wt-status.c:1745 +#: wt-status.c:1743 msgid "Untracked files" msgstr "" -#: wt-status.c:1747 +#: wt-status.c:1745 msgid "Ignored files" msgstr "" -#: wt-status.c:1751 +#: wt-status.c:1749 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4542,226 +4546,226 @@ "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1757 +#: wt-status.c:1755 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1759 +#: wt-status.c:1757 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1765 +#: wt-status.c:1763 msgid "No changes" msgstr "" -#: wt-status.c:1770 +#: wt-status.c:1768 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1773 +#: wt-status.c:1771 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1776 +#: wt-status.c:1774 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1779 +#: wt-status.c:1777 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1782 +#: wt-status.c:1780 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1783 wt-status.c:1788 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1786 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1792 +#: wt-status.c:1790 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1903 msgid "No commits yet on " msgstr "" -#: wt-status.c:1909 +#: wt-status.c:1907 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1940 +#: wt-status.c:1938 msgid "different" msgstr "" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1940 wt-status.c:1948 msgid "behind " msgstr "" -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1943 wt-status.c:1946 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2468 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2476 +#: wt-status.c:2474 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2478 +#: wt-status.c:2476 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [] [--] ..." msgstr "" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "" -#: builtin/add.c:245 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:249 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "" -#: builtin/add.c:252 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:270 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:325 msgid "interactive picking" msgstr "" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:329 msgid "update tracked files" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:964 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:1002 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4779,177 +4783,178 @@ "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:372 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:426 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:430 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:445 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:511 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:790 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1695 builtin/commit.c:374 +#: builtin/am.c:1699 builtin/commit.c:395 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:948 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1486 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1511 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1703 +#: builtin/am.c:1659 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "" @@ -4957,26 +4962,26 @@ #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1699 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1756 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1762 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "" @@ -4985,14 +4990,14 @@ msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1810 +#: builtin/am.c:1814 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:1817 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5000,129 +5005,131 @@ "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1976 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2020 +#: builtin/am.c:2024 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2117 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2153 +#: builtin/am.c:2206 msgid "git am [] [( | )...]" msgstr "" -#: builtin/am.c:2154 +#: builtin/am.c:2207 msgid "git am [] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2160 +#: builtin/am.c:2213 msgid "run interactively" msgstr "" -#: builtin/am.c:2162 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2164 +#: builtin/am.c:2217 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:297 builtin/stash.c:812 +#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "" -#: builtin/am.c:2167 +#: builtin/am.c:2220 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2170 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2172 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2174 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2176 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2231 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2181 +#: builtin/am.c:2234 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2184 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:150 parse-options.h:171 parse-options.h:312 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:131 msgid "format" msgstr "" -#: builtin/am.c:2210 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2216 +#: builtin/am.c:2269 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2218 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2280 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2283 msgid "abort the patching operation but keep HEAD where it is." msgstr "" @@ -5130,51 +5137,51 @@ msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2239 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2245 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2263 +#: builtin/am.c:2318 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:2270 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2285 +#: builtin/am.c:2340 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2309 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2315 +#: builtin/am.c:2370 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -5247,31 +5254,31 @@ msgid "could not open the file BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "" @@ -5347,43 +5354,43 @@ msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:870 +#: builtin/blame.c:817 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -5395,7 +5402,7 @@ #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "" @@ -5597,7 +5604,7 @@ msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "" @@ -5605,7 +5612,7 @@ msgid "change the upstream info" msgstr "" -#: builtin/branch.c:627 +#: builtin/branch.c:603 msgid "Unset the upstream info" msgstr "" @@ -5693,190 +5700,190 @@ msgid "field name to sort on" msgstr "" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 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:433 +#: builtin/tag.c:434 msgid "object" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:812 msgid "" "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -#: builtin/bundle.c:45 +#: builtin/bundle.c:119 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:58 +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:62 +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:598 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:599 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:638 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:648 git-submodule.sh:984 msgid "blob" msgstr "" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "" @@ -5904,8 +5911,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537 +#: builtin/worktree.c:502 msgid "suppress progress reporting" msgstr "" @@ -5917,27 +5924,27 @@ msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -5995,9 +6002,9 @@ msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:675 msgid "string" msgstr "" @@ -6017,105 +6024,105 @@ msgid "git checkout [] [] -- ..." msgstr "" -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:191 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:241 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:259 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:275 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:430 +#: builtin/checkout.c:450 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:704 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:833 +#: builtin/checkout.c:861 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:875 +#: builtin/checkout.c:903 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:907 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:883 +#: builtin/checkout.c:911 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:914 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:918 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:920 builtin/checkout.c:1344 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:922 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:945 +#: builtin/checkout.c:973 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:951 +#: builtin/checkout.c:979 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6130,7 +6137,7 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:970 +#: builtin/checkout.c:998 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6147,196 +6154,197 @@ msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1033 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1037 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1077 builtin/checkout.c:1339 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1252 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1311 builtin/checkout.c:1677 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1407 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 +#: builtin/checkout.c:1433 builtin/checkout.c:1438 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1443 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802 +#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497 msgid "branch" msgstr "" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1752 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1754 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1755 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1507 builtin/worktree.c:499 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1508 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1512 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1512 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1530 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1533 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1510 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1493 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1514 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1495 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1537 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1262 msgid "second guess 'git checkout '" msgstr "" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1517 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80 +#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1633 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1213 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1686 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1693 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1697 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1720 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -6345,7 +6353,7 @@ " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -6358,38 +6366,38 @@ " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:787 git-add--interactive.perl:1763 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6400,70 +6408,70 @@ "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1849 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1846 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 msgid "What now" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:905 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:910 msgid "add to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:931 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:935 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:938 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6473,27 +6481,27 @@ msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "" @@ -6505,285 +6513,287 @@ msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:533 msgid "template-directory" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:534 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3442 builtin/repack.c:329 msgid "name" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431 +#: builtin/pull.c:211 msgid "time" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:542 msgid "gitdir" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:543 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:284 +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:401 +#: builtin/sparse-checkout.c:326 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:423 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:457 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:461 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:491 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:489 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:582 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1812 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:701 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:751 +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:782 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:832 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:895 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:971 builtin/receive-pack.c:1972 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:941 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:954 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:957 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:970 +#: builtin/clone.c:1004 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:1010 builtin/fetch.c:1789 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1030 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1016 +#: builtin/clone.c:1050 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1036 +#: builtin/clone.c:1070 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1038 +#: builtin/clone.c:1072 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1062 +#: builtin/clone.c:1096 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1123 +#: builtin/clone.c:1160 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1125 +#: builtin/clone.c:1162 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1127 +#: builtin/clone.c:1164 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1129 +#: builtin/clone.c:1166 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1132 +#: builtin/clone.c:1169 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1137 +#: builtin/clone.c:1174 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1249 builtin/clone.c:1257 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1223 +#: builtin/clone.c:1260 msgid "You appear to have cloned an empty repository." msgstr "" @@ -6843,11 +6853,11 @@ "\n" msgstr "" -#: builtin/commit.c:59 +#: builtin/commit.c:62 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:62 +#: builtin/commit.c:65 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6857,98 +6867,98 @@ "the remaining commits.\n" msgstr "" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:356 +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:465 +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:829 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -6958,7 +6968,7 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:834 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -6968,14 +6978,14 @@ "and try again.\n" msgstr "" -#: builtin/commit.c:847 +#: builtin/commit.c:870 #, 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:855 +#: builtin/commit.c:878 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6983,339 +6993,339 @@ "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:872 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:880 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:887 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:905 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:972 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1030 +#: builtin/commit.c:1057 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1044 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1185 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1187 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1202 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1204 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1213 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1202 +#: builtin/commit.c:361 msgid "No paths with --include/--only does not make sense." msgstr "" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1376 msgid "version" msgstr "" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 -#: builtin/worktree.c:650 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:646 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1385 builtin/commit.c:1543 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1417 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "author" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1510 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1511 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1429 +#: builtin/commit.c:1481 msgid "default" msgstr "" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1515 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1535 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1541 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1543 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1659 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1788 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7326,143 +7336,143 @@ msgid "git config []" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7472,16 +7482,16 @@ "#\temail = %s\n" msgstr "" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7504,19 +7514,19 @@ msgid "git describe [] --dirty" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "" -#: builtin/describe.c:275 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "" @@ -7531,131 +7541,131 @@ msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:327 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:441 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:444 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:512 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:515 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:523 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:538 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:539 +#: builtin/describe.c:556 msgid "use any ref" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:541 +#: builtin/describe.c:558 msgid "always use long format" msgstr "" -#: builtin/describe.c:542 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:545 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:547 +#: builtin/describe.c:564 msgid "consider most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:549 +#: builtin/describe.c:566 msgid "only consider tags matching " msgstr "" -#: builtin/describe.c:551 +#: builtin/describe.c:568 msgid "do not consider tags matching " msgstr "" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "" -#: builtin/describe.c:555 +#: builtin/describe.c:572 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:558 +#: builtin/describe.c:575 msgid "append on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:576 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:605 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:656 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:658 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -7826,7 +7836,7 @@ msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1724 msgid "refspec" msgstr "" @@ -7838,184 +7848,184 @@ msgid "anonymize output" msgstr "" -#: builtin/fetch.c:34 +#: builtin/fetch.c:35 msgid "git fetch [] [ [...]]" msgstr "" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [] " msgstr "" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch --multiple [] [( | )...]" msgstr "" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/pull.c:212 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:151 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:157 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:157 +#: builtin/fetch.c:159 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:165 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:170 +#: builtin/fetch.c:172 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:76 builtin/commit-graph.c:152 +#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678 msgid "dir" msgstr "" -#: builtin/fetch.c:179 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:182 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:510 +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:650 +#: builtin/fetch.c:654 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:748 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:752 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:766 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:776 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:803 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:806 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:809 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:848 +#: builtin/fetch.c:852 msgid "forced update" msgstr "" -#: builtin/fetch.c:853 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:908 +#: builtin/fetch.c:914 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:929 +#: builtin/fetch.c:935 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "" @@ -8027,119 +8037,119 @@ " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1185 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1203 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1206 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1481 builtin/fetch.c:1649 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1687 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:1722 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1773 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1775 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1780 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1782 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1798 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1800 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1809 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1816 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "" @@ -8179,7 +8189,7 @@ msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "" @@ -8203,63 +8213,63 @@ msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:225 msgid "Checking objects" msgstr "" @@ -8334,7 +8344,7 @@ "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" @@ -8352,226 +8362,226 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730 +#: builtin/pack-objects.c:2855 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:823 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:817 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:819 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:849 msgid "descend at most levels" msgstr "" -#: builtin/grep.c:845 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:868 msgid "show filenames" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:871 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:884 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:889 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:892 msgid "show context lines before and after matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:895 msgid "show context lines before matches" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:897 msgid "show context lines after matches" msgstr "" -#: builtin/grep.c:891 +#: builtin/grep.c:899 msgid "use worker threads" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:903 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:910 msgid "match " msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:926 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:920 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:932 msgid "pager" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:928 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:962 +#: builtin/grep.c:793 msgid "no pattern given." msgstr "" -#: builtin/grep.c:1028 +#: builtin/grep.c:1039 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1036 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1084 builtin/pack-objects.c:3548 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1096 +#: builtin/grep.c:1121 msgid "--open-files-in-pager only works on the worktree" msgstr "" @@ -8579,15 +8589,15 @@ msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:1094 +#: builtin/grep.c:877 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1100 +#: builtin/grep.c:885 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1108 +#: builtin/grep.c:893 msgid "both --cached and trees are given." msgstr "" @@ -8630,131 +8640,131 @@ msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "" -#: command-list.h:195 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "" -#: builtin/help.c:408 +#: builtin/help.c:412 msgid "Everyday Git With 20 Commands Or So" msgstr "" -#: builtin/help.c:409 +#: builtin/help.c:413 msgid "A Git glossary" msgstr "" -#: command-list.h:203 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: command-list.h:204 +#: command-list.h:207 msgid "Defining submodule properties" msgstr "" -#: command-list.h:207 +#: command-list.h:210 msgid "Specifying revisions and ranges for Git" msgstr "" -#: builtin/help.c:413 +#: builtin/help.c:417 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" -#: command-list.h:210 +#: command-list.h:214 msgid "An overview of recommended workflows with Git" msgstr "" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "The common Git guides are:\n" msgstr "" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "" @@ -8793,15 +8803,15 @@ msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:607 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 +#: builtin/index-pack.c:306 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "" @@ -8858,307 +8868,307 @@ msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:159 +#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1405 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1598 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1646 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1653 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1692 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 +#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1780 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1782 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1788 msgid "--verify with no packfile name given" msgstr "" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:120 +#: builtin/init-db.c:118 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:334 +#: builtin/init-db.c:356 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:337 +#: builtin/init-db.c:359 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:413 +#: builtin/init-db.c:458 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:414 +#: builtin/init-db.c:459 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:418 +#: builtin/init-db.c:463 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:419 +#: builtin/init-db.c:464 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:468 +#: builtin/init-db.c:513 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" msgstr "" -#: builtin/init-db.c:491 +#: builtin/init-db.c:538 msgid "permissions" msgstr "" -#: builtin/init-db.c:492 +#: builtin/init-db.c:539 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:578 builtin/init-db.c:583 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:538 +#: builtin/init-db.c:587 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:559 +#: builtin/init-db.c:614 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "" -#: builtin/init-db.c:587 +#: builtin/init-db.c:642 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -9221,300 +9231,300 @@ msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:55 +#: builtin/log.c:57 msgid "git log [] [] [[--] ...]" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git show [] ..." msgstr "" -#: builtin/log.c:109 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5298 builtin/log.c:177 msgid "suppress diff output" msgstr "" -#: builtin/log.c:173 +#: builtin/log.c:178 msgid "show source" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "" -#: builtin/log.c:176 +#: builtin/log.c:182 msgid "only decorate refs that match " msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:184 msgid "do not decorate refs that match " msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:185 msgid "decorate options" msgstr "" -#: builtin/log.c:182 +#: builtin/log.c:188 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:280 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:534 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:537 builtin/log.c:631 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:643 +#: builtin/log.c:655 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:792 +#: builtin/log.c:842 msgid "format.headers without value" msgstr "" -#: builtin/log.c:909 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:881 +#: builtin/log.c:893 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:898 +#: builtin/log.c:910 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:920 msgid "Not a range." msgstr "" -#: builtin/log.c:1014 +#: builtin/log.c:1043 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1160 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1187 +#: builtin/log.c:1276 msgid "git format-patch [] [ | ]" msgstr "" -#: builtin/log.c:1172 +#: builtin/log.c:1204 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1294 +#: builtin/log.c:1326 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1298 +#: builtin/log.c:1330 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:1318 +#: builtin/log.c:1350 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1406 +#: builtin/log.c:1495 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1410 +#: builtin/log.c:1499 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1560 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1563 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1569 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1571 +#: builtin/log.c:1661 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1662 msgid "sfx" msgstr "" -#: builtin/log.c:1573 +#: builtin/log.c:1663 msgid "use instead of '.patch'" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1665 msgid "start numbering patches at instead of 1" msgstr "" -#: builtin/log.c:1577 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1579 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1582 +#: builtin/log.c:1675 msgid "Use [] instead of [PATCH]" msgstr "" -#: builtin/log.c:1585 +#: builtin/log.c:1678 msgid "store resulting files in " msgstr "" -#: builtin/log.c:1588 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1591 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1593 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1595 +#: builtin/log.c:1688 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1597 +#: builtin/log.c:1690 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1599 +#: builtin/log.c:1692 msgid "Messaging" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1693 msgid "header" msgstr "" -#: builtin/log.c:1601 +#: builtin/log.c:1694 msgid "add email header" msgstr "" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1695 msgid "add To: header" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1606 +#: builtin/log.c:1697 msgid "ident" msgstr "" -#: builtin/log.c:1607 +#: builtin/log.c:1698 msgid "set From address to (or committer ident if absent)" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1700 msgid "message-id" msgstr "" -#: builtin/log.c:1610 +#: builtin/log.c:1701 msgid "make first mail a reply to " msgstr "" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "" -#: builtin/log.c:1612 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "" -#: builtin/log.c:1615 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "" -#: builtin/log.c:1619 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1621 +#: builtin/log.c:1712 msgid "signature" msgstr "" -#: builtin/log.c:1622 +#: builtin/log.c:1713 msgid "add a signature" msgstr "" -#: builtin/log.c:1623 +#: builtin/log.c:1714 msgid "base-commit" msgstr "" -#: builtin/log.c:1624 +#: builtin/log.c:1715 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1627 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1629 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1711 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1362 msgid "-n and -k are mutually exclusive." msgstr "" @@ -9522,151 +9532,151 @@ msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1736 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1738 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1740 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1773 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1648 +#: builtin/log.c:1729 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1912 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1948 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1931 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:2051 +#: builtin/log.c:2152 msgid "git cherry [-v] [ [ []]]" msgstr "" -#: builtin/log.c:2105 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [] [...]" msgstr "" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from " msgstr "" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in " msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since are still present" msgstr "" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "" @@ -9681,7 +9691,7 @@ msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "" @@ -9754,180 +9764,180 @@ msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge [] [...]" msgstr "" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:118 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:247 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:250 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:253 builtin/pull.c:142 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:256 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:258 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:264 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:268 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:274 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:278 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:241 +#: builtin/merge.c:277 msgid "verify commit-msg hook" msgstr "" -#: builtin/merge.c:307 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "" -#: builtin/merge.c:312 +#: builtin/merge.c:316 msgid "stash failed" msgstr "" -#: builtin/merge.c:317 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:498 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:585 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:705 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:719 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:734 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:786 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:795 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:764 +#: builtin/merge.c:797 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9937,185 +9947,185 @@ "the commit.\n" msgstr "" -#: builtin/merge.c:862 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:877 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:938 +#: builtin/merge.c:949 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:977 +#: builtin/merge.c:988 msgid "No current branch." msgstr "" -#: builtin/merge.c:979 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:981 +#: builtin/merge.c:992 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:986 +#: builtin/merge.c:997 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1043 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1146 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1180 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1283 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1287 +#: builtin/merge.c:1299 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1309 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1313 +#: builtin/merge.c:1334 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1329 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1336 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1360 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1353 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1371 +#: builtin/merge.c:1392 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1409 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1390 +#: builtin/merge.c:1411 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1395 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1397 +#: builtin/merge.c:1418 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: commit.c:1128 +#: commit.c:1168 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1131 +#: commit.c:1172 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1134 +#: commit.c:1175 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1137 +#: commit.c:1178 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1476 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1485 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1495 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1537 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1544 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1569 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1575 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1602 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1654 +#: builtin/merge.c:1686 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1656 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1665 +#: builtin/merge.c:1697 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1677 +#: builtin/merge.c:1711 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10140,23 +10150,23 @@ msgid "git merge-base --fork-point []" msgstr "" -#: builtin/merge-base.c:153 +#: builtin/merge-base.c:143 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:155 +#: builtin/merge-base.c:145 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:157 +#: builtin/merge-base.c:147 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:159 +#: builtin/merge-base.c:149 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:161 +#: builtin/merge-base.c:151 msgid "find where forked from reflog of " msgstr "" @@ -10332,52 +10342,52 @@ msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:465 msgid "git name-rev [] ..." msgstr "" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:466 msgid "git name-rev [] --all" msgstr "" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:467 msgid "git name-rev [] --stdin" msgstr "" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:527 msgid "only use refs matching " msgstr "" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:529 msgid "ignore refs matching " msgstr "" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "" @@ -10517,12 +10527,12 @@ msgid "the note contents have been left in %s" msgstr "" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -10756,7 +10766,7 @@ msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "" @@ -10772,201 +10782,201 @@ msgid "use notes from " msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:973 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:986 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1298 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2802 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2993 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3342 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3346 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3376 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3378 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3380 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3383 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:2610 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3385 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3388 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3390 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3392 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3394 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3396 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3398 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3400 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3402 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3404 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3406 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3408 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3410 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3412 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3415 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3418 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3421 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3424 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3426 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3428 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3430 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3432 msgid "unpack unreachable objects newer than